Merge branch 'master' of https://github.com/photonstorm/phaser

Author: photonstorm

v3/src/gameobjects/tilemap/Formats.js

@@ -1,6 +1,7 @@
 module.exports = {
 
-    TILEMAP_CSV: '0',
-    TILEMAP_TILED_JSON: '1'
+    TILEMAP_CSV: 0,
+    TILEMAP_TILED_JSON: 1,
+    TILEMAP_2D_ARRAY: 2
 
 };

v3/src/gameobjects/tilemap/GenerateEmptyMapData.js

@@ -1,10 +1,12 @@
-var GenerateEmptyMapData = function (tileWidth, tileHeight, width, height)
+var GenerateEmptyMapData = function (format, name, tileWidth, tileHeight, width, height)
 {
     return {
         width: (width !== undefined && width !== null) ? width : 0,
         height: (height !== undefined && height !== null) ? height : 0,
         tileWidth: (tileWidth !== undefined && tileWidth !== null) ? tileWidth : 0,
         tileHeight: (tileHeight !== undefined && tileHeight !== null) ? tileHeight : 0,
+        name: (name !== undefined && name !== null) ? name : '',
+        format: format,
         orientation: 'orthogonal',
         version: '1',
         properties: {},

v3/src/gameobjects/tilemap/Parse.js

@@ -1,20 +1,23 @@
 var Formats = require('./Formats');
 var Parsers = require('./parsers');
 
-var Parse = function (key, map, tileWidth, tileHeight, width, height)
+var Parse = function (key, mapFormat, mapData, tileWidth, tileHeight, width, height)
 {
     var newMap;
 
-    switch(map.format)
+    switch(mapFormat)
     {
+        case (Formats.TILEMAP_2D_ARRAY):
+            newMap = Parsers.Parse2DArray(key, mapData, tileWidth, tileHeight, width, height);
+            break;
         case (Formats.TILEMAP_CSV):
-            newMap = Parsers.ParseCSV(key, map.data, tileWidth, tileHeight, width, height);
+            newMap = Parsers.ParseCSV(key, mapData, tileWidth, tileHeight, width, height);
             break;
         case (Formats.TILEMAP_TILED_JSON):
-            newMap = Parsers.ParseTiledJSON(key, map.data);
+            newMap = Parsers.ParseTiledJSON(key, mapData);
             break;
         default:
-            console.warn('Unrecognized tilemap data format: ' + map.format);
+            console.warn('Unrecognized tilemap data format: ' + mapFormat);
             newMap = null;
     }
 

v3/src/gameobjects/tilemap/parsers/Parse2DArray.js

@@ -0,0 +1,48 @@
+var GenerateEmptyMapData = require('../GenerateEmptyMapData');
+var Formats = require('../Formats');
+var Tile = require('../Tile');
+
+var Parse2DArray = function (key, data, tileWidth, tileHeight)
+{
+    var map = GenerateEmptyMapData(Formats.TILEMAP_2D_ARRAY, key, tileWidth, tileHeight);
+
+    var output = [];
+    var height = data.length;
+    var width = 0;
+
+    for (var y = 0; y < data.length; y++)
+    {
+        output[y] = [];
+        var row = data[y];
+
+        for (var x = 0; x < row.length; x++)
+        {
+            var tileIndex = parseInt(row[x], 10);
+            if (Number.isNaN(tileIndex)) { tileIndex = -1; }
+
+            output[y][x] = new Tile(map.layers[0], tileIndex, x, y, tileWidth, tileHeight);
+        }
+
+        if (width === 0)
+        {
+            width = row.length;
+        }
+    }
+
+    map.width = width;
+    map.height = height;
+    map.tileWidth = tileWidth;
+    map.tileHeight = tileHeight;
+    map.widthInPixels = width * tileWidth;
+    map.heightInPixels = height * tileHeight;
+
+    map.layers[0].width = width;
+    map.layers[0].height = height;
+    map.layers[0].widthInPixels = map.widthInPixels;
+    map.layers[0].heightInPixels = map.heightInPixels;
+    map.layers[0].data = output;
+
+    return map;
+};
+
+module.exports = Parse2DArray;

v3/src/gameobjects/tilemap/parsers/ParseCSV.js

@@ -1,47 +1,15 @@
-var GenerateEmptyMapData = require('../GenerateEmptyMapData');
 var Formats = require('../Formats');
-var Tile = require('../Tile');
+var Parse2DArray = require('./Parse2DArray');
 
 var ParseCSV = function (key, data, tileWidth, tileHeight)
 {
-    var map = GenerateEmptyMapData(tileWidth, tileHeight);
-
-    var output = [];
-    var rows = data.trim().split('\n');
-    var height = rows.length;
-    var width = 0;
-
-    for (var y = 0; y < rows.length; y++)
-    {
-        output[y] = [];
-
-        var column = rows[y].split(',');
-
-        for (var x = 0; x < column.length; x++)
-        {
-            output[y][x] = new Tile(map.layers[0], parseInt(column[x], 10), x, y, tileWidth, tileHeight);
-        }
-
-        if (width === 0)
-        {
-            width = column.length;
-        }
-    }
+    var array2D = data
+        .trim()
+        .split('\n')
+        .map(function (row) { return row.split(','); });
 
+    var map = Parse2DArray(key, array2D, tileWidth, tileHeight);
     map.format = Formats.TILEMAP_CSV;
-    map.name = key;
-    map.width = width;
-    map.height = height;
-    map.tileWidth = tileWidth;
-    map.tileHeight = tileHeight;
-    map.widthInPixels = width * tileWidth;
-    map.heightInPixels = height * tileHeight;
-
-    map.layers[0].width = width;
-    map.layers[0].height = height;
-    map.layers[0].widthInPixels = map.widthInPixels;
-    map.layers[0].heightInPixels = map.heightInPixels;
-    map.layers[0].data = output;
 
     return map;
 };

v3/src/gameobjects/tilemap/parsers/index.js

@@ -1,5 +1,6 @@
 module.exports = {
 
+    Parse2DArray: require('./Parse2DArray'),
     ParseCSV: require('./ParseCSV'),
     ParseTiledJSON: require('./ParseTiledJSON')