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

added the layer to collision infos

Browse source
This commit is contained in:
Ellpeck 2019-12-30 19:19:40 +01:00
parent da603c5f05
commit e2682e866d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,7 @@ namespace MLEM.Extended.Tiled {
return; return;
} }
var tilesetTile = tile.GetTilesetTile(this.map); var tilesetTile = tile.GetTilesetTile(this.map);
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, layer, tilesetTile);
} }
public IEnumerable<TileCollisionInfo> GetCollidingTiles(RectangleF area, Func<TileCollisionInfo, bool> included = null) { public IEnumerable<TileCollisionInfo> GetCollidingTiles(RectangleF area, Func<TileCollisionInfo, bool> included = null) {
@ -67,11 +67,13 @@ namespace MLEM.Extended.Tiled {
public class TileCollisionInfo { public class TileCollisionInfo {
public readonly TiledMapTile Tile; public readonly TiledMapTile Tile;
public readonly TiledMapTileLayer Layer;
public readonly TiledMapTilesetTile TilesetTile; public readonly TiledMapTilesetTile TilesetTile;
public readonly ReadOnlyCollection<RectangleF> Collisions; public readonly ReadOnlyCollection<RectangleF> Collisions;
public TileCollisionInfo(TiledMap map, Vector2 position, TiledMapTile tile, TiledMapTilesetTile tilesetTile) { public TileCollisionInfo(TiledMap map, Vector2 position, TiledMapTile tile, TiledMapTileLayer layer, TiledMapTilesetTile tilesetTile) {
this.TilesetTile = tilesetTile; this.TilesetTile = tilesetTile;
this.Layer = layer;
this.Tile = tile; this.Tile = tile;
var collisions = new List<RectangleF>(); var collisions = new List<RectangleF>();