Skip to content

fix case if text data is updated while font is loading (#2808) #2814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2017
Merged

fix case if text data is updated while font is loading (#2808) #2814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/components/text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ module.exports.Component = registerComponent('text', {

// Update geometry and layout.
if (font) {
updateGeometry(this.geometry, data, font);
this.updateGeometry(this.geometry, data, font);
this.updateLayout(data);
}
},
Expand Down Expand Up @@ -209,7 +209,7 @@ module.exports.Component = registerComponent('text', {

// Update geometry given font metrics.
coercedData = coerceData(data);
updateGeometry(geometry, data, font);
self.updateGeometry(geometry, self.data, font);

// Set font and update layout.
self.currentFont = font;
Expand Down Expand Up @@ -313,6 +313,18 @@ module.exports.Component = registerComponent('text', {
*/
lookupFont: function (key) {
return FONTS[key];
},

/**
* Update the text geometry using `three-bmfont-text.update`.
*/
updateGeometry: function (geometry, data, font) {
geometry.update(utils.extend({}, data, {
font: font,
width: computeWidth(data.wrapPixels, data.wrapCount, font.widthFactor),
text: data.value.replace(/\\n/g, '\n').replace(/\\t/g, '\t'),
lineHeight: data.lineHeight || font.common.lineHeight
}));
}
});

Expand Down Expand Up @@ -410,18 +422,6 @@ function updateBaseMaterial (material, data) {
material.side = data.side;
}

/**
* Update the text geometry using `three-bmfont-text.update`.
*/
function updateGeometry (geometry, data, font) {
geometry.update(utils.extend({}, data, {
font: font,
width: computeWidth(data.wrapPixels, data.wrapCount, font.widthFactor),
text: data.value.replace(/\\n/g, '\n').replace(/\\t/g, '\t'),
lineHeight: data.lineHeight || font.common.lineHeight
}));
}

/**
* Determine wrap pixel count. Either specified or by experimental fudge factor.
* Note that experimental factor will never be correct for variable width fonts.
Expand Down
23 changes: 23 additions & 0 deletions tests/components/text.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,19 @@ suite('text', function () {
});

suite('update', function () {
test('updates value', function (done) {
var updateSpy = this.sinon.spy(component, 'updateGeometry');
el.addEventListener('textfontset', evt => {
el.setAttribute('text', {value: 'foo', font: 'mozillavr'});
el.setAttribute('text', {value: 'bar', font: 'mozillavr'});
assert.equal(updateSpy.getCalls()[0].args[1].value, '');
assert.equal(updateSpy.getCalls()[1].args[1].value, 'foo');
assert.equal(updateSpy.getCalls()[2].args[1].value, 'bar');
done();
});
el.setAttribute('text', {font: 'mozillavr'});
});

test('updates geometry with value', function (done) {
// There are two paths by which geometry update can happen:
// 1. As after-effect of font change.
Expand Down Expand Up @@ -194,6 +207,16 @@ suite('text', function () {
});
el.setAttribute('text', {font: 'mozillavr', fontImage: '/base/tests/assets/test2.png'});
});

test('uses up-to-date data once loaded', function (done) {
var updateSpy = this.sinon.spy(component, 'updateGeometry');
el.addEventListener('textfontset', evt => {
assert.equal(updateSpy.getCalls()[0].args[1].value, 'bar');
done();
});
el.setAttribute('text', {value: 'foo', font: 'mozillavr'});
el.setAttribute('text', {value: 'bar', font: 'mozillavr'});
});
});

suite('updateLayout', function () {
Expand Down