44 * @license {@link https://opensource.org/licenses/MIT|MIT License }
55 */
66
7- var CONST = require ( '../../../const.js' ) ;
7+ var AssignTileProperties = require ( './AssignTileProperties' ) ;
8+ var BuildTilesetIndex = require ( './BuildTilesetIndex' ) ;
9+ var CONST = require ( '../../const' ) ;
810var Formats = require ( '../../Formats' ) ;
911var MapData = require ( '../../mapdata/MapData' ) ;
10- var ParseTileLayers = require ( './ParseTileLayers' ) ;
1112var ParseImageLayers = require ( './ParseImageLayers' ) ;
12- var ParseTilesets = require ( './ParseTilesets' ) ;
1313var ParseObjectLayers = require ( './ParseObjectLayers' ) ;
14- var BuildTilesetIndex = require ( './BuildTilesetIndex ' ) ;
15- var AssignTileProperties = require ( './AssignTileProperties ' ) ;
14+ var ParseTileLayers = require ( './ParseTileLayers ' ) ;
15+ var ParseTilesets = require ( './ParseTilesets ' ) ;
1616
1717/**
1818 * Parses a Tiled JSON object into a new MapData object.
@@ -33,21 +33,6 @@ var AssignTileProperties = require('./AssignTileProperties');
3333 */
3434var ParseJSONTiled = function ( name , json , insertNull )
3535{
36- if ( json . orientation === 'isometric' || json . orientation === 'staggered' )
37- {
38- console . warn ( 'Isometric map types are WIP in this version of Phaser' ) ;
39- }
40- else if ( json . orientation === 'hexagonal' )
41- {
42- console . warn ( 'Hexagonal map types are WIP in this version of Phaser' ) ;
43- }
44- else if ( json . orientation !== 'orthogonal' )
45- {
46- console . warn ( 'Only orthogonal, hexagonal and isometric map types are supported in this version of Phaser' ) ;
47- return null ;
48- }
49-
50-
5136 // Map data will consist of: layers, objects, images, tilesets, sizes
5237 var mapData = new MapData ( {
5338 width : json . width ,
@@ -63,9 +48,6 @@ var ParseJSONTiled = function (name, json, insertNull)
6348 infinite : json . infinite
6449 } ) ;
6550
66-
67-
68-
6951 if ( mapData . orientation === CONST . HEXAGONAL )
7052 {
7153 mapData . hexSideLength = json . hexsidelength ;
@@ -75,6 +57,7 @@ var ParseJSONTiled = function (name, json, insertNull)
7557 mapData . images = ParseImageLayers ( json ) ;
7658
7759 var sets = ParseTilesets ( json ) ;
60+
7861 mapData . tilesets = sets . tilesets ;
7962 mapData . imageCollections = sets . imageCollections ;
8063
0 commit comments