Skip to content

Commit ef19901

Browse files
committed
Merge pull request #2490 from dingpinglv/Iss2416_RefactorRenderer
Fixed #2416: refactor renderer for performance
2 parents cbc8b8a + d0f966a commit ef19901

File tree

115 files changed

+10771
-10307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+10771
-10307
lines changed

CCDebugger.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,14 @@ cc._LogInfos = {
144144
Sprite_setTexture_2: "Invalid argument: cc.Sprite.texture setter expects a CCTexture2D.",
145145
Sprite_updateQuadFromSprite_2: "cc.SpriteBatchNode.updateQuadFromSprite(): sprite should be non-null",
146146
Sprite_insertQuadFromSprite_2: "cc.SpriteBatchNode.insertQuadFromSprite(): sprite should be non-null",
147-
Sprite_addChild_6: "cc.SpriteBatchNode.addChild(): child should be non-null",
148147

149148
SpriteBatchNode_addSpriteWithoutQuad: "cc.SpriteBatchNode.addQuadFromSprite(): SpriteBatchNode only supports cc.Sprites as children",
150149
SpriteBatchNode_increaseAtlasCapacity: "cocos2d: CCSpriteBatchNode: resizing TextureAtlas capacity from %s to %s.",
151150
SpriteBatchNode_increaseAtlasCapacity_2: "cocos2d: WARNING: Not enough memory to resize the atlas",
152151
SpriteBatchNode_reorderChild: "cc.SpriteBatchNode.addChild(): Child doesn't belong to Sprite",
153152
SpriteBatchNode_removeChild: "cc.SpriteBatchNode.addChild(): sprite batch node should contain the child",
154153
SpriteBatchNode_addSpriteWithoutQuad_2: "cc.SpriteBatchNode.addQuadFromSprite(): child should be non-null",
155-
SpriteBatchNode_reorderChild_2: "cc.SpriteBatchNode.addChild():child should be non-null",
154+
SpriteBatchNode_reorderChild_2: "cc.SpriteBatchNode.addChild(): child should be non-null",
156155

157156
spriteFrameCache__getFrameConfig: "cocos2d: WARNING: originalWidth/Height not found on the cc.SpriteFrame. AnchorPoint won't work as expected. Regenrate the .plist",
158157
spriteFrameCache_addSpriteFrames: "cocos2d: WARNING: an alias with name %s already exists",

cocos2d/actions/CCAction.js

+3
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,9 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{
625625
tempPosX = this._halfScreenSize.x - tempPosX;
626626
tempPosY = this._halfScreenSize.y - tempPosY;
627627

628+
//TODO Temporary treatment - The dirtyFlag symbol error
629+
this.target._renderCmd._dirtyFlag = 0;
630+
628631
if (this._boundarySet) {
629632
// whole map fits inside a single screen, no need to modify the position - unless map boundaries are increased
630633
if (this._boundaryFullyCovered)

0 commit comments

Comments
 (0)