working on setting up texture index on vertex buffer object.

Author: bitnenfer

src/pixi/renderers/webgl/shaders/PixiShader.js

@@ -95,9 +95,13 @@ PIXI.PixiShader.prototype.init = function()
         'varying vec4 vColor;',
         'varying float vTextureIndex;',
         'uniform sampler2D uSamplerArray[' + MAX_TEXTURES + '];',
+        'const vec4 PINK = vec4(1.0, 0.0, 1.0, 1.0);',
+        'const vec4 GREEN = vec4(0.0, 1.0, 0.0, 1.0);',
         'void main(void) {',
-        dynamicIfs,
-        '\telse gl_FragColor = texture2D(uSamplerArray[0], vTextureCoord) * vColor;',
+        //dynamicIfs,
+        'if (vTextureIndex == 0.0) gl_FragColor = texture2D(uSamplerArray[0], vTextureCoord) * vColor;',
+        'else if(vTextureIndex == 1.0) gl_FragColor = PINK;',
+        'else gl_FragColor = GREEN;',
         '}'
     ];
 
@@ -119,7 +123,7 @@ PIXI.PixiShader.prototype.init = function()
     this.aTextureIndex = gl.getAttribLocation(program, 'aTextureIndex');
 
     var indices = [];
-    for (var i = 0; i < /*MAX_TEXTURES*/2; ++i) {
+    for (var i = 0; i < MAX_TEXTURES; ++i) {
         indices.push(i);
     }
     // NOTE:!!!

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

@@ -260,7 +260,7 @@ PIXI.WebGLSpriteBatch.prototype.render = function (sprite, matrix) {
         h1 = texture.frame.height * -aY;
     }
 
-    var i = this.currentBatchSize * 4 * this.vertSize;
+    var i = this.currentBatchSize * this.vertexSize;//4 * this.vertSize;
     var tiOffset = this.currentBatchSize * 4;
     var resolution = texture.baseTexture.resolution;
     var textureIndex = texture.baseTexture.textureIndex;
@@ -409,7 +409,7 @@ PIXI.WebGLSpriteBatch.prototype.renderTilingSprite = function (sprite) {
     var h0 = height * (1 - aY);
     var h1 = height * -aY;
 
-    var i = this.currentBatchSize * 4 * this.vertSize;
+    var i = this.currentBatchSize * this.vertexSize;//4 * this.vertSize;
 
     var resolution = texture.baseTexture.resolution;
 
@@ -495,9 +495,8 @@ PIXI.WebGLSpriteBatch.prototype.flush = function () {
         // bind the buffers
         gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
         gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, this.indexBuffer);
-
         // this is the same for each shader?
-        var stride = this.vertexSize;//this.vertSize * 4;
+        var stride = this.vertexSize; //this.vertSize * 4;
         gl.vertexAttribPointer(shader.aVertexPosition, 2, gl.FLOAT, false, stride, 0);
         gl.vertexAttribPointer(shader.aTextureCoord, 2, gl.FLOAT, false, stride, 8);
 
@@ -513,7 +512,7 @@ PIXI.WebGLSpriteBatch.prototype.flush = function () {
         gl.bufferSubData(gl.ARRAY_BUFFER, 0, this.vertices);
     } else {
         gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
-        var view = this.positions.subarray(0, this.currentBatchSize * 4 * this.vertSize);
+        var view = this.positions.subarray(0, this.currentBatchSize * this.vertexSize);
         gl.bufferSubData(gl.ARRAY_BUFFER, 0, view);
     }
 
@@ -551,7 +550,7 @@ PIXI.WebGLSpriteBatch.prototype.flush = function () {
             skip = false;
         }
 
-        if (( /*currentBaseTexture !== nextTexture &&*/ !skip) || blendSwap || shaderSwap) {
+        if (( currentBaseTexture !== nextTexture && !skip) || blendSwap || shaderSwap) {
             this.renderBatch(currentBaseTexture, batchSize, start);
 
             start = i;
@@ -628,7 +627,6 @@ PIXI.WebGLSpriteBatch.prototype.renderBatch = function (texture, size, startInde
         }
     } else {
         gl.activeTexture(gl.TEXTURE0 + texture.textureIndex);
-        //console.log(texture.textureIndex);
         // bind the current texture
         gl.bindTexture(gl.TEXTURE_2D, texture._glTextures[gl.id]);
     }
@@ -666,7 +664,6 @@ PIXI.WebGLSpriteBatch.prototype.destroy = function () {
 
     this.gl.deleteBuffer(this.vertexBuffer);
     this.gl.deleteBuffer(this.indexBuffer);
-    this.gl.deleteBuffer(this.texIndexBuffer);
 
     this.currentBaseTexture = null;