diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 0458ab7008..141ffe0d3c 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -402,7 +402,7 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ }, set: function (value) { if (this._anchorPoint.x !== value) { - var old = this._anchorPoint.clone(); + var old = cc.v2(this._anchorPoint); this._anchorPoint.x = value; this._onAnchorChanged(); this.emit(ANCHOR_CHANGED, old); @@ -421,7 +421,7 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ }, set: function (value) { if (this._anchorPoint.y !== value) { - var old = this._anchorPoint.clone(); + var old = cc.v2(this._anchorPoint); this._anchorPoint.y = value; this._onAnchorChanged(); this.emit(ANCHOR_CHANGED, old); @@ -450,7 +450,7 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ if (this._sizeProvider) { this._sizeProvider.setContentSize(value, this._sizeProvider._getHeight()); } - var clone = this._contentSize.clone(); + var clone = cc.v2(this._contentSize); this._contentSize.width = value; this.emit(SIZE_CHANGED, clone); } @@ -478,7 +478,7 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ if (this._sizeProvider) { this._sizeProvider.setContentSize(this._sizeProvider._getWidth(), value); } - var clone = this._contentSize.clone(); + var clone = cc.v2(this._contentSize); this._contentSize.height = value; this.emit(SIZE_CHANGED, clone); } @@ -575,7 +575,7 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ set: function (value) { if ( !this._color.equals(value) ) { var color = this._color; - var old = color.clone(); + var old = cc.color(color); color.r = value.r; color.g = value.g; color.b = value.b; @@ -752,17 +752,17 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ if (yValue === undefined) { if(locPosition.x === newPosOrxValue.x && locPosition.y === newPosOrxValue.y) return; - oldPosition = locPosition.clone(); + oldPosition = cc.v2(locPosition); locPosition.x = newPosOrxValue.x; locPosition.y = newPosOrxValue.y; } else { if(locPosition.x === newPosOrxValue && locPosition.y === yValue) return; - oldPosition = locPosition.clone(); + oldPosition = cc.v2(locPosition); locPosition.x = newPosOrxValue; locPosition.y = yValue; } - this._sgNode.setPosition(newPosOrxValue, yValue); + this._sgNode.setPosition(locPosition); if (this.emit) { this.emit(POSITION_CHANGED, oldPosition); @@ -803,13 +803,13 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ if (y === undefined) { if ((point.x === locAnchorPoint.x) && (point.y === locAnchorPoint.y)) return; - old = locAnchorPoint.clone(); + old = cc.v2(locAnchorPoint); locAnchorPoint.x = point.x; locAnchorPoint.y = point.y; } else { if ((point === locAnchorPoint.x) && (y === locAnchorPoint.y)) return; - old = locAnchorPoint.clone(); + old = cc.v2(locAnchorPoint); locAnchorPoint.x = point; locAnchorPoint.y = y; } @@ -864,13 +864,13 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ if (height === undefined) { if ((size.width === locContentSize.width) && (size.height === locContentSize.height)) return; - clone = locContentSize.clone(); + clone = cc.size(locContentSize); locContentSize.width = size.width; locContentSize.height = size.height; } else { if ((size === locContentSize.width) && (height === locContentSize.height)) return; - clone = locContentSize.clone(); + clone = cc.size(locContentSize); locContentSize.width = size; locContentSize.height = height; } diff --git a/cocos2d/core/support/CCPointExtension.js b/cocos2d/core/value-types/CCPointExtension.js similarity index 100% rename from cocos2d/core/support/CCPointExtension.js rename to cocos2d/core/value-types/CCPointExtension.js diff --git a/cocos2d/core/value-types/index.js b/cocos2d/core/value-types/index.js index d07dc54e5f..79f7664c66 100644 --- a/cocos2d/core/value-types/index.js +++ b/cocos2d/core/value-types/index.js @@ -1,6 +1,7 @@ require('./CCValueType'); require('./CCEnum'); require('./CCVec2'); +require('./CCPointExtension'); require('./CCSize'); require('./CCRect'); require('./CCColor'); diff --git a/gulp/tasks/build-cocos2d.js b/gulp/tasks/build-cocos2d.js index e668f6cfa3..9baf6f1ff2 100644 --- a/gulp/tasks/build-cocos2d.js +++ b/gulp/tasks/build-cocos2d.js @@ -20,7 +20,6 @@ var srcs = [ "./cocos2d/core/platform/CCScreen.js", "./cocos2d/core/platform/CCVisibleRect.js", - "./cocos2d/core/support/CCPointExtension.js", "./cocos2d/core/support/CCVertex.js", "./cocos2d/core/support/TransformUtils.js", diff --git a/jsb_engine.js b/jsb_engine.js index 999e6ae93e..828702051b 100644 --- a/jsb_engine.js +++ b/jsb_engine.js @@ -298,6 +298,15 @@ cc.js.mixin(cc.director, { this.startAnimation(); }, + /** + * Returns the cc.AnimationManager associated with this director. + * @method getAnimationManager + * @return {AnimationManager} + */ + getAnimationManager: function () { + return this._animationManager; + }, + /** * Returns current running Scene. Director can only run one Scene at the time. * @method getScene diff --git a/jsb_predefine.js b/jsb_predefine.js index 4f14dd9828..9326545608 100644 --- a/jsb_predefine.js +++ b/jsb_predefine.js @@ -55,5 +55,6 @@ if (CC_DEV) { require('./cocos2d/core/platform/js'); require('./cocos2d/core/value-types'); +require('./cocos2d/core/utils/find'); require('./cocos2d/core/event'); require('./CCDebugger'); diff --git a/moduleConfig.json b/moduleConfig.json index 264eadfd43..6db9bc32a3 100644 --- a/moduleConfig.json +++ b/moduleConfig.json @@ -53,7 +53,6 @@ "cocos2d/core/platform/CCScreen.js", "cocos2d/core/platform/CCVisibleRect.js", - "cocos2d/core/support/CCPointExtension.js", "cocos2d/core/support/CCVertex.js", "cocos2d/core/support/TransformUtils.js", "cocos2d/core/event-manager/CCTouch.js",