From 24332f240b26974c7186618368e749bf0dada1e9 Mon Sep 17 00:00:00 2001 From: polten0 Date: Thu, 15 Aug 2024 15:00:57 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=20=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83?= =?UTF-8?q?=D0=B7=D0=BA=D1=83=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MapManager/MapElements/TileMap.cs | 2 +- .../MapManager/MapElements/TileSet.cs | 11 +++++++ .../GameManagers/MapManager/MapManager.cs | 30 ++++++++++++++++--- 3 files changed, 38 insertions(+), 5 deletions(-) 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); + } } } From 90fe705ee9d81b73c53329f20275109ea0b2c507 Mon Sep 17 00:00:00 2001 From: polten0 Date: Thu, 15 Aug 2024 21:47:35 +0300 Subject: [PATCH 2/3] intermedia --- .../MapManager/MapElements/TileMap.cs | 1 + .../MapManager/MapElements/TileSet.cs | 1 + .../MapManager/MapElements/TileSetInfo.cs | 14 +++++++++++++ .../GameManagers/MapManager/MapManager.cs | 21 ++++++++++++++++++- 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSetInfo.cs diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileMap.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileMap.cs index 7cfae83..6c7e958 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileMap.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileMap.cs @@ -12,5 +12,6 @@ namespace ZoFo.GameCore.GameManagers.MapManager.MapElements public int TileHeight { get; set; } public int TileWidth { get; set; } public List TileSets { get; set; } + public List Layers { get; set; } } } diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs index ad9bb9d..61eddce 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs @@ -19,5 +19,6 @@ namespace ZoFo.GameCore.GameManagers.MapManager.MapElements public int TileHeight { get; set; } public int TileWidth { get; set; } public int Columns { get; set; } + public int FirstGid { get; set; } } } diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSetInfo.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSetInfo.cs new file mode 100644 index 0000000..f53d448 --- /dev/null +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSetInfo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZoFo.GameCore.GameManagers.MapManager.MapElements +{ + public class TileSetInfo + { + public int FirstGid { get; set; } + public string Source { get; set; } + } +} diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs index 471ff90..2c2d163 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Security.Cryptography; using System.Text; using System.Text.Json; using System.Threading.Tasks; @@ -26,8 +27,26 @@ namespace ZoFo.GameCore.GameManagers.MapManager List tileSets = new List(); foreach (TileSetInfo tileSetInfo in tileMap.TileSets) { - tileSets.Add(LoadTileSet(tileSetInfo.Source)); + TileSet tileSet = LoadTileSet(tileSetInfo.Source); + tileSet.FirstGid = tileSetInfo.FirstGid; + tileSets.Add(tileSet); } + + foreach (var chunk in tileMap.Layers[0].Chunks) + { + foreach (var id in chunk.Data) + { + for (int i = 0; i < tileSets.Count; i++) + { + if (tileSets[i].FirstGid - id < 0) + { + int number = id - tileSets[i].FirstGid; + + } + } + } + } + } private TileSet LoadTileSet(string path) From e9cdcb42a615e447f72c81eb5f5b8ee004f75e3b Mon Sep 17 00:00:00 2001 From: polten0 Date: Fri, 16 Aug 2024 01:00:21 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=B8=D1=82=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=BD=D0=B3=D0=B0=20=D1=82=D0=B0=D0=B9=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameManagers/MapManager/MapManager.cs | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs index 2c2d163..74f559e 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.Xna.Framework; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -34,16 +35,25 @@ 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 < tileSets.Count; i++) + foreach (var tileSet in tileSets) { - if (tileSets[i].FirstGid - id < 0) + if (tileSet.FirstGid - id < 0) { - int number = id - tileSets[i].FirstGid; - + int number = id - 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, + relativeColumn * tileSet.TileWidth + tileSet.TileWidth, relativeRow * tileSet.TileHeight + tileSet.TileHeight); + + Vector2 position = new Vector2(i % chunk.Width, i / chunk.Height); } } + i++; } }