Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-16 09:48:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5292 from browndragon/tiled

Browse source 
Fix up tiled json parsing.
This commit is contained in:
Richard Davey 2021-02-16 11:35:24 +00:00 committed by GitHub
commit be2dad8a70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 148 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/tilemaps/parsers/tiled/ParseTilesets.js
View file

@ -7,6 +7,7 @@
var Tileset = require('../../Tileset');
var ImageCollection = require('../../ImageCollection');
var ParseObject = require('./ParseObject');
var ParseWangsets = require('./ParseWangsets');
/**
* Tilesets and Image Collections
@ -40,18 +41,19 @@ var ParseTilesets = function (json)
if (json.version > 1)
{
// Tiled 1.2+
var datas = undefined;
var props = undefined;
if (Array.isArray(set.tiles))
{
var tiles = {};
var props = {};
datas = datas || {};
props = props || {};
// Tiled 1.2+
for (var t = 0; t < set.tiles.length; t++)
{
var tile = set.tiles[t];
// Convert tileproperties
// Convert tileproperties.
if (tile.properties)
{
var newPropData = {};
@ -67,7 +69,7 @@ var ParseTilesets = function (json)
// Convert objectgroup
if (tile.objectgroup)
{
tiles[tile.id] = { objectgroup: tile.objectgroup };
(datas[tile.id] || (datas[tile.id] = {})).objectgroup = tile.objectgroup;
if (tile.objectgroup.objects)
{
@ -76,25 +78,33 @@ var ParseTilesets = function (json)
return ParseObject(obj);
});
tiles[tile.id].objectgroup.objects = parsedObjects2;
datas[tile.id].objectgroup.objects = parsedObjects2;
}
}
// Copy animation data
if (tile.animation)
{
if (tiles.hasOwnProperty(tile.id))
{
tiles[tile.id].animation = tile.animation;
}
else
{
tiles[tile.id] = { animation: tile.animation };
}
(datas[tile.id] || (datas[tile.id] = {})).animation = tile.animation;
}
// Copy tile `type` field
// (see https://doc.mapeditor.org/en/latest/manual/custom-properties/#typed-tiles).
if (tile.type)
{
(datas[tile.id] || (datas[tile.id] = {})).type = tile.type;
}
}
newSet.tileData = tiles;
}
if (Array.isArray(set.wangsets))
{
datas = datas || {};
props = props || {};
ParseWangsets(set.wangsets, datas);
}
if (datas) // Implies also props is set.
{
newSet.tileData = datas;
newSet.tileProperties = props;
}
}

120
src/tilemaps/parsers/tiled/ParseWangsets.js Normal file
View file

@ -0,0 +1,120 @@
/**
* @author Richard Davey <rich@photonstorm.com>
* @copyright 2020 Photon Storm Ltd.
* @license {@link https://opensource.org/licenses/MIT|MIT License}
*/
/**
* Tilesets and Image Collections
*
* @function Phaser.Tilemaps.Parsers.Tiled.ParseTilesets
* @since 3.0.0
*
* @param {Array.<object>} wangsets - The array of wangset objects (parsed from JSON)
* @param {object} datas - The field into which to put wangset data from Tiled.
*
* @return {object} An object containing the tileset and image collection data.
*/
var ParseWangsets = function (wangsets, datas)
{
// Since Tiled 1.1.5+
// Since a given tile can be in more than one wangset, the resulting properties
// are nested -- `tile.data.wangid[someWangsetName]` gets you the
// array-based wangid in this implementation.
// TODO: structure wangset metadata -- especially color info.
// We're not guaranteed that there will be any "normal" tiles if the only
// thing in the tileset are wangtile definitions, so this has to be parsed
// separately.
// See https://doc.mapeditor.org/en/latest/manual/using-wang-tiles/
// for more information.
for (var w = 0; w < wangsets.length; w++)
{
var wangset = wangsets[w];
var identifier = w;
if (wangset.name && wangset.name !== '')
{
identifier = wangset.name;
}
if (Array.isArray(wangset.wangtiles) && wangset.wangtiles.length > 0)
{
var edgeColors = {};
var cornerColors = {};
var c = undefined;
var colorIndex = undefined;
var color = undefined;
// Tiled before v2020.09.09
if (Array.isArray(wangset.edgecolors))
{
for (c = 0; c < wangset.edgecolors.length; c++)
{
colorIndex = 1 + c;
color = wangset.edgecolors[c];
if (color.name !== '')
{
edgeColors[colorIndex] = color.name;
}
}
}
if (Array.isArray(wangset.cornercolors))
{
for (c = 0; c < wangset.cornercolors.length; c++)
{
colorIndex = 1 + c;
color = wangset.cornercolors[c];
if (color.name !== '')
{
cornerColors[colorIndex] = color.name;
}
}
}
// Tiled after v2020.09.09
if (Array.isArray(wangset.colors))
{
for (c = 0; c < wangset.colors.length; c++)
{
color = wangset.colors[c];
colorIndex = 1 + c;
if (color.name !== '')
{
edgeColors[colorIndex] = cornerColors[colorIndex] = color.name;
}
}
}
// The wangid layout is north, northeast, east, southeast, etc.
var idLayout = [
edgeColors, cornerColors, edgeColors, cornerColors,
edgeColors, cornerColors, edgeColors, cornerColors
];
for (var t = 0; t < wangset.wangtiles.length; t++)
{
var wangtile = wangset.wangtiles[t];
var obj = (datas[wangtile.tileid] || (datas[wangtile.tileid] = {}));
obj = (obj.wangid || (obj.wangid = {}));
var wangid = [];
for (var i = 0; i < Math.min(idLayout.length, wangtile.wangid.length); i++)
{
color = wangtile.wangid[i];
if (color === 0)
{
wangid.push(undefined);
continue;
}
var renamed = idLayout[i][color];
if (renamed !== undefined)
{
wangid.push(renamed);
continue;
}
wangid.push(color);
}
obj[identifier] = wangid;
}
}
}
};
module.exports = ParseWangsets;

2
src/tilemaps/typedefs/TiledObject.js
View file

@ -4,7 +4,7 @@
*
* @property {number} id - The unique object ID.
* @property {string} name - The name this object was assigned in Tiled.
* @property {string} type - The type, as assigned in Tiled.
* @property {string} type - The string type of this instance, as assigned in Tiled. Tiled supports inheriting instance types from tilesets; in that case, the type will be set in the tile's data, but will be `''` here; use the `gid` to fetch the tile data or properties.
* @property {boolean} [visible] - The visible state of this object.
* @property {number} [x] - The horizontal position of this object, in pixels, relative to the tilemap.
* @property {number} [y] - The vertical position of this object, in pixels, relative to the tilemap.