Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 12:58:33 +01:00
Code Issues Projects Releases Wiki Activity

added stub tileset tiles to make interaction with tiled easier

Browse source
This commit is contained in:
Ellpeck 2019-12-07 15:17:40 +01:00
parent e994793ad3
commit d3dc40600e
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
MLEM.Extended/Tiled/TiledExtensions.cs
View file

@ -1,3 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using MonoGame.Extended; using MonoGame.Extended;
@ -6,6 +8,8 @@ using MonoGame.Extended.Tiled;
namespace MLEM.Extended.Tiled { namespace MLEM.Extended.Tiled {
public static class TiledExtensions { public static class TiledExtensions {
private static readonly Dictionary<int, TiledMapTilesetTile> StubTilesetTiles = new Dictionary<int, TiledMapTilesetTile>();
public static string Get(this TiledMapProperties properties, string key) { public static string Get(this TiledMapProperties properties, string key) {
properties.TryGetValue(key, out var val); properties.TryGetValue(key, out var val);
return val; return val;
@ -38,18 +42,26 @@ namespace MLEM.Extended.Tiled {
return tile.GlobalIdentifier - map.GetTilesetFirstGlobalIdentifier(tileset); return tile.GlobalIdentifier - map.GetTilesetFirstGlobalIdentifier(tileset);
} }
public static TiledMapTilesetTile GetTilesetTile(this TiledMapTileset tileset, TiledMapTile tile, TiledMap map) { public static TiledMapTilesetTile GetTilesetTile(this TiledMapTileset tileset, TiledMapTile tile, TiledMap map, bool createStub = true) {
if (tile.IsBlank) if (tile.IsBlank)
return null; return null;
var localId = tile.GetLocalIdentifier(tileset, map); var localId = tile.GetLocalIdentifier(tileset, map);
return tileset.Tiles.FirstOrDefault(t => t.LocalTileIdentifier == localId); var tilesetTile = tileset.Tiles.FirstOrDefault(t => t.LocalTileIdentifier == localId);
if (tilesetTile == null && createStub) {
var id = tile.GetLocalIdentifier(tileset, map);
if (!StubTilesetTiles.TryGetValue(id, out tilesetTile)) {
tilesetTile = new TiledMapTilesetTile(id);
StubTilesetTiles.Add(id, tilesetTile);
}
}
return tilesetTile;
} }
public static TiledMapTilesetTile GetTilesetTile(this TiledMapTile tile, TiledMap map) { public static TiledMapTilesetTile GetTilesetTile(this TiledMapTile tile, TiledMap map, bool createStub = true) {
if (tile.IsBlank) if (tile.IsBlank)
return null; return null;
var tileset = tile.GetTileset(map); var tileset = tile.GetTileset(map);
return tileset?.GetTilesetTile(tile, map); return tileset.GetTilesetTile(tile, map, createStub);
} }
public static int GetTileLayerIndex(this TiledMap map, string layerName) { public static int GetTileLayerIndex(this TiledMap map, string layerName) {

4
MLEM.Extended/Tiled/TiledMapCollisions.cs
View file

@ -38,10 +38,6 @@ namespace MLEM.Extended.Tiled {
return; return;
} }
var tilesetTile = tile.GetTilesetTile(this.map); var tilesetTile = tile.GetTilesetTile(this.map);
if (tilesetTile == null) {
this.collisionInfos[layerIndex, x, y] = null;
return;
}
this.collisionInfos[layerIndex, x, y] = new TileCollisionInfo(this.map, new Vector2(x, y), tile, tilesetTile); this.collisionInfos[layerIndex, x, y] = new TileCollisionInfo(this.map, new Vector2(x, y), tile, tilesetTile);
} }