Skip to content

Commit 5722268

Browse files
committed
fix last change
1 parent c65200c commit 5722268

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/framework/components/element/text-element.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -276,26 +276,26 @@ Object.assign(pc, function () {
276276
var ti = i % this._font.textures[0].length;
277277
var p = (i - ti) / this._font.textures[0].length;
278278

279+
if (!this._meshInfo[i]) {
280+
this._meshInfo[i] = new MeshInfo();
281+
}
282+
279283
if (multiPassNeeded) {
280284
this._meshInfo[i].renderPass = passes[p];
281285
} else {
282286
this._meshInfo[i].renderPass = RenderPass.ALL_IN_ONE;
283287
}
284288

285-
if (!this._meshInfo[i]) {
286-
this._meshInfo[i] = new MeshInfo();
287-
} else {
288-
// keep existing entry but set correct parameters to mesh instance
289-
var mi = this._meshInfo[i].meshInstance;
290-
if (mi) {
291-
mi.setParameter("font_sdfIntensity", this._font.intensity);
292-
mi.setParameter("font_pxrange", this._getPxRange(this._font));
293-
mi.setParameter("font_textureWidth", this._font.data.info.maps[ti].width);
294-
295-
mi.setParameter("render_pass", this._meshInfo[i].renderPass);
296-
this._setTextureParams(mi, this._font.textures[0][ti], (multiPassNeeded) ? this._font.textures[1][ti]: null);
297-
}
289+
// set correct parameters to mesh instance (if valid)
290+
var mi = this._meshInfo[i].meshInstance;
291+
if (mi) {
292+
mi.setParameter("font_sdfIntensity", this._font.intensity);
293+
mi.setParameter("font_pxrange", this._getPxRange(this._font));
294+
mi.setParameter("font_textureWidth", this._font.data.info.maps[ti].width);
295+
mi.setParameter("render_pass", this._meshInfo[i].renderPass);
296+
this._setTextureParams(mi, this._font.textures[0][ti], (multiPassNeeded) ? this._font.textures[1][ti] : null);
298297
}
298+
299299
}
300300

301301
// destroy any excess mesh instances

0 commit comments

Comments
 (0)