Issue cocos2d#2416: Code separation

Author: VisualSJ

cocos2d/tilemap/CCTMXLayer.js

@@ -354,7 +354,6 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
             tile.anchorX = 0;
 	        tile.anchorY = 0;
             tile.opacity = this._opacity;
-            tile._renderCmd._cachedParent = this._renderCmd;
 
             var indexForZ = this._atlasIndexForExistantZ(z);
             this.addSpriteWithoutQuad(tile, indexForZ, z);
@@ -691,7 +690,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
         rect = cc.rectPixelsToPoints(rect);
 
         var z = 0 | (pos.x + pos.y * this._layerSize.width);
-        var tile = this._reusedTileWithRect(rect);
+        var tile = this._renderCmd._reusedTileWithRect(rect);
         this._setupTileSprite(tile, pos, gid);
 
         // optimization:
@@ -712,7 +711,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
         rect = cc.rectPixelsToPoints(rect);
 
         var z = 0 | (pos.x + pos.y * this._layerSize.width);
-        var tile = this._reusedTileWithRect(rect);
+        var tile = this._renderCmd._reusedTileWithRect(rect);
         this._setupTileSprite(tile, pos, gid);
 
         // get atlas index
@@ -746,7 +745,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
             rect.width / locScaleFactor, rect.height / locScaleFactor);
         var z = pos.x + pos.y * this._layerSize.width;
 
-        var tile = this._reusedTileWithRect(rect);
+        var tile = this._renderCmd._reusedTileWithRect(rect);
         this._setupTileSprite(tile, pos, gid);
 
         // get atlas index
@@ -832,33 +831,6 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
         }
     },
 
-    _reusedTileWithRect:function (rect) {
-        if(cc._renderType === cc._RENDER_TYPE_WEBGL){
-            if (!this._reusedTile) {
-                this._reusedTile = new cc.Sprite();
-                this._reusedTile.initWithTexture(this.texture, rect, false);
-                this._reusedTile.batchNode = this;
-            } else {
-                // XXX HACK: Needed because if "batch node" is nil,
-                // then the Sprite'squad will be reset
-                this._reusedTile.batchNode = null;
-
-                // Re-init the sprite
-                this._reusedTile.setTextureRect(rect, false);
-
-                // restore the batch node
-                this._reusedTile.batchNode = this;
-            }
-        } else {
-            this._reusedTile = new cc.Sprite();
-            this._reusedTile.initWithTexture(this._renderCmd._texture, rect, false);
-            this._reusedTile.batchNode = this;
-            this._reusedTile.parent = this;
-            this._reusedTile._renderCmd._cachedParent = this._renderCmd;
-        }
-        return this._reusedTile;
-    },
-
     _vertexZForPos:function (pos) {
         var ret = 0;
         var maxVal = 0;

cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js

@@ -186,4 +186,14 @@
         var node = this._node;
         node.tileset.imageSize = this._originalTexture.getContentSizeInPixels();
     };
+
+    proto._reusedTileWithRect = function(rect){
+        var node = this._node;
+        node._reusedTile = new cc.Sprite();
+        node._reusedTile.initWithTexture(node._renderCmd._texture, rect, false);
+        node._reusedTile.batchNode = node;
+        node._reusedTile.parent = node;
+        node._reusedTile._renderCmd._cachedParent = node._renderCmd;
+        return node._reusedTile;
+    };
 })();

cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js

@@ -43,5 +43,25 @@
         // cons:
         //  - difficult to scale / rotate / etc.
         this._textureAtlas.texture.setAliasTexParameters();
-    }
+    };
+
+    proto._reusedTileWithRect = function(rect){
+        var node = this._node;
+        if (!node._reusedTile) {
+            node._reusedTile = new cc.Sprite();
+            node._reusedTile.initWithTexture(node.texture, rect, false);
+            node._reusedTile.batchNode = node;
+        } else {
+            // XXX HACK: Needed because if "batch node" is nil,
+            // then the Sprite'squad will be reset
+            node._reusedTile.batchNode = null;
+
+            // Re-init the sprite
+            node._reusedTile.setTextureRect(rect, false);
+
+            // restore the batch node
+            node._reusedTile.batchNode = node;
+        }
+        return node._reusedTile;
+    };
 })();