wip

Author: Travis Gesslein

cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

@@ -35,6 +35,11 @@ cc.CustomRenderCmd = function (target, func) {
     }
 };
 
+cc.CustomRenderCmd.prototype.configureBatch = function()
+{
+    return 1;
+}
+
 cc.Node._dirtyFlags =
     {
         transformDirty: 1 << 0,

cocos2d/core/base-nodes/CCNodeWebGLRenderCmd.js

@@ -42,7 +42,6 @@
     proto.geometryType = cc.geometryTypes.NONE;
 
     proto._updateColor = function(){};
-    proto._batching = false;
     proto._batchedCount = 1;
 
     proto.visit = function (parentCmd) {

cocos2d/core/renderer/RendererWebGL.js

@@ -195,38 +195,22 @@ cc.rendererWebGL = {
 
         this.updateBuffers();
 
-        
-
         //prepare batching
-        for (i = 0, len = locCmds.length; i< len; ++i) 
+        for (i = 0, len = locCmds.length; i< len; ) 
         {
             var cmd = locCmds[i];
 
-            if(!cmd._batched && cmd.configureBatch) //may be set to true by processed cmds during this loop 
-            {
-                 cmd.configureBatch(locCmds, i);
-            }
+            var batchedCount = cmd.configureBatch(locCmds, i);
+            i += batchedCount;
         }
 
-        for (i = 0, len = locCmds.length; i< len; ++i) {
+        for (i = 0, len = locCmds.length; i< len;) {
             var cmd = locCmds[i];
-            if(cmd._batching)
-            {
-                cmd.batchedRendering();
-            }
-            else if(!cmd._batched)
-            {
-                cmd.rendering();
-            }
-        }
 
-        //prepare batching
-        for (i = 0, len = locCmds.length; i< len; ++i) 
-        {
-            locCmds[i]._batching = false;
-            locCmds[i]._batched = false;
+            cmd.rendering();
+            i += cmd._batchedCount;
         }
-        
+
         cc._stateCacheStats.lastFrameVertexFormatSwitches = cc._stateCacheStats.vertexFormatSwitches;
         cc._stateCacheStats.vertexFormatSwitches = 0;
     },

cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js

@@ -265,28 +265,26 @@
 
     proto.rendering = function () {
         var node = this._node, locTexture = node._texture;
-
+        var count = this._batchedCount;
         var program = this._shaderProgram;
-         if (locTexture) {
-                program.use();
 
-                cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
-
-                cc.glBindTexture2DN(0, locTexture);                   // = cc.glBindTexture2D(locTexture);
-                //cc.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POS_COLOR_TEX);
+        cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
 
-                cc.glBindVertexFormat(cc.renderer.vertexFormats[1]);
-                
-                gl.drawArrays(gl.TRIANGLE_STRIP, this._firstQuad * 4, 4);
-        } else {
-            program.use();
+        var elemBuffer = cc.renderer.buffers[cc.geometryTypes.QUAD].indexBuffer;
+        cc.glBindElementBuffer(elemBuffer);
+        cc.glBindVertexFormat(cc.renderer.vertexFormats[1]);
+
+        program.use();
+        if (locTexture)
+        {
+                cc.glBindTexture2DN(0, locTexture); 
+                gl.drawElements(gl.TRIANGLES, count * 6, gl.UNSIGNED_SHORT, this._firstQuad * 6 * 2);
+        }
+        else
+        {
             program._setUniformForMVPMatrixWithMat4(this._stackMatrix);
-
-            cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
             cc.glBindTexture2D(null);
 
-            cc.glBindVertexFormat(cc.renderer.vertexFormats[1]);
-            
             gl.drawArrays(gl.TRIANGLE_STRIP, this._firstQuad * 4, 4);
         }
 
@@ -330,19 +328,10 @@
             if (texture !== otherNode.getTexture()) {
                 break;
             }
-
-            cmd._batched = true;
         }
 
         var count = i - myIndex;
-
-        if (count > 1) {
-            this._batching = true;
-            this._batchedCount = count;
-        }
-        else {
-            return 1;
-        }
+        this._batchedCount = count;
 
         return count;
     }

cocos2d/labels/BatchedLabelWebGLRenderCmd.js

@@ -54,7 +54,7 @@
 
     proto.rendering = function ()
     {
-        //return;
+        return;
         var node = this._node;
         if(node._stringDirty)
         {
@@ -288,19 +288,12 @@
                 //also, when batching we have to 0 out the vertex data buffer to make sure those quads aren't drawn (they are uploaded to gpu anyways)
             }
 
-            cmd._batched = true;
             drawnQuads += cmd._numQuads;
         }
 
         var count  = i - myIndex;
 
-        if (count > 1) {
-            this._batching = true;
-            this._batchedCount = count;
-        }
-        else {
-            return 1;
-        }
+        this._batchedCount = count;
 
         if(node._stringDirty)
         {