Tilemap parsers: remove width & height parameters since they are inferred

Author: mikewesthad

v3/src/gameobjects/tilemap/Parse.js

@@ -1,17 +1,17 @@
 var Formats = require('./Formats');
 var Parsers = require('./parsers');
 
-var Parse = function (key, mapFormat, mapData, tileWidth, tileHeight, width, height, insertNull)
+var Parse = function (key, mapFormat, mapData, tileWidth, tileHeight, insertNull)
 {
     var newMap;
 
     switch(mapFormat)
     {
         case (Formats.TILEMAP_2D_ARRAY):
-            newMap = Parsers.Parse2DArray(key, mapData, tileWidth, tileHeight, width, height, insertNull);
+            newMap = Parsers.Parse2DArray(key, mapData, tileWidth, tileHeight, insertNull);
             break;
         case (Formats.TILEMAP_CSV):
-            newMap = Parsers.ParseCSV(key, mapData, tileWidth, tileHeight, width, height, insertNull);
+            newMap = Parsers.ParseCSV(key, mapData, tileWidth, tileHeight, insertNull);
             break;
         case (Formats.TILEMAP_TILED_JSON):
             newMap = Parsers.ParseTiledJSON(key, mapData, insertNull);

v3/src/gameobjects/tilemap/TilemapCreator.js

@@ -14,20 +14,22 @@ GameObjectCreator.register('tilemap', function (config)
     //     tileHeight: 32,
     //     width: 10,
     //     height: 10,
-    //     data: null (2D array of tile indices)
+    //     data: null (2D array of tile indices),
+    //     insertNull: false
     // }
 
     var key = GetFastValue(config, 'key', null);
     var tileWidth = GetFastValue(config, 'tileWidth', 32);
     var tileHeight = GetFastValue(config, 'tileHeight', 32);
     var width = GetFastValue(config, 'width', 10);
     var height = GetFastValue(config, 'height', 10);
+    var insertNull = GetFastValue(config, 'insertNull', false);
     var data = GetFastValue(config, 'data', null);
 
     var parsedData = null;
     if (key === null && Array.isArray(data))
     {
-        parsedData = Parse(key, Formats.TILEMAP_2D_ARRAY, data, tileWidth, tileHeight, width, height);
+        parsedData = Parse(key, Formats.TILEMAP_2D_ARRAY, data, tileWidth, tileHeight, insertNull);
     }
     else if (key !== null)
     {
@@ -39,7 +41,7 @@ GameObjectCreator.register('tilemap', function (config)
         }
         else
         {
-            parsedData = Parse(key, tilemapData.format, tilemapData.data, tileWidth, tileHeight, width, height);
+            parsedData = Parse(key, tilemapData.format, tilemapData.data, tileWidth, tileHeight, insertNull);
         }
     }
 

v3/src/gameobjects/tilemap/TilemapFactory.js

@@ -21,20 +21,22 @@ GameObjectFactory.register('tilemap', function (config)
     //     tileHeight: 32,
     //     width: 10,
     //     height: 10,
-    //     data: null (2D array of tile indices)
+    //     data: null (2D array of tile indices),
+    //     insertNull: false
     // }
 
     var key = GetFastValue(config, 'key', null);
     var tileWidth = GetFastValue(config, 'tileWidth', 32);
     var tileHeight = GetFastValue(config, 'tileHeight', 32);
     var width = GetFastValue(config, 'width', 10);
     var height = GetFastValue(config, 'height', 10);
+    var insertNull = GetFastValue(config, 'insertNull', false);
     var data = GetFastValue(config, 'data', null);
 
     var parsedData = null;
     if (key === null && Array.isArray(data))
     {
-        parsedData = Parse(key, Formats.TILEMAP_2D_ARRAY, data, tileWidth, tileHeight, width, height);
+        parsedData = Parse(key, Formats.TILEMAP_2D_ARRAY, data, tileWidth, tileHeight, insertNull);
     }
     else if (key !== null)
     {
@@ -46,7 +48,7 @@ GameObjectFactory.register('tilemap', function (config)
         }
         else
         {
-            parsedData = Parse(key, tilemapData.format, tilemapData.data, tileWidth, tileHeight, width, height);
+            parsedData = Parse(key, tilemapData.format, tilemapData.data, tileWidth, tileHeight, insertNull);
         }
     }