Revert "adjust code a bit"

raytranuk · raytranuk · commit 7124db94a399 · 2020-04-17T15:02:55.000+01:00
This reverts commit c65200c.
diff --git a/src/framework/components/element/text-element.js b/src/framework/components/element/text-element.js
@@ -276,12 +276,6 @@ Object.assign(pc, function () {
                 var ti = i % this._font.textures[0].length;
                 var p = (i - ti) / this._font.textures[0].length;
 
-                if (multiPassNeeded) {
-                    this._meshInfo[i].renderPass = passes[p];
-                } else {
-                    this._meshInfo[i].renderPass = RenderPass.ALL_IN_ONE;
-                }
-
                 if (!this._meshInfo[i]) {
                     this._meshInfo[i] = new MeshInfo();
                 } else {
@@ -292,10 +286,21 @@ Object.assign(pc, function () {
                         mi.setParameter("font_pxrange", this._getPxRange(this._font));
                         mi.setParameter("font_textureWidth", this._font.data.info.maps[ti].width);
 
-                        mi.setParameter("render_pass", this._meshInfo[i].renderPass);
-                        this._setTextureParams(mi, this._font.textures[0][ti], (multiPassNeeded) ? this._font.textures[1][ti]: null);
+                        if (multiPassNeeded) {
+                            this._setTextureParams(mi, this._font.textures[0][ti], this._font.textures[1][ti]);
+                            mi.setParameter("render_pass", passes[p]);
+                        } else {
+                            this._setTextureParams(mi, this._font.textures[0][ti], null);
+                            mi.setParameter("render_pass", RenderPass.ALL_IN_ONE);
+                        }
                     }
                 }
+
+                if (multiPassNeeded) {
+                    this._meshInfo[i].renderPass = passes[p];
+                } else {
+                    this._meshInfo[i].renderPass = RenderPass.ALL_IN_ONE;
+                }
             }
 
             // destroy any excess mesh instances
