Draft implementation of auto batch

Author: pandamicro

CCBoot.js

@@ -2595,6 +2595,9 @@ cc.game = /** @lends cc.game# */{
             cc.shaderCache._init();
             cc._drawingUtil = new cc.DrawingPrimitiveWebGL(this._renderContext);
             cc.textureCache._initializingRenderer();
+            // cc.glExt = {};
+            // cc.glExt.instanced_arrays = gl.getExtension("ANGLE_instanced_arrays");
+            // cc.glExt.element_uint = gl.getExtension("OES_element_index_uint");
         } else {
             cc.renderer = cc.rendererCanvas;
             this._renderContext = cc._renderContext = new cc.CanvasContextWrapper(localCanvas.getContext("2d"));

cocos2d/core/CCDirectorWebGL.js

@@ -82,7 +82,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
                     size.width - ox,
                     -oy,
                     size.height - oy,
-                    -1024, 1024);
+                    -1, 1);
                 cc.kmGLMultMatrix(orthoMatrix);
                 cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
                 cc.kmGLLoadIdentity();

cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

@@ -32,7 +32,7 @@ cc.CustomRenderCmd = function (target, func) {
         if (!this._callback)
             return;
         this._callback.call(this._target, ctx, scaleX, scaleY);
-    }
+    };
 };
 
 cc.Node._dirtyFlags = {transformDirty: 1 << 0, visibleDirty: 1 << 1, colorDirty: 1 << 2, opacityDirty: 1 << 3, cacheDirty: 1 << 4,
@@ -56,6 +56,9 @@ cc.Node.RenderCmd = function(renderable){
     this._cascadeOpacityEnabledDirty = false;
 
     this._curLevel = -1;
+
+    this._minZ = 0;
+    this._maxZ = 0;
 };
 
 cc.Node.RenderCmd.prototype = {
@@ -368,24 +371,50 @@ cc.Node.RenderCmd.prototype = {
     },
 
     visitChildren: function(){
+        var renderer = cc.renderer;
         var node = this._node;
-        var i, children = node._children, child;
+        var i, children = node._children, child, cmd;
         var len = children.length;
+        var minZ = Number.MAX_VALUE;
+        var maxZ = -Number.MAX_VALUE;
         if (len > 0) {
             node.sortAllChildren();
             // draw children zOrder < 0
             for (i = 0; i < len; i++) {
                 child = children[i];
-                if (child._localZOrder < 0)
-                    child._renderCmd.visit(this);
-                else
+                if (child._localZOrder < 0) {
+                    cmd = child._renderCmd;
+                    cmd.visit(this);
+                    // minZ = Math.min(minZ, child._minZ);
+                    // maxZ = Math.max(maxZ, child._maxZ);
+                }
+                else {
                     break;
+                }
             }
-            cc.renderer.pushRenderCommand(this);
-            for (; i < len; i++)
-                children[i]._renderCmd.visit(this);
+
+            var z = renderer.assignedZ;
+            node._vertexZ = z;
+            renderer.assignedZ += renderer.assignedZStep;
+
+            // minZ = Math.min(minZ,z);
+            // maxZ = Math.max(maxZ,z);
+
+            renderer.pushRenderCommand(this);
+            for (; i < len; i++) {
+                child = children[i];
+                child._renderCmd.visit(this);
+                // minZ = Math.min(minZ, child._minZ);
+                // maxZ = Math.max(maxZ, child._maxZ);
+            }
+
+            // node._minZ = minZ;
+            // node._maxZ = maxZ;
         } else {
-            cc.renderer.pushRenderCommand(this);
+            node._vertexZ = renderer.assignedZ;
+            renderer.assignedZ += renderer.assignedZStep;
+
+            renderer.pushRenderCommand(this);
         }
         this._dirtyFlag = 0;
     }
@@ -399,7 +428,6 @@ cc.Node.RenderCmd.prototype = {
         cc.Node.RenderCmd.call(this, renderable);
         this._cachedParent = null;
         this._cacheDirty = false;
-
     };
 
     var proto = cc.Node.CanvasRenderCmd.prototype = Object.create(cc.Node.RenderCmd.prototype);

cocos2d/core/base-nodes/CCNodeWebGLRenderCmd.js

@@ -80,37 +80,16 @@
         t4x4Mat[5] = trans.d;
         t4x4Mat[13] = trans.ty;
 
-        // Update Z vertex manually
-        t4x4Mat[14] = node._vertexZ;
-
         //optimize performance for Javascript
         cc.kmMat4Multiply(stackMatrix, parentMatrix, t4x4);
 
-        // XXX: Expensive calls. Camera should be integrated into the cached affine matrix
-        if (node._camera !== null && !(node.grid !== null && node.grid.isActive())) {
-            var apx = this._anchorPointInPoints.x, apy = this._anchorPointInPoints.y;
-            var translate = (apx !== 0.0 || apy !== 0.0);
-            if (translate){
-                if(!cc.SPRITEBATCHNODE_RENDER_SUBPIXEL) {
-                    apx = 0 | apx;
-                    apy = 0 | apy;
-                }
-                //cc.kmGLTranslatef(apx, apy, 0);
-                var translation = cc.math.Matrix4.createByTranslation(apx, apy, 0, t4x4);      //t4x4 as a temp matrix
-                stackMatrix.multiply(translation);
-
-                node._camera._locateForRenderer(stackMatrix);
-
-                //cc.kmGLTranslatef(-apx, -apy, 0);    optimize at here : kmGLTranslatef
-                translation = cc.math.Matrix4.createByTranslation(-apx, -apy, 0, translation);
-                stackMatrix.multiply(translation);
-                t4x4.identity(); //reset t4x4;
-            } else {
-                node._camera._locateForRenderer(stackMatrix);
-            }
-        }
-        if(!recursive || !node._children || node._children.length === 0)
+        // Update Z depth
+        t4x4Mat[14] = node._vertexZ;
+
+        if (!recursive || !node._children) {
             return;
+        }
+        
         var i, len, locChildren = node._children;
         for(i = 0, len = locChildren.length; i< len; i++){
             locChildren[i]._renderCmd.transform(this, recursive);

cocos2d/core/platform/CCConfig.js

@@ -56,7 +56,7 @@ window["CocosEngine"] = cc.ENGINE_VERSION = "Cocos2d-JS v3.11";
  * @constant
  * @type {Number}
  */
-cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
+cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 1;
 
 /**
  * Position of the FPS (Default: 0,0 (bottom-left corner))<br/>

cocos2d/core/platform/CCMacro.js

@@ -566,7 +566,27 @@ cc.VERTEX_ATTRIB_TEX_COORDS = 2;
  * @constant
  * @type {Number}
  */
-cc.VERTEX_ATTRIB_MAX = 3;
+cc.VERTEX_ATTRIB_MVMAT0 = 3;
+/**
+ * @constant
+ * @type {Number}
+ */
+cc.VERTEX_ATTRIB_MVMAT1 = 4;
+/**
+ * @constant
+ * @type {Number}
+ */
+cc.VERTEX_ATTRIB_MVMAT2 = 5;
+/**
+ * @constant
+ * @type {Number}
+ */
+cc.VERTEX_ATTRIB_MVMAT3 = 6;
+/**
+ * @constant
+ * @type {Number}
+ */
+cc.VERTEX_ATTRIB_MAX = 7;
 
 //------------Uniforms------------------
 /**
@@ -626,6 +646,11 @@ cc.SHADER_POSITION_TEXTURECOLOR = "ShaderPositionTextureColor";
  * @type {String}
  */
 cc.SHADER_POSITION_TEXTURECOLORALPHATEST = "ShaderPositionTextureColorAlphaTest";
+/**
+ * @constant
+ * @type {String}
+ */
+cc.SHADER_POSITION_TEXTURECOLORALPHATEST_BATCHED = "ShaderPositionTextureColorAlphaTestBatched";
 /**
  * @constant
  * @type {String}
@@ -720,6 +745,11 @@ cc.ATTRIBUTE_NAME_POSITION = "a_position";
  * @type {String}
  */
 cc.ATTRIBUTE_NAME_TEX_COORD = "a_texCoord";
+/**
+ * @constant
+ * @type {String}
+ */
+cc.ATTRIBUTE_NAME_MVMAT = "a_mvMatrix";
 
 
 /**