44 * @license {@link https://opensource.org/licenses/MIT|MIT License }
55 */
66
7- var CONST = require ( '../../../const.js' ) ;
87var Base64Decode = require ( './Base64Decode' ) ;
8+ var CONST = require ( '../../const' ) ;
9+ var CreateGroupLayer = require ( './CreateGroupLayer' ) ;
910var GetFastValue = require ( '../../../utils/object/GetFastValue' ) ;
1011var LayerData = require ( '../../mapdata/LayerData' ) ;
1112var ParseGID = require ( './ParseGID' ) ;
1213var Tile = require ( '../../Tile' ) ;
13- var CreateGroupLayer = require ( './CreateGroupLayer' ) ;
1414
1515/**
1616 * Parses all tilemap layers in a Tiled JSON object into new LayerData objects.
@@ -118,6 +118,7 @@ var ParseTileLayers = function (json, insertNull)
118118 {
119119 var layerOffsetX = ( GetFastValue ( curl , 'startx' , 0 ) + curl . x ) ;
120120 var layerOffsetY = ( GetFastValue ( curl , 'starty' , 0 ) + curl . y ) ;
121+
121122 layerData = new LayerData ( {
122123 name : ( curGroupState . name + curl . name ) ,
123124 x : ( curGroupState . x + GetFastValue ( curl , 'offsetx' , 0 ) + layerOffsetX * json . tilewidth ) ,
@@ -130,7 +131,6 @@ var ParseTileLayers = function (json, insertNull)
130131 visible : ( curGroupState . visible && curl . visible ) ,
131132 properties : GetFastValue ( curl , 'properties' , [ ] ) ,
132133 orientation : CONST . fromOrientationString ( json . orientation )
133-
134134 } ) ;
135135
136136 if ( layerData . orientation === CONST . HEXAGONAL )
@@ -167,8 +167,7 @@ var ParseTileLayers = function (json, insertNull)
167167 // index, x, y, width, height
168168 if ( gidInfo . gid > 0 )
169169 {
170- tile = new Tile ( layerData , gidInfo . gid , newOffsetX , newOffsetY , json . tilewidth ,
171- json . tileheight ) ;
170+ tile = new Tile ( layerData , gidInfo . gid , newOffsetX , newOffsetY , json . tilewidth , json . tileheight ) ;
172171
173172 // Turning Tiled's FlippedHorizontal, FlippedVertical and FlippedAntiDiagonal
174173 // propeties into flipX, flipY and rotation
@@ -210,7 +209,6 @@ var ParseTileLayers = function (json, insertNull)
210209 visible : ( curGroupState . visible && curl . visible ) ,
211210 properties : GetFastValue ( curl , 'properties' , [ ] ) ,
212211 orientation : CONST . fromOrientationString ( json . orientation )
213-
214212 } ) ;
215213
216214 if ( layerData . orientation === CONST . HEXAGONAL )
@@ -227,8 +225,7 @@ var ParseTileLayers = function (json, insertNull)
227225 // index, x, y, width, height
228226 if ( gidInfo . gid > 0 )
229227 {
230- tile = new Tile ( layerData , gidInfo . gid , x , output . length , json . tilewidth ,
231- json . tileheight ) ;
228+ tile = new Tile ( layerData , gidInfo . gid , x , output . length , json . tilewidth , json . tileheight ) ;
232229
233230 // Turning Tiled's FlippedHorizontal, FlippedVertical and FlippedAntiDiagonal
234231 // propeties into flipX, flipY and rotation
0 commit comments