Issue fixes in auto batching

Author: pandamicro

cocos2d/core/renderer/RendererWebGL.js

@@ -30,7 +30,7 @@ function objEqual (a, b) {
     var keys = Object.keys(a);
     for (var i = 0; i < keys.length; ++i) {
         var key = keys[i];
-        if (a[key] !== b[key]) {
+        if (!b[key] || a[key] !== b[key]) {
             return false;
         }
     }
@@ -218,6 +218,9 @@ return {
                 var buf = pool[i];
                 if (buf.bufferSize >= bufferSize && buf.indiceSize >= indiceSize) {
                     removeByLastSwap(pool, i);
+                    this.initBatchBuffers(buf.arrayBuffer, buf.elementBuffer, bufferSize, indiceSize);
+                    buf.bufferSize = bufferSize;
+                    buf.indiceSize = indiceSize;
                     return buf;
                 }
 
@@ -248,7 +251,7 @@ return {
     _forwardBatch: function (first) {
         var renderCmds = this._renderCmds,
             cmd = renderCmds[first];
-        if (!cmd || !cmd._supportBatch) return;
+        if (!cmd || !cmd._supportBatch) return 0;
 
         var info = {}, last;
 
@@ -263,6 +266,9 @@ return {
             if (cmd._supportBatch) {
                 cmd.getBatchInfo(info);
             }
+            else {
+                break;
+            }
             // Batch info don't match, break batching
             if (!objEqual(info, _batchedInfo)) {
                 break;
@@ -275,6 +281,10 @@ return {
         }
 
         var count = last - first;
+        if (count <= 1) {
+            return count;
+        }
+
         _batchedCount = count;
 
         var bufferSize = _batchedInfo.totalBufferSize;
@@ -342,14 +352,15 @@ return {
             indices[indiceI] = currentQuad + 0;
             indices[indiceI + 1] = currentQuad + 1;
             indices[indiceI + 2] = currentQuad + 2;
-            indices[indiceI + 3] = currentQuad + 1;
+            indices[indiceI + 3] = currentQuad + 3;
             indices[indiceI + 4] = currentQuad + 2;
-            indices[indiceI + 5] = currentQuad + 3;
+            indices[indiceI + 5] = currentQuad + 1;
             currentQuad += 4;
             indiceI += cmd.indicesPerUnit;
         }
 
         gl.bufferSubData(gl.ELEMENT_ARRAY_BUFFER, 0, indices);
+        return count;
     },
 
     _batchRendering: function () {
@@ -408,9 +419,11 @@ return {
             cmd = locCmds[i];
 
             // Batching or direct rendering
-            if (cmd._supportBatch) {
-                this._forwardBatch(i);
+            var batchCount = this._forwardBatch(i);
+            if (batchCount > 1) {
                 this._batchRendering();
+                // i will increase by 1 each loop
+                i += batchCount - 1;
             }
             else {
                 cmd.rendering(context);