Improve construction performance in general

pandamicro · pandamicro · commit 926c9e4c953f · 2016-12-09T10:40:47.000+08:00
diff --git a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js
@@ -25,7 +25,7 @@
 //-------------------------- ClippingNode's canvas render cmd --------------------------------
 (function () {
     cc.ClippingNode.CanvasRenderCmd = function (renderable) {
-        cc.Node.CanvasRenderCmd.call(this, renderable);
+        this._rootCtor(renderable);
         this._needDraw = false;
 
         this._godhelpme = false;
diff --git a/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js
@@ -25,7 +25,7 @@
 // ------------------------------- ClippingNode's WebGL render cmd ------------------------------
 (function () {
     cc.ClippingNode.WebGLRenderCmd = function (renderable) {
-        cc.Node.WebGLRenderCmd.call(this, renderable);
+        this._rootCtor(renderable);
         this._needDraw = false;
 
         this._beforeVisitCmd = new cc.CustomRenderCmd(this, this._onBeforeVisit);
diff --git a/cocos2d/core/base-nodes/CCAtlasNodeCanvasRenderCmd.js b/cocos2d/core/base-nodes/CCAtlasNodeCanvasRenderCmd.js
@@ -27,7 +27,7 @@
  */
 (function () {
     cc.AtlasNode.CanvasRenderCmd = function (renderableObject) {
-        cc.Node.CanvasRenderCmd.call(this, renderableObject);
+        this._rootCtor(renderableObject);
         this._needDraw = false;
         this._colorUnmodified = cc.color.WHITE;
         this._textureToRender = null;
diff --git a/cocos2d/core/base-nodes/CCAtlasNodeWebGLRenderCmd.js b/cocos2d/core/base-nodes/CCAtlasNodeWebGLRenderCmd.js
@@ -27,7 +27,7 @@
  */
 (function () {
     cc.AtlasNode.WebGLRenderCmd = function (renderableObject) {
-        cc.Node.WebGLRenderCmd.call(this, renderableObject);
+        this._rootCtor(renderableObject);
         this._needDraw = true;
         this._textureAtlas = null;
         this._colorUnmodified = cc.color.WHITE;
diff --git a/cocos2d/core/base-nodes/CCNode.js b/cocos2d/core/base-nodes/CCNode.js
@@ -163,12 +163,10 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
 
     //since 2.0 api
     _reorderChildDirty: false,
-    _shaderProgram: null,
     arrivalOrder: 0,
 
     _actionManager: null,
     _scheduler: null,
-    _eventDispatcher: null,
 
     _additionalTransformDirty: false,
     _additionalTransform: null,
@@ -190,32 +188,23 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
      * @function
      */
-    ctor: function(){
-        this._initNode();
-        this._initRendererCmd();
-    },
-
-    _initNode: function () {
+    ctor: function () {
         var _t = this;
         _t._anchorPoint = cc.p(0, 0);
         _t._contentSize = cc.size(0, 0);
         _t._position = cc.p(0, 0);
-        _t._normalizedPosition = cc.p(0,0);
+        _t._normalizedPosition = cc.p(0, 0);
         _t._children = [];
 
         var director = cc.director;
-        _t._actionManager = director.getActionManager();
-        _t._scheduler = director.getScheduler();
 
         _t._additionalTransform = cc.affineTransformMakeIdentity();
         if (cc.ComponentContainer) {
             _t._componentContainer = new cc.ComponentContainer(_t);
         }
-
-        this._realOpacity = 255;
         this._realColor = cc.color(255, 255, 255, 255);
-        this._cascadeColorEnabled = false;
-        this._cascadeOpacityEnabled = false;
+
+        this._renderCmd = this._createRenderCmd();
     },
 
     /**
@@ -224,7 +213,6 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * @returns {boolean} Whether the initialization was successful.
      */
     init: function () {
-        //this._initNode();   //this has been called in ctor.
         return true;
     },
 
@@ -649,12 +637,12 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
     setPosition: function (newPosOrxValue, yValue) {
         var locPosition = this._position;
         if (yValue === undefined) {
-            if(locPosition.x === newPosOrxValue.x && locPosition.y === newPosOrxValue.y)
+            if (locPosition.x === newPosOrxValue.x && locPosition.y === newPosOrxValue.y)
                 return;
             locPosition.x = newPosOrxValue.x;
             locPosition.y = newPosOrxValue.y;
         } else {
-            if(locPosition.x === newPosOrxValue && locPosition.y === yValue)
+            if (locPosition.x === newPosOrxValue && locPosition.y === yValue)
                 return;
             locPosition.x = newPosOrxValue;
             locPosition.y = yValue;
@@ -1114,9 +1102,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * @return {cc.ActionManager} A CCActionManager object.
      */
     getActionManager: function () {
-        if (!this._actionManager)
-            this._actionManager = cc.director.getActionManager();
-        return this._actionManager;
+        return this._actionManager || cc.director.getActionManager();
     },
 
     /**
@@ -1140,9 +1126,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * @return {cc.Scheduler} A CCScheduler object.
      */
     getScheduler: function () {
-        if (!this._scheduler)
-            this._scheduler = cc.director.getScheduler();
-        return this._scheduler;
+        return this._scheduler || cc.director.getScheduler();
     },
 
     /**
@@ -2425,10 +2409,6 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
         return false;
     },
 
-    _initRendererCmd: function(){
-        this._renderCmd = cc.renderer.getRenderCmd(this);
-    },
-
     _createRenderCmd: function () {
         if (cc._renderType === cc.game.RENDER_TYPE_CANVAS)
             return new cc.Node.CanvasRenderCmd(this);
diff --git a/cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js b/cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js
@@ -83,28 +83,26 @@ function transformChildTree(root) {
 
 //-------------------------Base -------------------------
 cc.Node.RenderCmd = function (renderable) {
-    this._dirtyFlag = 1;                           //need update the transform at first.
-    this._savedDirtyFlag = true;
-
     this._node = renderable;
-    this._needDraw = false;
-    this._anchorPointInPoints = new cc.Point(0, 0);
-
-    this._transform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
-    this._worldTransform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
-    this._inverse = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
-
-    this._displayedOpacity = 255;
+    this._anchorPointInPoints = {x: 0, y: 0};
     this._displayedColor = cc.color(255, 255, 255, 255);
-    this._cascadeColorEnabledDirty = false;
-    this._cascadeOpacityEnabledDirty = false;
-
-    this._curLevel = -1;
 };
 
 cc.Node.RenderCmd.prototype = {
     constructor: cc.Node.RenderCmd,
 
+    _needDraw: false,
+    _dirtyFlag: 1,
+    _curLevel: -1,
+
+    _displayedOpacity: 255,
+    _cascadeColorEnabledDirty: false,
+    _cascadeOpacityEnabledDirty: false,
+
+    _transform: null,
+    _worldTransform: null,
+    _inverse: null,
+
     needDraw: function () {
         return this._needDraw;
     },
@@ -133,8 +131,12 @@ cc.Node.RenderCmd.prototype = {
     },
 
     getParentToNodeTransform: function () {
-        if (this._dirtyFlag & cc.Node._dirtyFlags.transformDirty)
-            this._inverse = cc.affineTransformInvert(this.getNodeToParentTransform());
+        if (!this._inverse) {
+            this._inverse = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+        }
+        if (this._dirtyFlag & cc.Node._dirtyFlags.transformDirty) {
+            cc.affineTransformInvertOut(this.getNodeToParentTransform(), this._inverse);
+        }
         return this._inverse;
     },
 
@@ -161,6 +163,11 @@ cc.Node.RenderCmd.prototype = {
     },
 
     transform: function (parentCmd, recursive) {
+        if (!this._transform) {
+            this._transform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+            this._worldTransform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+        }
+
         var node = this._node,
             pt = parentCmd ? parentCmd._worldTransform : null,
             t = this._transform,
@@ -302,7 +309,7 @@ cc.Node.RenderCmd.prototype = {
     },
 
     getNodeToParentTransform: function () {
-        if (this._dirtyFlag & cc.Node._dirtyFlags.transformDirty) {
+        if (!this._transform || this._dirtyFlag & cc.Node._dirtyFlags.transformDirty) {
             this.transform();
         }
         return this._transform;
diff --git a/cocos2d/core/layers/CCLayerCanvasRenderCmd.js b/cocos2d/core/layers/CCLayerCanvasRenderCmd.js
@@ -80,6 +80,9 @@
     };
 
     proto.transform = function (parentCmd, recursive) {
+        if (!this._worldTransform) {
+            this._worldTransform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+        }
         var wt = this._worldTransform;
         var a = wt.a, b = wt.b, c = wt.c, d = wt.d, tx = wt.tx, ty = wt.ty;
         this.originTransform(parentCmd, recursive);
diff --git a/cocos2d/core/textures/CCTexture2D.js b/cocos2d/core/textures/CCTexture2D.js
@@ -98,7 +98,7 @@ cc.PVRHaveAlphaPremultiplied_ = false;
 
 cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
 
-    if(cc._renderType === cc.game.RENDER_TYPE_CANVAS) {
+    if (cc._renderType === cc.game.RENDER_TYPE_CANVAS) {
 
         var proto = {
             _contentSize: null,
diff --git a/cocos2d/particle/CCParticleSystem.js b/cocos2d/particle/CCParticleSystem.js
@@ -490,8 +490,9 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
      * sourcePosition of the emitter setter
      * @param sourcePosition
      */
-    setSourcePosition:function (sourcePosition) {
-        this._sourcePosition = sourcePosition;
+    setSourcePosition: function (sourcePosition) {
+        this._sourcePosition.x = sourcePosition.x;
+        this._sourcePosition.y = sourcePosition.y;
     },
 
     /**
@@ -507,7 +508,8 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
      * @param {cc.Point} posVar
      */
     setPosVar: function (posVar) {
-        this._posVar = posVar;
+        this._posVar.x = posVar.x;
+        this._posVar.y = posVar.y;
     },
 
     /**
@@ -956,7 +958,10 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
      * @param {cc.Color} startColor
      */
     setStartColor: function (startColor) {
-        this._startColor = cc.color(startColor);
+        this._startColor.r = startColor.r;
+        this._startColor.g = startColor.g;
+        this._startColor.b = startColor.b;
+        this._startColor.a = startColor.a;
     },
 
     /**
@@ -972,7 +977,10 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
      * @param {cc.Color} startColorVar
      */
     setStartColorVar: function (startColorVar) {
-        this._startColorVar = cc.color(startColorVar);
+        this._startColorVar.r = startColorVar.r;
+        this._startColorVar.g = startColorVar.g;
+        this._startColorVar.b = startColorVar.b;
+        this._startColorVar.a = startColorVar.a;
     },
 
     /**
@@ -988,7 +996,10 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
      * @param {cc.Color} endColor
      */
     setEndColor: function (endColor) {
-        this._endColor = cc.color(endColor);
+        this._endColor.r = endColor.r;
+        this._endColor.g = endColor.g;
+        this._endColor.b = endColor.b;
+        this._endColor.a = endColor.a;
     },
 
     /**
@@ -1004,7 +1015,10 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
      * @param {cc.Color} endColorVar
      */
     setEndColorVar: function (endColorVar) {
-        this._endColorVar = cc.color(endColorVar);
+        this._endColorVar.r = endColorVar.r;
+        this._endColorVar.g = endColorVar.g;
+        this._endColorVar.b = endColorVar.b;
+        this._endColorVar.a = endColorVar.a;
     },
 
     /**
@@ -1391,13 +1405,8 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
                 locModeA.tangentialAccelVar = (pszTmp) ? parseFloat(pszTmp) : 0;
 
                 // rotation is dir
-                var locRotationIsDir = locValueForKey("rotationIsDir", dictionary);
-                if (locRotationIsDir !== null) {
-                    locRotationIsDir = locRotationIsDir.toString().toLowerCase();
-                    locModeA.rotationIsDir = (locRotationIsDir === "true" || locRotationIsDir === "1");
-                }
-                else
-                    locModeA.rotationIsDir = false;
+                var locRotationIsDir = locValueForKey("rotationIsDir", dictionary).toLowerCase();
+                locModeA.rotationIsDir = (locRotationIsDir != null && (locRotationIsDir === "true" || locRotationIsDir === "1"));
             } else if (this.emitterMode === cc.ParticleSystem.MODE_RADIUS) {
                 // or Mode B: radius movement
                 var locModeB = this.modeB;
diff --git a/cocos2d/particle/CCParticleSystemCanvasRenderCmd.js b/cocos2d/particle/CCParticleSystemCanvasRenderCmd.js
@@ -34,7 +34,7 @@
         this._shapeType = cc.ParticleSystem.BALL_SHAPE;
 
         this._pointRect = cc.rect(0, 0, 0, 0);
-        this._tintCache = document.createElement("canvas");
+        this._tintCache = null;
     };
     var proto = cc.ParticleSystem.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype);
     proto.constructor = cc.ParticleSystem.CanvasRenderCmd;
@@ -144,6 +144,9 @@
     };
 
     proto._changeTextureColor = function (texture, color, rect) {
+        if (!this._tintCache) {
+            this._tintCache = document.createElement("canvas");
+        }
         var tintCache = this._tintCache;
         var textureContentSize = texture.getContentSize();
         tintCache.width = textureContentSize.width;
diff --git a/cocos2d/particle/CCParticleSystemWebGLRenderCmd.js b/cocos2d/particle/CCParticleSystemWebGLRenderCmd.js
@@ -30,8 +30,7 @@
         this._rootCtor(renderable);
         this._needDraw = true;
 
-        this._matrix = new cc.math.Matrix4();
-        this._matrix.identity();
+        this._matrix = null;
 
         this._buffersVBO = [0, 0];
         this._quads = [];
@@ -193,6 +192,10 @@
 
         var gl = ctx || cc._renderContext;
 
+        if (!this._matrix) {
+            this._matrix = new cc.math.Matrix4();
+            this._matrix.identity();
+        }
         var wt = this._worldTransform;
         this._matrix.mat[0] = wt.a;
         this._matrix.mat[4] = wt.c;
diff --git a/extensions/ccpool/CCPool.js b/extensions/ccpool/CCPool.js
@@ -62,7 +62,7 @@ cc.pool = /** @lends cc.pool# */{
     putInPool: function (obj) {
         var pid = obj.constructor.prototype['__pid'];
         if (!pid) {
-            var desc = { writable: true, enumerable: false, configurable: true };
+            var desc = {writable: true, enumerable: false, configurable: true};
             desc.value = ClassManager.getNewID();
             Object.defineProperty(obj.constructor.prototype, '__pid', desc);
         }
@@ -143,4 +143,4 @@ cc.pool = /** @lends cc.pool# */{
         }
         this._pool = {};
     }
-};
+};
diff --git a/extensions/ccui/base-classes/UIWidgetRenderCmd.js b/extensions/ccui/base-classes/UIWidgetRenderCmd.js
@@ -41,6 +41,11 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
         };
 
         proto.transform = function (parentCmd, recursive) {
+            if (!this._transform) {
+                this._transform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+                this._worldTransform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+            }
+
             var node = this._node;
             if (node._visible && node._running) {
                 node._adaptRenderers();
diff --git a/extensions/ccui/layouts/UILayoutCanvasRenderCmd.js b/extensions/ccui/layouts/UILayoutCanvasRenderCmd.js
diff --git a/extensions/ccui/layouts/UILayoutManager.js b/extensions/ccui/layouts/UILayoutManager.js
diff --git a/extensions/ccui/layouts/UILayoutWebGLRenderCmd.js b/extensions/ccui/layouts/UILayoutWebGLRenderCmd.js
diff --git a/extensions/cocostudio/armature/CCArmatureCanvasRenderCmd.js b/extensions/cocostudio/armature/CCArmatureCanvasRenderCmd.js
