Merge pull request cocos2d#3280 from pandamicro/develop

Fix last issues about new rendering process

Author: pandamicro

cocos2d/core/renderer/RendererCanvas.js

@@ -75,11 +75,9 @@ cc.rendererCanvas = {
         for (i = 0, len = locCmds.length; i < len; i++) {
             locCmds[i].rendering(ctx, scaleX, scaleY);
         }
-        locCmds.length = 0;
-        var locIDs = this._cacheInstanceIds;
-        delete this._cacheToCanvasCmds[instanceID];
-        cc.arrayRemoveObject(locIDs, instanceID);
+        this._removeCache(instanceID);
 
+        var locIDs = this._cacheInstanceIds;
         if (locIDs.length === 0)
             this._isCacheToCanvasOn = false;
         else
@@ -99,6 +97,15 @@ cc.rendererCanvas = {
         this._isCacheToCanvasOn = false;
     },
 
+    _removeCache: function (instanceID) {
+        instanceID = instanceID || this._currentID;
+        this._cacheToCanvasCmds[instanceID].length = 0;
+        delete this._cacheToCanvasCmds[instanceID];
+
+        var locIDs = this._cacheInstanceIds;
+        cc.arrayRemoveObject(locIDs, instanceID);
+    },
+
     resetFlag: function () {
         this.childrenOrderDirty = false;
         this._transformNodePool.length = 0;

cocos2d/core/renderer/RendererWebGL.js

@@ -196,14 +196,23 @@ return {
         this._isCacheToBufferOn = false;
     },
 
+    _removeCache: function (instanceID) {
+        instanceID = instanceID || this._currentID;
+        this._cacheToBufferCmds[instanceID].length = 0;
+        delete this._cacheToBufferCmds[instanceID];
+
+        var locIDs = this._cacheInstanceIds;
+        cc.arrayRemoveObject(locIDs, instanceID);
+    },
+
     /**
      * drawing all renderer command to cache canvas' context
      * @param {Number} [renderTextureId]
      */
     _renderingToBuffer: function (renderTextureId) {
         renderTextureId = renderTextureId || this._currentID;
         var locCmds = this._cacheToBufferCmds[renderTextureId], i, len;
-        var ctx = cc._renderContext, locIDs = this._cacheInstanceIds;
+        var ctx = cc._renderContext;
         // Update all global buffers (only invoke bufferSubData when buffer is dirty)
         for (i = 0, len = _gbuffers.length; i < len; ++i) {
             _gbuffers[i].update();
@@ -213,10 +222,9 @@ return {
         for (i = 0, len = locCmds.length; i < len; i++) {
             locCmds[i].rendering(ctx);
         }
-        locCmds.length = 0;
-        delete this._cacheToBufferCmds[renderTextureId];
-        cc.arrayRemoveObject(locIDs, renderTextureId);
+        this._removeCache(renderTextureId);
 
+        var locIDs = this._cacheInstanceIds;
         if (locIDs.length === 0)
             this._isCacheToBufferOn = false;
         else
@@ -676,6 +684,9 @@ return {
             this._refreshVirtualBuffers();
         }
 
+        // Reset buffer for rendering
+        context.bindBuffer(gl.ARRAY_BUFFER, null);
+
         for (i = 0, len = locCmds.length; i < len; ++i) {
             cmd = locCmds[i];
             next = locCmds[i+1];

cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js

@@ -523,8 +523,7 @@
     };
 
     proto.needDraw = function () {
-        var node = this._node, locTexture = node._texture;
-        return (this._buffer && locTexture && locTexture._textureLoaded && node._rect.width && node._rect.height && this._displayedOpacity);
+        return (this._buffer && this._node._texture);
     };
 
     proto.rendering = function (ctx) {

cocos2d/progress-timer/CCProgressTimerWebGLRenderCmd.js

@@ -47,7 +47,7 @@
     proto.rendering = function (ctx) {
         var node = this._node;
         var context = ctx || cc._renderContext;
-        if (!this._vertexDataCount || !node._sprite)
+        if (this._vertexDataCount === 0 || !node._sprite)
             return;
 
         this._shaderProgram.use();
@@ -177,7 +177,11 @@
     proto.releaseData = function(){
         if (this._vertexData) {
             //release all previous information
-            cc._renderContext.deleteBuffer(this._vertexWebGLBuffer);
+            var webglBuffer = this._vertexWebGLBuffer;
+            setTimeout(function () {
+                cc._renderContext.deleteBuffer(webglBuffer);
+            }, 0.1);
+            this._vertexWebGLBuffer = null;
             this._vertexData = null;
             this._float32View = null;
             this._vertexArrayBuffer = null;

cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js

@@ -48,6 +48,10 @@
         this._fullViewport = fullViewport;
     };
 
+    proto.needDraw = function () {
+        return this._needDraw && this._node.autoDraw;
+    };
+
     proto.rendering = function (ctx) {
         var gl = ctx || cc._renderContext;
         var node = this._node;

extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js

@@ -131,6 +131,11 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{
         this.scheduleUpdate();
     },
 
+    onExit: function () {
+        cc.renderer._removeCache(this.__instanceId);
+        ccui.Layout.prototype.onExit.call(this);
+    },
+
     /**
      * When a widget is in a layout, you could call this method to get the next focused widget within a specified _direction.             <br/>
      * If the widget is not in a layout, it will return itself

extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js

@@ -163,7 +163,37 @@
         currentStack.top = this._stackMatrix;
 
         node.sortAllChildren();
-        cc.renderer.pushRenderCommand(this);
+
+        var renderer = cc.renderer,
+            children = node._children, child,
+            i, len = children.length;
+
+        for (i = 0; i < len; i++) {
+            child = children[i];
+            if (child._localZOrder < 0) {
+                if (isNaN(child._customZ)) {
+                    child._vertexZ = renderer.assignedZ;
+                    renderer.assignedZ += renderer.assignedZStep;
+                }
+            }
+            else {
+                break;
+            }
+        }
+
+        if (isNaN(node._customZ)) {
+            node._vertexZ = renderer.assignedZ;
+            renderer.assignedZ += renderer.assignedZStep;
+        }
+        renderer.pushRenderCommand(this);
+        
+        for (; i < len; i++) {
+            child = children[i];
+            if (isNaN(child._customZ)) {
+                child._vertexZ = renderer.assignedZ;
+                renderer.assignedZ += renderer.assignedZStep;
+            }
+        }
 
         this._dirtyFlag = 0;
         currentStack.top = currentStack.stack.pop();

extensions/cocostudio/armature/display/CCSkinWebGLRenderCmd.js

@@ -45,10 +45,8 @@
         var node = this._node;
         var locQuad = this._quad;
         var vertices = this._vertices;
-        // If it is not visible, or one of its ancestors is not visible, then do nothing:
-        if (!node._visible)
-            locQuad.br.vertices = locQuad.tl.vertices = locQuad.tr.vertices = locQuad.bl.vertices = {x: 0, y: 0, z: 0};
-        else if (this._buffer) {
+        
+        if (this._buffer) {
             //
             // calculate the Quad based on the Affine Matrix
             //
@@ -86,11 +84,11 @@
             if (node.textureAtlas) {
                 node.textureAtlas.updateQuad(locQuad, node.textureAtlas.getTotalQuads());
             }
-
-            this._quadDirty = true;
-            this._savedDirtyFlag = true;
-            this._bufferDirty = true;
-            this._buffer.setDirty();
+            
+            // Need manually buffer data because it's invoked during rendering
+            cc._renderContext.bindBuffer(gl.ARRAY_BUFFER, this._buffer.vertexBuffer);
+            cc._renderContext.bufferSubData(gl.ARRAY_BUFFER, this._bufferOffset, this._float32View);
+            cc._renderContext.bindBuffer(gl.ARRAY_BUFFER, null);
         }
     };
 })();