Merge pull request #3273 from pandamicro/develop

Fix issues caused by performance improvement

Author: pandamicro

CCBoot.js

@@ -885,7 +885,7 @@ cc.loader = (function () {
                 isCrossOrigin: true
             };
             if (callback !== undefined)
-                opt.isCrossOrigin = option.isCrossOrigin === null ? opt.isCrossOrigin : option.isCrossOrigin;
+                opt.isCrossOrigin = option.isCrossOrigin === undefined ? opt.isCrossOrigin : option.isCrossOrigin;
             else if (option !== undefined)
                 callback = option;
 
@@ -917,9 +917,9 @@ cc.loader = (function () {
                 if (queue) {
                     callbacks = queue.callbacks;
                     for (var i = 0; i < callbacks.length; ++i) {
-                        var callback = callbacks[i];
-                        if (callback) {
-                            callback(null, img);
+                        var cb = callbacks[i];
+                        if (cb) {
+                            cb(null, img);
                         }
                     }
                     queue.img = null;
@@ -940,9 +940,9 @@ cc.loader = (function () {
                     if (queue) {
                         callbacks = queue.callbacks;
                         for (var i = 0; i < callbacks.length; ++i) {
-                            var callback = callbacks[i];
-                            if (callback) {
-                                callback("load image failed");
+                            var cb = callbacks[i];
+                            if (cb) {
+                                cb("load image failed");
                             }
                         }
                         queue.img = null;
@@ -1180,6 +1180,11 @@ cc.loader = (function () {
          */
         release: function (url) {
             var cache = this.cache;
+            var queue = _queue[url];
+            if (queue) {
+                queue.img = null;
+                delete _queue[url];
+            }
             delete cache[url];
             delete cache[_aliases[url]];
             delete _aliases[url];
@@ -1415,7 +1420,7 @@ var _initSys = function () {
      * @constant
      * @type {Number}
      */
-    sys.LANGUAGE_UNKNOWN = "unknown";
+    sys.LANGUAGE_UNKNOWN = "unkonwn";
 
     /**
      * @memberof cc.sys
@@ -2649,10 +2654,13 @@ cc.game = /** @lends cc.game# */{
         if (this._renderContext) {
             cc.renderer = cc.rendererWebGL;
             win.gl = this._renderContext; // global variable declared in CCMacro.js
-            cc.renderer.initQuadIndexBuffer();
+            cc.renderer.init();
             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/clipping-nodes/CCClippingNodeWebGLRenderCmd.js

@@ -57,8 +57,9 @@
     proto.transform = function(parentCmd, recursive){
         var node = this._node;
         cc.Node.WebGLRenderCmd.prototype.transform.call(this, parentCmd, recursive);
-        if(node._stencil)
+        if(node._stencil) {
             node._stencil._renderCmd.transform(this, recursive);
+        }
     };
 
     proto.visit = function(parentCmd){
@@ -72,7 +73,7 @@
 
         // if stencil buffer disabled
         if (cc.stencilBits < 1) {
-            // draw everything, as if there where no stencil
+            // draw everything, as if there were no stencil
             cc.Node.WebGLRenderCmd.prototype.visit.call(this, parentCmd);
             return;
         }
@@ -102,7 +103,7 @@
         this._syncStatus(parentCmd);
         currentStack.top = this._stackMatrix;
 
-        //this._stencil._stackMatrix = this._stackMatrix;
+        // node._stencil._stackMatrix = node._stackMatrix;
         node._stencil._renderCmd.visit(this);
 
         cc.renderer.pushRenderCommand(this._afterDrawStencilCmd);
@@ -166,6 +167,7 @@
             // set our alphaThreshold
             cc.glUseProgram(program.getProgram());
             program.setUniformLocationWith1f(cc.UNIFORM_ALPHA_TEST_VALUE_S, node.alphaThreshold);
+            program.setUniformLocationWithMatrix4fv(cc.UNIFORM_MVMATRIX_S, cc.renderer.mat4Identity.mat);
             cc.setProgram(node._stencil, program);
         }
     };

cocos2d/core/CCDirector.js

@@ -228,7 +228,6 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
             this._beforeVisitScene();
 
         // draw the scene
-        var skipRendering = false;
         if (this._runningScene) {
             if (renderer.childrenOrderDirty === true) {
                 cc.renderer.clearRenderCommands();
@@ -240,14 +239,9 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
             else if (renderer.transformDirty() === true) {
                 renderer.transform();
             }
-            else {
-                skipRendering = true;
-            }
         }
 
-        if (!skipRendering) {
-            renderer.clear();
-        }
+        renderer.clear();
 
         // draw the notifications node
         if (this._notificationNode)
@@ -259,9 +253,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
         if (this._afterVisitScene)
             this._afterVisitScene();
 
-        if (!skipRendering) {
-            renderer.rendering(cc._renderContext);
-        }
+        renderer.rendering(cc._renderContext);
         this._totalFrames++;
 
         cc.eventManager.dispatchEvent(this._eventAfterDraw);

cocos2d/core/CCDirectorWebGL.js

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

cocos2d/core/base-nodes/CCNode.js

@@ -132,6 +132,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
     _localZOrder: 0,                                     ///< Local order (relative to its siblings) used to sort the node
     _globalZOrder: 0,                                    ///< Global order used to sort the node
     _vertexZ: 0.0,
+    _customZ: NaN,
 
     _rotationX: 0,
     _rotationY: 0.0,
@@ -487,7 +488,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * @param {Number} Var
      */
     setVertexZ: function (Var) {
-        this._vertexZ = Var;
+        this._customZ = this._vertexZ = Var;
     },
 
     /**

cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

@@ -36,7 +36,7 @@ cc.CustomRenderCmd = function (target, func) {
 };
 
 cc.Node._dirtyFlags = {transformDirty: 1 << 0, visibleDirty: 1 << 1, colorDirty: 1 << 2, opacityDirty: 1 << 3, cacheDirty: 1 << 4,
-    orderDirty: 1 << 5, textDirty: 1 << 6, gradientDirty:1 << 7, all: (1 << 8) - 1};
+    orderDirty: 1 << 5, textDirty: 1 << 6, gradientDirty:1 << 7, textureDirty: 1 << 8, all: (1 << 9) - 1};
 
 //-------------------------Base -------------------------
 cc.Node.RenderCmd = function(renderable){
@@ -368,7 +368,7 @@ cc.Node.RenderCmd.prototype = {
         if(colorDirty || opacityDirty)
             this._updateColor();
 
-        if (cc._renderType === cc.game.RENDER_TYPE_WEBGL || locFlag & flags.transformDirty)
+        if (locFlag & flags.transformDirty)
             //update the transform
             this.transform(parentCmd, true);
 
@@ -395,18 +395,21 @@ cc.Node.RenderCmd.prototype = {
                 }
             }
 
-            var z = renderer.assignedZ;
-            node._vertexZ = z;
-            renderer.assignedZ += renderer.assignedZStep;
+            if (isNaN(node._customZ)) {
+                node._vertexZ = renderer.assignedZ;
+                renderer.assignedZ += renderer.assignedZStep;
+            }
 
             renderer.pushRenderCommand(this);
             for (; i < len; i++) {
                 child = children[i];
                 child._renderCmd.visit(this);
             }
         } else {
-            node._vertexZ = renderer.assignedZ;
-            renderer.assignedZ += renderer.assignedZStep;
+            if (isNaN(node._customZ)) {
+                node._vertexZ = renderer.assignedZ;
+                renderer.assignedZ += renderer.assignedZStep;
+            }
 
             renderer.pushRenderCommand(this);
         }

cocos2d/core/base-nodes/CCNodeWebGLRenderCmd.js

@@ -89,6 +89,30 @@
         // Update Z depth
         t4x4Mat[14] = node._vertexZ;
 
+        // 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) {
             return;
         }

cocos2d/core/platform/CCMacro.js

@@ -621,6 +621,11 @@ cc.UNIFORM_MAX = 8;
  * @type {String}
  */
 cc.SHADER_POSITION_TEXTURECOLOR = "ShaderPositionTextureColor";
+/**
+ * @constant
+ * @type {String}
+ */
+cc.SHADER_SPRITE_POSITION_TEXTURECOLOR = "ShaderSpritePositionTextureColor";
 /**
  * @constant
  * @type {String}

cocos2d/core/renderer/GlobalVertexBuffer.js

@@ -40,7 +40,7 @@ var GlobalVertexBuffer = function (gl) {
 
     // Init buffer data
     gl.bindBuffer(gl.ARRAY_BUFFER, this.vertexBuffer);
-    gl.bufferData(gl.ARRAY_BUFFER, this.byteLength, gl.DYNAMIC_DRAW);
+    gl.bufferData(gl.ARRAY_BUFFER, this.dataArray, gl.DYNAMIC_DRAW);
 
     this._dirty = false;
     this._spaces = {

cocos2d/core/renderer/RendererWebGL.js

@@ -126,6 +126,8 @@ function createVirtualBuffer (buffer, vertexOffset, totalBufferSize, count, data
 }
 
 return {
+    mat4Identity: null,
+
     childrenOrderDirty: true,
     assignedZ: 0,
     assignedZStep: 1/10000,
@@ -139,7 +141,9 @@ return {
     _currentID: 0,
     _clearColor: cc.color(),                            //background color,default BLACK
 
-    initQuadIndexBuffer: function () {
+    init: function () {
+        this.mat4Identity = new cc.math.Matrix4();
+        this.mat4Identity.identity();
         getQuadIndexBuffer(1000);
     },
 
@@ -193,6 +197,12 @@ return {
         renderTextureId = renderTextureId || this._currentID;
         var locCmds = this._cacheToBufferCmds[renderTextureId], i, len;
         var ctx = cc._renderContext, locIDs = this._cacheInstanceIds;
+        // Update all global buffers (only invoke bufferSubData when buffer is dirty)
+        for (i = 0, len = _gbuffers.length; i < len; ++i) {
+            _gbuffers[i].update();
+        }
+        // Reset buffer cache to avoid issue
+        gl.bindBuffer(gl.ARRAY_BUFFER, null);
         for (i = 0, len = locCmds.length; i < len; i++) {
             locCmds[i].rendering(ctx);
         }

cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js

@@ -32,10 +32,10 @@
         this._needDraw = true;
 
         this._vertices = [
-            {x: 0, y: 0, z: 0},
-            {x: 0, y: 0, z: 0},
-            {x: 0, y: 0, z: 0},
-            {x: 0, y: 0, z: 0}
+            {x: 0, y: 0, z: 0}, // tl
+            {x: 0, y: 0, z: 0}, // bl
+            {x: 0, y: 0, z: 0}, // tr
+            {x: 0, y: 0, z: 0}  // br
         ];
         var length = this.vertexBytesPerUnit;
         var bufInfo = cc.renderer.requestBuffer(length);
@@ -321,7 +321,6 @@
             for (i = 0; i < 4; ++i) {
                 x = vertices[i].x;
                 y = vertices[i].y;
-                z = vertices[i].z;
                 buffer[offset] = x * mat[0] + y * mat[4] + mat[12];
                 buffer[offset+1] = x * mat[1] + y * mat[5] + mat[13];
                 buffer[offset+2] = mat[14];
@@ -555,7 +554,7 @@
             }
         } else {
             program.use();
-            program._setUniformForMVPMatrixWithMat4(this._stackMatrix);
+            program._updateProjectionUniform();
 
             cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
 

cocos2d/particle/CCParticleSystemWebGLRenderCmd.js

@@ -366,7 +366,7 @@
     proto.postStep = function(){
         var gl = cc._renderContext;
         gl.bindBuffer(gl.ARRAY_BUFFER, this._buffersVBO[0]);
-        gl.bufferData(gl.ARRAY_BUFFER, this._quadsArrayBuffer, gl.DYNAMIC_DRAW);
+        gl.bufferSubData(gl.ARRAY_BUFFER, 0, this._quadsArrayBuffer);
     };
 
     proto._setBlendAdditive = function(){