Skip to content

Optimize CCSpriteFrame's init performance #1376

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 3 commits into from
Dec 27, 2013
Merged

Optimize CCSpriteFrame's init performance #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56b3bdf
Refactor CCSpriteFrameCache
Dec 27, 2013
27607b4
Update CCSpriteFrame.js
Dec 27, 2013
fad763a
Update CCSpriteFrame.js
Dec 27, 2013
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
8 changes: 6 additions & 2 deletions cocos2d/core/sprite_nodes/CCSpriteFrame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
this._offset = cc._pConst(0, 0);
this._offsetInPixels = cc._pConst(0, 0);
this._originalSize = cc._sizeConst(0, 0);
this._rectInPixels = cc.rect(0, 0, 0, 0);
this._rotated = false;
this._rect = cc.rect(0, 0, 0, 0);
this._originalSizeInPixels = cc._sizeConst(0, 0);
this._textureFilename = "";
this._texture = null;
Expand Down Expand Up @@ -96,6 +94,9 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
* @param {cc.Rect} rectInPixels
*/
setRectInPixels:function (rectInPixels) {
if (!this._rectInPixels){
this._rectInPixels = cc.rect(0,0,0,0);
}
this._rectInPixels.x = rectInPixels.x;
this._rectInPixels.y = rectInPixels.y;
this._rectInPixels.width = rectInPixels.width;
Expand Down Expand Up @@ -135,6 +136,9 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
* @param {cc.Rect} rect
*/
setRect:function (rect) {
if (!this._rect){
this._rect = cc.rect(0,0,0,0);
}
this._rect.x = rect.x;
this._rect.y = rect.y;
this._rect.width = rect.width;
Expand Down
23 changes: 6 additions & 17 deletions cocos2d/core/sprite_nodes/CCSpriteFrameCache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ cc.SpriteFrameCache = cc.Class.extend(/** @lends cc.SpriteFrameCache# */{
ow = Math.abs(ow);
oh = Math.abs(oh);
// create frame
spriteFrame = new cc.SpriteFrame();
spriteFrame.initWithTexture(texture, cc.rect(x, y, w, h), false, cc.p(ox, oy), cc.size(ow, oh));
spriteFrame = cc.SpriteFrame.createWithTexture(texture, cc.rect(x, y, w, h), false, cc.p(ox, oy), cc.size(ow, oh));
}
else if (format == 1 || format == 2) {
var frame = cc.RectFromString(frameDict["frame"]);
Expand All @@ -107,8 +106,7 @@ cc.SpriteFrameCache = cc.Class.extend(/** @lends cc.SpriteFrameCache# */{
var offset = cc.PointFromString(frameDict["offset"]);
var sourceSize = cc.SizeFromString(frameDict["sourceSize"]);
// create frame
spriteFrame = new cc.SpriteFrame();
spriteFrame.initWithTexture(texture, frame, rotated, offset, sourceSize);
spriteFrame = cc.SpriteFrame.createWithTexture(texture, frame, rotated, offset, sourceSize);
}
else if (format == 3) {
// get values
Expand All @@ -129,29 +127,20 @@ cc.SpriteFrameCache = cc.Class.extend(/** @lends cc.SpriteFrameCache# */{
}
this._spriteFramesAliases[aliases[aliasKey]] = frameKey;
}

// create frame
spriteFrame = new cc.SpriteFrame();
if (frameDict.hasOwnProperty("spriteSize")) {
spriteFrame.initWithTexture(texture,
cc.rect(textureRect.x, textureRect.y, spriteSize.width, spriteSize.height),
textureRotated,
spriteOffset,
spriteSourceSize);
} else {
spriteFrame.initWithTexture(texture, spriteSize, textureRotated, spriteOffset, spriteSourceSize);
textureRect = cc.rect(textureRect.x, textureRect.y, spriteSize.width, spriteSize.height);
}
//create frame
spriteFrame = cc.SpriteFrame.createWithTexture(texture, textureRect, textureRotated, spriteOffset, spriteSourceSize);
}
else {
var filename = frameDict["filename"], tmpFrame = frameDict["frame"], tmpSourceSize = frameDict["sourceSize"];
var jsonFrame = cc.rect(tmpFrame.x, tmpFrame.y, tmpFrame.w, tmpFrame.h);
var jsonRotated = frameDict["rotated"];
var jsonOffset = cc.p(0, 0);
var jsonSourceSize = cc.size(tmpSourceSize.w, tmpSourceSize.h);

// create frame
spriteFrame = new cc.SpriteFrame();
spriteFrame.initWithTexture(texture, jsonFrame, jsonRotated, jsonOffset, jsonSourceSize);
spriteFrame = cc.SpriteFrame.createWithTexture(texture, jsonFrame, jsonRotated, jsonOffset, jsonSourceSize);
}

if (cc.renderContextType === cc.CANVAS && spriteFrame.isRotated()) {
Expand Down