Upgraded Tilemap object layer parser from v2

- Added ObjectLayer class to make the structure of an object layer clear
- Tilemap.objects is now an array of objects. This allows object layer properties to be parsed.

Author: mikewesthad

src/gameobjects/tilemap/Tilemap.js

@@ -116,12 +116,6 @@ var Tilemap = new Class({
          */
         this.images = mapData.images;
 
-        /**
-         * An array of collision data. Specifically, any polyline objects defined in object layers.
-         * @property {array} collision
-         */
-        this.collision = mapData.collision; // Note: this probably isn't useful anymore
-
         /**
          * @property {LayerData[]} layers - An array of Tilemap layer data.
          */
@@ -134,8 +128,8 @@ var Tilemap = new Class({
         this.tilesets = mapData.tilesets;
 
         /**
-         * An array of Tiled Object Layers.
-         * @property {array} objects
+         * An array of ObjectLayer instances parsed from Tiled object layers.
+         * @property {ObjectLayer[]} objects
          */
         this.objects = mapData.objects;
 
@@ -402,18 +396,20 @@ var Tilemap = new Class({
         if (spriteConfig === undefined) { spriteConfig = {}; }
         if (scene === undefined) { scene = this.scene; }
 
-        if (!this.objects[name])
+        var objectLayer = this.getObjectLayer(name);
+        if (!objectLayer)
         {
             console.warn('Cannot create from object. Invalid objectgroup name given: ' + name);
             return;
         }
 
+        var objects = objectLayer.objects;
         var sprites = [];
 
-        for (var i = 0; i < this.objects[name].length; i++)
+        for (var i = 0; i < objects.length; i++)
         {
             var found = false;
-            var obj = this.objects[name][i];
+            var obj = objects[i];
 
             if (obj.gid !== undefined && typeof id === 'number' && obj.gid === id ||
                 obj.id !== undefined && typeof id === 'number' && obj.id === id ||
@@ -665,6 +661,19 @@ var Tilemap = new Class({
         return index !== null ? this.layers[index] : null;
     },
 
+    /**
+     * Gets the ObjectLayer from this.objects that has the given `name`, or null if no ObjectLayer
+     * is found with that name.
+     *
+     * @param {string} [name] - The name of the object layer from Tiled.
+     * @return {ObjectLayer|null} The corresponding ObjectLayer within this.objects or null.
+     */
+    getObjectLayer: function (name)
+    {
+        var index = this.getIndex(this.objects, name);
+        return index !== null ? this.objects[index] : null;
+    },
+
     /**
      * Gets the LayerData index of the given `layer` within this.layers, or null if an invalid
      * `layer` is given.

src/gameobjects/tilemap/mapdata/ObjectLayer.js

@@ -0,0 +1,37 @@
+var Class = require('../../../utils/Class');
+var GetFastValue = require('../../../utils/object/GetFastValue');
+
+var ObjectLayer = new Class({
+
+    initialize:
+
+
+    /**
+     * A class for representing a Tiled object layer in a map. This mirrors the structure of a Tiled
+     * object layer, except:
+     *  - "x" & "y" properties are ignored since these cannot be changed in Tiled.
+     *  - "offsetx" & "offsety" are applied to the individual object coordinates directly, so they
+     *    are ignored as well.
+     *  - "draworder" is ignored.
+     *
+     * @class ObjectLayer
+     * @constructor
+     *
+     * @param {object} [config] - [description]
+     */
+    function ObjectLayer (config)
+    {
+        if (config === undefined) { config = {}; }
+
+        this.name = GetFastValue(config, 'name', 'object layer');
+        this.opacity = GetFastValue(config, 'opacity', 1);
+        this.properties = GetFastValue(config, 'properties', {});
+        this.propertyTypes = GetFastValue(config, 'propertytypes', {});
+        this.type = GetFastValue(config, 'type', 'objectgroup');
+        this.visible = GetFastValue(config, 'visible', true);
+        this.objects = GetFastValue(config, 'objects', []);
+    }
+
+});
+
+module.exports = ObjectLayer;

src/gameobjects/tilemap/parsers/parsetiledjson/ParseObjectLayers.js

@@ -1,9 +1,10 @@
 var GetFastValue = require('../../../../utils/object/GetFastValue');
 var ParseObject = require('./ParseObject');
+var ObjectLayer = require('../../mapdata/ObjectLayer');
 
 var ParseObjectLayers = function (json)
 {
-    var objects = {};
+    var objectLayers = [];
 
     for (var i = 0; i < json.layers.length; i++)
     {
@@ -13,21 +14,24 @@ var ParseObjectLayers = function (json)
         }
 
         var curo = json.layers[i];
-        var layerName = curo.name;
         var offsetX = GetFastValue(curo, 'offsetx', 0);
         var offsetY = GetFastValue(curo, 'offsety', 0);
-
-        objects[layerName] = [];
+        var objects = [];
 
         for (var j = 0; j < curo.objects.length; j++)
         {
             var parsedObject = ParseObject(curo.objects[j], offsetX, offsetY);
 
-            objects[layerName].push(parsedObject);
+            objects.push(parsedObject);
         }
+
+        var objectLayer = new ObjectLayer(curo);
+        objectLayer.objects = objects;
+
+        objectLayers.push(objectLayer);
     }
 
-    return objects;
+    return objectLayers;
 };
 
 module.exports = ParseObjectLayers;