diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileMap.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileMap.cs index 4cd2de9..7cfae83 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileMap.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileMap.cs @@ -11,6 +11,6 @@ namespace ZoFo.GameCore.GameManagers.MapManager.MapElements public bool Infinite { get; set; } public int TileHeight { get; set; } public int TileWidth { get; set; } - public List TileSets { get; set; } + public List TileSets { get; set; } } } diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs index 26b3627..ad9bb9d 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,5 +9,15 @@ namespace ZoFo.GameCore.GameManagers.MapManager.MapElements { public class TileSet { + public string Image { get; set; } + public string Name { get; set; } + public int ImageHeight { get; set; } + public int ImageWidth { get; set; } + public int Margin { get; set; } + public int Spacing { get; set; } + public int TileCount { get; set; } + public int TileHeight { get; set; } + public int TileWidth { get; set; } + public int Columns { get; set; } } } diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs index d9325e0..471ff90 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs @@ -1,20 +1,42 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; +using System.Text.Json; using System.Threading.Tasks; +using ZoFo.GameCore.GameManagers.MapManager.MapElements; namespace ZoFo.GameCore.GameManagers.MapManager { public class MapManager { - public void LoadMap() - { + private static readonly string _path = "/{0}.tmj"; + private List _tileSets = new List(); + public void LoadMap(string mapName = "main") + { + TileMap tileMap; + using (StreamReader reader = new StreamReader(string.Format(_path, mapName))) + { + string data = reader.ReadToEnd(); + tileMap = JsonSerializer.Deserialize(data); + } + + List tileSets = new List(); + foreach (TileSetInfo tileSetInfo in tileMap.TileSets) + { + tileSets.Add(LoadTileSet(tileSetInfo.Source)); + } } - private void LoadTileSet() - { + private TileSet LoadTileSet(string path) + { + using (StreamReader reader = new StreamReader(path)) + { + string data = reader.ReadToEnd(); + return JsonSerializer.Deserialize(data); + } } }