Issue cocos2d#2416: replace some deprecated APIs to new APIs

dingpinglv · dingpinglv · commit a84d3ea05c04 · 2014-10-28T17:56:32.000+08:00
diff --git a/cocos2d/core/base-nodes/BaseNodesPropertyDefine.js b/cocos2d/core/base-nodes/BaseNodesPropertyDefine.js
@@ -31,21 +31,12 @@ cc._tmp.PrototypeCCNode = function () {
     cc.defineGetterSetter(_p, "x", _p.getPositionX, _p.setPositionX);
     cc.defineGetterSetter(_p, "y", _p.getPositionY, _p.setPositionY);
     /** @expose */
-    //_p.pos;
-    //cc.defineGetterSetter(_p, "pos", _p.getPosition, _p.setPosition);
-    /** @expose */
     _p.width;
     cc.defineGetterSetter(_p, "width", _p._getWidth, _p._setWidth);
     /** @expose */
     _p.height;
     cc.defineGetterSetter(_p, "height", _p._getHeight, _p._setHeight);
     /** @expose */
-    //_p.size;
-    //cc.defineGetterSetter(_p, "size", _p.getContentSize, _p.setContentSize);
-    /** @expose */
-    //_p.anchor;
-    //cc.defineGetterSetter(_p, "anchor", _p._getAnchor, _p._setAnchor);
-    /** @expose */
     _p.anchorX;
     cc.defineGetterSetter(_p, "anchorX", _p._getAnchorX, _p._setAnchorX);
     /** @expose */
diff --git a/cocos2d/core/base-nodes/BaseNodesWebGL.js b/cocos2d/core/base-nodes/BaseNodesWebGL.js
@@ -113,7 +113,7 @@ cc._tmp.WebGLCCNode = function () {
             parentMatrix = pMatrix || (this._parent ? this._parent._stackMatrix : cc.current_stack.top);
 
         // Convert 3x3 into 4x4 matrix
-        var trans = this.nodeToParentTransform();
+        var trans = this.getNodeToParentTransform();
         var t4x4Mat = t4x4.mat;
         t4x4Mat[0] = trans.a;
         t4x4Mat[4] = trans.c;
@@ -168,7 +168,7 @@ cc._tmp.WebGLCCNode = function () {
         var t4x4 = _t._transform4x4, topMat4 = cc.current_stack.top;
 
         // Convert 3x3 into 4x4 matrix
-        var trans = _t.nodeToParentTransform();
+        var trans = _t.getNodeToParentTransform();
         var t4x4Mat = t4x4.mat;
         t4x4Mat[0] = trans.a;
         t4x4Mat[4] = trans.c;
diff --git a/cocos2d/core/base-nodes/CCNode.js b/cocos2d/core/base-nodes/CCNode.js
@@ -1460,7 +1460,6 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
         }
 
         // If you don't do cleanup, the child's actions will not get removed and the
-        // its scheduledSelectors_ dict will not get released!
         if (doCleanup)
             child.cleanup();
 
@@ -1614,7 +1613,6 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * @return {cc.Action} An Action pointer
      */
     runAction: function (action) {
-
         cc.assert(action, cc._LogInfos.Node_runAction);
 
         this.actionManager.addAction(action, this, !this._running);
@@ -1726,7 +1724,6 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
         interval = interval || 0;
 
         cc.assert(callback_fn, cc._LogInfos.Node_schedule);
-
         cc.assert(interval >= 0, cc._LogInfos.Node_schedule_2);
 
         repeat = (repeat == null) ? cc.REPEAT_FOREVER : repeat;
@@ -1753,7 +1750,6 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * @param {function} callback_fn  A function wrapped as a selector
      */
     unschedule: function (callback_fn) {
-        // explicit nil handling
         if (!callback_fn)
             return;
 
@@ -2668,7 +2664,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
     };
 
     _p._transformForRenderer = function () {
-        var t = this.nodeToParentTransform(), worldT = this._transformWorld;
+        var t = this.getNodeToParentTransform(), worldT = this._transformWorld;
         if(this._parent){
             var pt = this._parent._transformWorld;
             //worldT = cc.AffineTransformConcat(t, pt);
diff --git a/cocos2d/core/layers/CCLayer.js b/cocos2d/core/layers/CCLayer.js
@@ -521,8 +521,8 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
     _p._getBoundingBoxForBake = function () {
         //default size
         var rect = cc.rect(0, 0, this._contentSize.width, this._contentSize.height);
-        var trans = this.nodeToWorldTransform();
-        rect = cc.rectApplyAffineTransform(rect, this.nodeToWorldTransform());
+        var trans = this.getNodeToWorldTransform();
+        rect = cc.rectApplyAffineTransform(rect, this.getNodeToWorldTransform());
 
         //query child's BoundingBox
         if (!this._children || this._children.length === 0)
diff --git a/cocos2d/core/sprites/CCSprite.js b/cocos2d/core/sprites/CCSprite.js
@@ -1446,10 +1446,10 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
                 _t._shouldBeHidden = false;
 
                 if (!locParent || locParent == _t._batchNode) {
-                    _t._transformToBatch = _t.nodeToParentTransform();
+                    _t._transformToBatch = _t.getNodeToParentTransform();
                 } else {
                     //cc.assert(_t._parent instanceof cc.Sprite, "Logic error in CCSprite. Parent must be a CCSprite");
-                    _t._transformToBatch = cc.affineTransformConcat(_t.nodeToParentTransform(), locParent._transformToBatch);
+                    _t._transformToBatch = cc.affineTransformConcat(_t.getNodeToParentTransform(), locParent._transformToBatch);
                 }
             }
             _t._recursiveDirty = false;
diff --git a/cocos2d/core/sprites/SpritesWebGL.js b/cocos2d/core/sprites/SpritesWebGL.js
@@ -283,10 +283,10 @@ cc._tmp.WebGLSprite = function () {
                 _t._shouldBeHidden = false;
 
                 if (!locParent || locParent == _t._batchNode) {
-                    _t._transformToBatch = _t.nodeToParentTransform();
+                    _t._transformToBatch = _t.getNodeToParentTransform();
                 } else {
                     //cc.assert(_t._parent instanceof cc.Sprite, "Logic error in CCSprite. Parent must be a CCSprite");
-                    _t._transformToBatch = cc.affineTransformConcat(_t.nodeToParentTransform(), locParent._transformToBatch);
+                    _t._transformToBatch = cc.affineTransformConcat(_t.getNodeToParentTransform(), locParent._transformToBatch);
                 }
 
                 //
diff --git a/cocos2d/node-grid/CCNodeGrid.js b/cocos2d/node-grid/CCNodeGrid.js
@@ -147,8 +147,7 @@ cc.NodeGrid = cc.Node.extend({
         var t4x4 = this._transform4x4, topMat4 = cc.current_stack.top;
 
         // Convert 3x3 into 4x4 matrix
-        //cc.CGAffineToGL(this.nodeToParentTransform(), this._transform4x4.mat);
-        var trans = this.nodeToParentTransform();
+        var trans = this.getNodeToParentTransform();
         var t4x4Mat = t4x4.mat;
         t4x4Mat[0] = trans.a;
         t4x4Mat[4] = trans.c;
diff --git a/extensions/ccui/base-classes/CCProtectedNode.js b/extensions/ccui/base-classes/CCProtectedNode.js
@@ -482,10 +482,9 @@ cc.ProtectedNode = cc.Node.extend(/** @lends cc.ProtectedNode# */{
 if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
     cc.ProtectedNode.prototype.visit =  cc.ProtectedNode.prototype._visitForCanvas;
     cc.ProtectedNode.prototype._transformForRenderer = function () {
-        var t = this.nodeToParentTransform(), worldT = this._transformWorld;
+        var t = this.getNodeToParentTransform(), worldT = this._transformWorld;
         if(this._parent){
             var pt = this._parent._transformWorld;
-            //worldT = cc.AffineTransformConcat(t, pt);
             worldT.a = t.a * pt.a + t.b * pt.c;                               //a
             worldT.b = t.a * pt.b + t.b * pt.d;                               //b
             worldT.c = t.c * pt.a + t.d * pt.c;                               //c
@@ -524,7 +523,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             parentMatrix = this._parent ? this._parent._stackMatrix : cc.current_stack.top;
 
         // Convert 3x3 into 4x4 matrix
-        var trans = this.nodeToParentTransform();
+        var trans = this.getNodeToParentTransform();
         var t4x4Mat = t4x4.mat;
         t4x4Mat[0] = trans.a;
         t4x4Mat[4] = trans.c;
diff --git a/extensions/ccui/layouts/UILayout.js b/extensions/ccui/layouts/UILayout.js
@@ -666,7 +666,7 @@ ccui.Layout = ccui.Widget.extend(/** @lends ccui.Layout# */{
     _getClippingRect: function () {
         if (this._clippingRectDirty) {
             var worldPos = this.convertToWorldSpace(cc.p(0, 0));
-            var t = this.nodeToWorldTransform();
+            var t = this.getNodeToWorldTransform();
             var scissorWidth = this._contentSize.width * t.a;
             var scissorHeight = this._contentSize.height * t.d;
             var parentClippingRect;
diff --git a/extensions/cocostudio/armature/display/CCDisplayFactory.js b/extensions/cocostudio/armature/display/CCDisplayFactory.js
@@ -87,7 +87,7 @@ ccs.displayFactory = {
                 var detector = decoDisplay.getColliderDetector();
                 if (detector) {
                     var node = decoDisplay.getDisplay();
-                    var displayTransform = node.nodeToParentTransform();
+                    var displayTransform = node.getNodeToParentTransform();
                     var helpTransform = this._helpTransform;
                     helpTransform.a = displayTransform.a;
                     helpTransform.b = displayTransform.b;
@@ -98,7 +98,7 @@ ccs.displayFactory = {
                     var anchorPoint = cc.pointApplyAffineTransform(node.getAnchorPointInPoints(), helpTransform);
                     helpTransform.tx = anchorPoint.x;
                     helpTransform.ty = anchorPoint.y;
-                    var t = cc.affineTransformConcat(helpTransform, bone.getArmature().nodeToParentTransform());
+                    var t = cc.affineTransformConcat(helpTransform, bone.getArmature().getNodeToParentTransform());
                     detector.updateTransform(t);
                 }
             }
diff --git a/extensions/cocostudio/armature/display/CCSkin.js b/extensions/cocostudio/armature/display/CCSkin.js
@@ -197,13 +197,6 @@ ccs.Skin = ccs.Sprite.extend(/** @lends ccs.Skin# */{
         (_v_).z = (_z_);
     },
 
-    RENDER_IN_SUBPIXEL: function(__ARGS__){
-        if(!cc.SPRITEBATCHNODE_RENDER_SUBPIXEL)
-            return Math.ceil(__ARGS__);
-        else
-            return __ARGS__;
-    },
-
     /**
      * Returns skin's world transform.
      * @returns {cc.AffineTransform}
@@ -217,7 +210,7 @@ ccs.Skin = ccs.Sprite.extend(/** @lends ccs.Skin# */{
         this._anchorPointInPoints = cc.pointApplyAffineTransform(this._anchorPointInPoints, displayTransform);
         displayTransform.tx = this._anchorPointInPoints.x;
         displayTransform.ty = this._anchorPointInPoints.y;
-        return cc.affineTransformConcat( displayTransform,this.bone.getArmature().nodeToWorldTransform());
+        return cc.affineTransformConcat( displayTransform,this.bone.getArmature().getNodeToWorldTransform());
     },
 
     /**
@@ -252,7 +245,6 @@ if (cc._renderType == cc._RENDER_TYPE_WEBGL) {
 }else{
     //ccs.Skin.prototype.getNodeToParentTransform = cc.Node.prototype._getNodeToParentTransformForWebGL;
 }
-//ccs.Skin.prototype.nodeToParentTransform = cc.Node.prototype._getNodeToParentTransformForWebGL;
 
 
 var _p = ccs.Skin.prototype;
diff --git a/extensions/editbox/CCEditBox.js b/extensions/editbox/CCEditBox.js
@@ -685,12 +685,12 @@ _p = null;
  * get the rect of a node in world coordinate frame
  * @function
  * @param {cc.Node} node
- * @return {cc.rect}
+ * @return {cc.Rect}
  */
 cc.EditBox.getRect = function (node) {
     var contentSize = node.getContentSize();
     var rect = cc.rect(0, 0, contentSize.width, contentSize.height);
-    return cc.rectApplyAffineTransform(rect, node.nodeToWorldTransform());
+    return cc.rectApplyAffineTransform(rect, node.getNodeToWorldTransform());
 };
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1446,10 +1446,10 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {`
`1446`	`1446`	`_t._shouldBeHidden = false;`
`1447`	`1447`
`1448`	`1448`	`if (!locParent \|\| locParent == _t._batchNode) {`
`1449`		`- _t._transformToBatch = _t.nodeToParentTransform();`
	`1449`	`+ _t._transformToBatch = _t.getNodeToParentTransform();`
`1450`	`1450`	`} else {`
`1451`	`1451`	`//cc.assert(_t._parent instanceof cc.Sprite, "Logic error in CCSprite. Parent must be a CCSprite");`
`1452`		`- _t._transformToBatch = cc.affineTransformConcat(_t.nodeToParentTransform(), locParent._transformToBatch);`
	`1452`	`+ _t._transformToBatch = cc.affineTransformConcat(_t.getNodeToParentTransform(), locParent._transformToBatch);`
`1453`	`1453`	`}`
`1454`	`1454`	`}`
`1455`	`1455`	`_t._recursiveDirty = false;`