Improve visit logic, reduce call stack depth

Author: pandamicro

cocos2d/actions/CCAction.js

@@ -239,7 +239,7 @@ cc.Action.create = cc.action;
  */
 cc.FiniteTimeAction = cc.Action.extend(/** @lends cc.FiniteTimeAction# */{
     // duration in seconds
-    _duration:0,
+    _duration: 0,
 
     /**
      * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.

cocos2d/clipping-nodes/CCClippingNode.js

@@ -66,19 +66,6 @@ cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
         this._renderCmd.initStencilBits();
     },
 
-    /**
-     * Initialization of the node, please do not call this function by yourself, you should pass the parameters to constructor to initialize it
.
-     * @function
-     * @param {cc.Node} [stencil=null]
-     */
-    init: function (stencil) {
-        this._stencil = stencil;
-        this.alphaThreshold = 1;
-        this.inverted = false;
-        this._renderCmd.initStencilBits();
-        return true;
-    },
-
     /**
      * <p>
      *     Event callback that is invoked every time when node enters the 'stage'.                                   <br/>
@@ -135,6 +122,28 @@ cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
         cc.Node.prototype.onExit.call(this);
     },
 
+    visit: function (parent) {
+        if (!this._visible)
+            return;
+
+        this._renderCmd.clippingVisit(parent && parent._renderCmd);
+    },
+
+    _visitChildren: function () {
+        var renderer = cc.renderer;
+        if (this._reorderChildDirty) {
+            this.sortAllChildren();
+        }
+        var children = this._children, child;
+        for (var i = 0, len = children.length; i < len; i++) {
+            child = children[i];
+            if (child && child._visible) {
+                child.visit(this);
+            }
+        }
+        this._renderCmd._dirtyFlag = 0;
+    },
+
     /**
      * <p>
      * The alpha threshold.                                                                                   <br/>

cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js

@@ -168,47 +168,40 @@
         return cc.ClippingNode.CanvasRenderCmd.prototype._godhelpme;
     };
 
-    proto.visit = function(parentCmd){
+    proto.clippingVisit = function (parentCmd) {
         var node = this._node;
-        // quick return if not visible
-        if (!node._visible)
-            return;
-
         parentCmd = parentCmd || this.getParentRenderCmd();
-        if( parentCmd)
-            this._curLevel = parentCmd._curLevel + 1;
-        var transformRenderCmd = this;
+        this.visit(parentCmd);
 
-        this._syncStatus(parentCmd);
         // Composition mode, costy but support texture stencil
         this._clipElemType = !(!this._cangodhelpme() && node._stencil instanceof cc.DrawNode);
         if (!node._stencil || !node._stencil.visible) {
             if (this.inverted)
-                this.originVisit(parentCmd);   // draw everything
+                node._visitChildren();   // draw everything
             return;
         }
 
         cc.renderer.pushRenderCommand(this._rendererSaveCmd);
-        if(this._clipElemType){
+        if (this._clipElemType) {
             // Draw everything first using node visit function
-            this.originVisit(parentCmd);
-        }else{
-            node._stencil.visit(this);
+            node._visitChildren();
+        } else {
+            node._stencil.visit(node);
         }
         cc.renderer.pushRenderCommand(this._rendererClipCmd);
 
-        if(this._clipElemType){
-            node._stencil.visit(transformRenderCmd);
-        }else{
-            var i, children = node._children;
+        if (this._clipElemType) {
+            node._stencil.visit(node);
+        } else {
             // Clip mode doesn't support recursive stencil, so once we used a clip stencil,
             // so if it has ClippingNode as a child, the child must uses composition stencil.
             this._cangodhelpme(true);
-            var len = children.length;
+            var children = node._children;
+            var i, len = children.length;
             if (len > 0) {
                 node.sortAllChildren();
                 for (i = 0; i < len; i++)
-                    children[i]._renderCmd.visit(this);
+                    children[i].visit(node);
             }
             this._cangodhelpme(false);
         }

cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js

@@ -58,29 +58,26 @@
         var node = this._node;
         this.originTransform(parentCmd, recursive);
         if (node._stencil) {
-            node._stencil._renderCmd.transform(this, recursive);
+            node._stencil._renderCmd.transform(this, true);
+            node._stencil._dirtyFlag &= ~cc.Node._dirtyFlags.transformDirty;
         }
     };
 
-    proto.visit = function(parentCmd){
+    proto.clippingVisit = function (parentCmd) {
         var node = this._node;
-        // quick return if not visible
-        if (!node._visible)
-            return;
-
-        if( node._parent && node._parent._renderCmd)
-            this._curLevel = node._parent._renderCmd._curLevel + 1;
+        parentCmd = parentCmd || this.getParentRenderCmd();
+        this.visit(parentCmd);
 
         // if stencil buffer disabled
         if (cc.stencilBits < 1) {
             // draw everything, as if there were no stencil
-            this.originVisit(parentCmd);
+            node._visitChildren();
             return;
         }
 
         if (!node._stencil || !node._stencil.visible) {
             if (node.inverted)
-                this.originVisit(parentCmd);   // draw everything
+                node._visitChildren();   // draw everything
             return;
         }
 
@@ -91,20 +88,14 @@
                 cc.ClippingNode.WebGLRenderCmd._visit_once = false;
             }
             // draw everything, as if there were no stencil
-            this.originVisit(parentCmd);
+            node._visitChildren();
             return;
         }
 
         cc.renderer.pushRenderCommand(this._beforeVisitCmd);
 
-        //optimize performance for javascript
-        var currentStack = cc.current_stack;
-        currentStack.stack.push(currentStack.top);
-        this._syncStatus(parentCmd);
-        currentStack.top = this._stackMatrix;
-
         // node._stencil._stackMatrix = node._stackMatrix;
-        node._stencil._renderCmd.visit(this);
+        node._stencil.visit(node);
 
         cc.renderer.pushRenderCommand(this._afterDrawStencilCmd);
 
@@ -115,15 +106,13 @@
             node.sortAllChildren();
             // draw children zOrder < 0
             for (var i = 0; i < childLen; i++) {
-                locChildren[i]._renderCmd.visit(this);
+                locChildren[i].visit(node);
             }
         }
 
         cc.renderer.pushRenderCommand(this._afterVisitCmd);
 
         this._dirtyFlag = 0;
-        //optimize performance for javascript
-        currentStack.top = currentStack.stack.pop();
     };
 
     proto.setStencil = function (stencil) {

cocos2d/core/base-nodes/CCNode.js

@@ -2091,10 +2091,40 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
     /**
      * Recursive method that visit its children and draw them
      * @function
-     * @param {cc.Node.RenderCmd} parentCmd
+     * @param {cc.Node} parent
      */
-    visit: function(parentCmd){
-        this._renderCmd.visit(parentCmd);
+    visit: function (parent) {
+        // quick return if not visible
+        if (!this._visible)
+            return;
+
+        var renderer = cc.renderer, cmd = this._renderCmd;
+        cmd.visit(parent && parent._renderCmd);
+
+        var i, children = this._children, len = children.length, child;
+        if (len > 0) {
+            if (this._reorderChildDirty) {
+                this.sortAllChildren();
+            }
+            // draw children zOrder < 0
+            for (i = 0; i < len; i++) {
+                child = children[i];
+                if (child._localZOrder < 0) {
+                    child.visit(this);
+                }
+                else {
+                    break;
+                }
+            }
+
+            renderer.pushRenderCommand(cmd);
+            for (; i < len; i++) {
+                children[i].visit(this);
+            }
+        } else {
+            renderer.pushRenderCommand(cmd);
+        }
+        cmd._dirtyFlag = 0;
     },
 
     /**

cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

@@ -46,11 +46,17 @@ var dirtyFlags = cc.Node._dirtyFlags = {
 };
 
 var ONE_DEGREE = Math.PI / 180;
-var stack = new Array(50);
 
 function transformChildTree(root) {
     var index = 1;
     var children, child, curr, parentCmd, i, len;
+    var stack = cc.Node._performStacks[cc.Node._performing];
+    if (!stack) {
+        stack = [];
+        cc.Node._performStacks.push(stack);
+    }
+    stack.length = 0;
+    cc.Node._performing++;
     stack[0] = root;
     while (index) {
         index--;
@@ -79,6 +85,7 @@ function transformChildTree(root) {
             }
         }
     }
+    cc.Node._performing--;
 }
 
 //-------------------------Base -------------------------
@@ -317,9 +324,6 @@ cc.Node.RenderCmd.prototype = {
 
     visit: function (parentCmd) {
         var node = this._node, renderer = cc.renderer;
-        // quick return if not visible
-        if (!node._visible)
-            return;
 
         parentCmd = parentCmd || this.getParentRenderCmd();
         if (parentCmd)
@@ -331,7 +335,6 @@ cc.Node.RenderCmd.prototype = {
         }
 
         this._syncStatus(parentCmd);
-        this.visitChildren();
     },
 
     _updateDisplayColor: function (parentColor) {
@@ -436,7 +439,8 @@ cc.Node.RenderCmd.prototype = {
         this._displayedOpacity = node._realOpacity * parentOpacity / 255.0;
     },
 
-    _updateColor: function(){},
+    _updateColor: function () {
+    },
 
     updateStatus: function () {
         var locFlag = this._dirtyFlag;
@@ -470,7 +474,7 @@ cc.Node.RenderCmd.prototype = {
     _syncStatus: function (parentCmd) {
         //  In the visit logic does not restore the _dirtyFlag
         //  Because child elements need parent's _dirtyFlag to change himself
-        var locFlag = this._dirtyFlag, parentNode = null;
+        var locFlag = this._dirtyFlag, parentNode = parentCmd ? parentCmd._node : null;
 
         //  There is a possibility:
         //    The parent element changed color, child element not change
@@ -509,39 +513,11 @@ cc.Node.RenderCmd.prototype = {
 
         if (locFlag & dirtyFlags.orderDirty)
             this._dirtyFlag &= ~dirtyFlags.orderDirty;
-    },
-
-    visitChildren: function () {
-        var renderer = cc.renderer;
-        var node = this._node;
-        var i, children = node._children, child;
-        var len = children.length;
-        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 {
-                    break;
-                }
-            }
-
-            renderer.pushRenderCommand(this);
-            for (; i < len; i++) {
-                children[i]._renderCmd.visit(this);
-            }
-        } else {
-            renderer.pushRenderCommand(this);
-        }
-        this._dirtyFlag = 0;
     }
 };
 
-cc.Node.RenderCmd.prototype.originVisit = cc.Node.RenderCmd.prototype.visit;
 cc.Node.RenderCmd.prototype.originTransform = cc.Node.RenderCmd.prototype.transform;
+cc.Node.RenderCmd.prototype.originUpdateStatus = cc.Node.RenderCmd.prototype.updateStatus;
 cc.Node.RenderCmd.prototype._originSyncStatus = cc.Node.RenderCmd.prototype._syncStatus;
 
 //-----------------------Canvas ---------------------------

cocos2d/core/base-nodes/CCNodeWebGLRenderCmd.js

@@ -22,7 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 // ------------------------------ The cc.Node's render command for WebGL ----------------------------------
-(function() {
+(function () {
     cc.Node.WebGLRenderCmd = function (renderable) {
         this._node = renderable;
         this._anchorPointInPoints = {x: 0, y: 0};

cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js

@@ -327,7 +327,7 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
         if (locFlag & flags.textDirty)
             this._updateTexture();
 
-        cc.Node.RenderCmd.prototype.updateStatus.call(this);
+        this.originUpdateStatus();
     };
 
     proto._syncStatus = function (parentCmd) {