File tree Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -1701,7 +1701,7 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{
17011701 var locNewTexture = sender . getTexture ( ) ;
17021702 if ( locNewTexture != this . _texture )
17031703 this . setTexture ( locNewTexture ) ;
1704- this . setTextureRect ( sender . getRect ( ) , this . _rectRotated , sender . getOriginalSize ( ) ) ;
1704+ this . setTextureRect ( sender . getRect ( ) , sender . isRotated ( ) , sender . getOriginalSize ( ) ) ;
17051705 this . _callLoadedEventCallbacks ( ) ;
17061706 } , this ) ;
17071707 }
Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ cc.SpriteFrameCache = cc.Class.extend(/** @lends cc.SpriteFrameCache# */{
102102
103103 // rotation
104104 if ( format == 2 ) {
105- rotated = frameDict [ "rotated" ] == "true" ;
105+ rotated = frameDict [ "rotated" ] ; // == "true";
106106 }
107107 var offset = cc . PointFromString ( frameDict [ "offset" ] ) ;
108108 var sourceSize = cc . SizeFromString ( frameDict [ "sourceSize" ] ) ;
@@ -117,7 +117,7 @@ cc.SpriteFrameCache = cc.Class.extend(/** @lends cc.SpriteFrameCache# */{
117117 spriteOffset = cc . PointFromString ( frameDict [ "spriteOffset" ] ) ;
118118 spriteSourceSize = cc . SizeFromString ( frameDict [ "spriteSourceSize" ] ) ;
119119 textureRect = cc . RectFromString ( frameDict [ "textureRect" ] ) ;
120- textureRotated = frameDict [ "textureRotated" ] == "true" ;
120+ textureRotated = frameDict [ "textureRotated" ] ; // == "true";
121121
122122 // get aliases
123123 var aliases = frameDict [ "aliases" ] ;
@@ -170,12 +170,9 @@ cc.SpriteFrameCache = cc.Class.extend(/** @lends cc.SpriteFrameCache# */{
170170 }
171171 }
172172
173-
174173 // add sprite frame
175174 var keyName = ( filename != null ) ? filename : key ;
176175 this . _spriteFrames [ keyName ] = spriteFrame ;
177-
178-
179176 }
180177 }
181178 } ,
You can’t perform that action at this time.
0 commit comments