Fix multi-texture batching binding the wrong texture to the active unit

CHANGELOG.md

@@ -14,6 +14,7 @@
 
 - Fixed an error when the WebGL context of a destroyed game was lost (#756).
 - Fixed a new WebGL renderer taking the context id of a live renderer after another renderer was destroyed (#757).
+- Fixed multi-texture batching binding the last batched texture to whichever texture unit was active, which could draw the wrong texture (e.g., stretched over the canvas by the debug sprite) (#231).
 
 ### Thanks
 

src/gameobjects/Creature.js

@@ -492,6 +492,12 @@ Phaser.Creature.prototype._renderCreature = function (renderSession)
         gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this.indices, gl.STATIC_DRAW);
     }
 
+    if (PIXI._enableMultiTextureToggle)
+    {
+        PIXI.WebGLRenderer.textureArray[0] = null;
+        PIXI.WebGLRenderer.textureArray[this.texture.baseTexture.textureIndex] = null;
+    }
+
     gl.drawElements(gl.TRIANGLES, this.indices.length, gl.UNSIGNED_SHORT, 0);
 };
 

src/gameobjects/Rope.js

@@ -447,6 +447,12 @@ Phaser.Rope.prototype._renderStrip = function (renderSession)
         gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this.indices, gl.STATIC_DRAW);
     }
 
+    if (PIXI._enableMultiTextureToggle)
+    {
+        PIXI.WebGLRenderer.textureArray[0] = null;
+        PIXI.WebGLRenderer.textureArray[this.texture.baseTexture.textureIndex] = null;
+    }
+
     gl.drawElements(drawMode, this.indices.length, gl.UNSIGNED_SHORT, 0);
 };
 

src/pixi/renderers/webgl/utils/WebGLFilterManager.js

@@ -93,6 +93,8 @@ PIXI.WebGLFilterManager.prototype.pushFilter = function (filterBlock)
     this.offsetX += filterBlock._filterArea.x;
     this.offsetY += filterBlock._filterArea.y;
 
+    gl.activeTexture(gl.TEXTURE0);
+
     var texture = this.texturePool.pop();
     if(!texture)
     {
@@ -104,6 +106,7 @@ PIXI.WebGLFilterManager.prototype.pushFilter = function (filterBlock)
     }
 
     gl.bindTexture(gl.TEXTURE_2D, texture.texture);
+    PIXI.WebGLRenderer.textureArray[0] = null;
 
     var filterArea = filterBlock._filterArea;// filterBlock.target.getBounds();///filterBlock.target.filterArea;
 
@@ -315,6 +318,7 @@ PIXI.WebGLFilterManager.prototype.popFilter = function ()
     // set texture
     gl.activeTexture(gl.TEXTURE0);
     gl.bindTexture(gl.TEXTURE_2D, texture.texture);
+    PIXI.WebGLRenderer.textureArray[0] = null;
 
     // >>> modify by nextht
     if (this.renderSession.stencilManager)

src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js

@@ -782,8 +782,9 @@ PIXI.WebGLSpriteBatch.prototype.renderBatch = function (texture, size, startInde
             return;
         }
     }
-    else
+    else if (!PIXI._enableMultiTextureToggle)
     {
+        //  With multi-texture batching each texture is already bound to its own unit
         gl.bindTexture(gl.TEXTURE_2D, texture._glTextures[gl.id]);
     }