diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs index 74f559e..665d487 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs @@ -13,11 +13,16 @@ namespace ZoFo.GameCore.GameManagers.MapManager { public class MapManager { - private static readonly string _path = "/{0}.tmj"; + private static readonly string _path = "TileMaps/{0}.tmj"; private List _tileSets = new List(); + /// + /// Загрузка карты. Передаётся название файла карты. По умолчанию main. + /// + /// public void LoadMap(string mapName = "main") { + // Загрузка TileMap TileMap tileMap; using (StreamReader reader = new StreamReader(string.Format(_path, mapName))) { @@ -25,6 +30,7 @@ namespace ZoFo.GameCore.GameManagers.MapManager tileMap = JsonSerializer.Deserialize(data); } + // Загрузка TileSet-ов по TileSetInfo List tileSets = new List(); foreach (TileSetInfo tileSetInfo in tileMap.TileSets) { @@ -35,30 +41,32 @@ namespace ZoFo.GameCore.GameManagers.MapManager foreach (var chunk in tileMap.Layers[0].Chunks) { - int i = 0; - foreach (var id in chunk.Data) + for (int i = 0; i < chunk.Data.Length; i++) { foreach (var tileSet in tileSets) { - if (tileSet.FirstGid - id < 0) + if (tileSet.FirstGid - chunk.Data[i] < 0) { - int number = id - tileSet.FirstGid; + int number = chunk.Data[i] - tileSet.FirstGid; int relativeColumn = number % tileSet.Columns * tileSet.TileWidth; int relativeRow = number / tileSet.Columns * tileSet.TileHeight; - Rectangle sourceRectangle = new Rectangle(relativeColumn * tileSet.TileWidth, relativeRow * tileSet.TileHeight, + Rectangle sourceRectangle = new Rectangle(relativeColumn * tileSet.TileWidth, relativeRow * tileSet.TileHeight, relativeColumn * tileSet.TileWidth + tileSet.TileWidth, relativeRow * tileSet.TileHeight + tileSet.TileHeight); Vector2 position = new Vector2(i % chunk.Width, i / chunk.Height); } } - i++; } } - } + /// + /// Загружает и парсит TileSet по его пути. + /// + /// + /// private TileSet LoadTileSet(string path) { using (StreamReader reader = new StreamReader(path))