Skip to content

fixed #1348 modify setter's code for cc.Node #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2012
Merged

fixed #1348 modify setter's code for cc.Node #553

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7b0bbc
fixed #1348 modify setter's code for cc.Node
dingpinglv Sep 26, 2012
aacc4fd
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 int…
dingpinglv Sep 26, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions cocos2d/base_nodes/CCNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,8 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
this._position.y = yValue;
//this._position = cc.p(newPosOrxValue,yValue);
} else if (newPosOrxValue.y != null) {
this._position = newPosOrxValue;
this._position.x = newPosOrxValue.x;
this._position.y = newPosOrxValue.y;
}

//save dirty region when after changed
Expand Down Expand Up @@ -622,9 +623,11 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
//save dirty region when before change
//this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());

this._anchorPoint = point;
this._anchorPointInPoints = cc.p(this._contentSize.width * this._anchorPoint.x,
this._contentSize.height * this._anchorPoint.y);
this._anchorPoint.x = point.x;
this._anchorPoint.y = point.y;

this._anchorPointInPoints.x = this._contentSize.width * this._anchorPoint.x;
this._anchorPointInPoints.y = this._contentSize.height * this._anchorPoint.y;

//save dirty region when after changed
//this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
Expand Down Expand Up @@ -655,10 +658,11 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
if (!cc.Size.CCSizeEqualToSize(size, this._contentSize)) {
//save dirty region when before change
//this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this._contentSize = size;
this._contentSize.width = size.width;
this._contentSize.height = size.height;

this._anchorPointInPoints = cc.p(this._contentSize.width * this._anchorPoint.x,
this._contentSize.height * this._anchorPoint.y);
this._anchorPointInPoints.width = this._contentSize.width * this._anchorPoint.x;
this._anchorPointInPoints.height = this._contentSize.height * this._anchorPoint.y;
//save dirty region when before change
//this._addDirtyRegionToDirector(this.getBoundingBoxToWorld());
this.setNodeDirty();
Expand Down