Skip to content

Commit c7c94cd

Browse files
committed
Remove unnecessary v2 code: tilemap.collision
1 parent cbc493d commit c7c94cd

2 files changed

Lines changed: 2 additions & 10 deletions

File tree

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
var GetFastValue = require('../../../../utils/object/GetFastValue');
22
var ParseObject = require('./ParseObject');
33

4-
// Objects & Collision Data (polylines, etc)
54
var ParseObjectLayers = function (json)
65
{
76
var objects = {};
8-
var collision = {};
97

108
for (var i = 0; i < json.layers.length; i++)
119
{
@@ -20,20 +18,16 @@ var ParseObjectLayers = function (json)
2018
var offsetY = GetFastValue(curo, 'offsety', 0);
2119

2220
objects[layerName] = [];
23-
collision[layerName] = [];
2421

2522
for (var j = 0; j < curo.objects.length; j++)
2623
{
2724
var parsedObject = ParseObject(curo.objects[j], offsetX, offsetY);
2825

29-
// Matching v2 where only polylines were added to collision prop of the map
30-
if (parsedObject.polyline) { collision[layerName].push(parsedObject); }
31-
3226
objects[layerName].push(parsedObject);
3327
}
3428
}
3529

36-
return { objects: objects, collision: collision };
30+
return objects;
3731
};
3832

3933
module.exports = ParseObjectLayers;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ var ParseJSONTiled = function (name, json, insertNull)
4747
mapData.tilesets = sets.tilesets;
4848
mapData.imageCollections = sets.imageCollections;
4949

50-
var objs = ParseObjectLayers(json);
51-
mapData.objects = objs.objects;
52-
mapData.collision = objs.collision;
50+
mapData.objects = ParseObjectLayers(json);
5351

5452
mapData.tiles = BuildTilesetIndex(mapData);
5553

0 commit comments

Comments
 (0)