From e6d94247c1c0c7dc93702dcacf3413e177a159bd Mon Sep 17 00:00:00 2001 From: Daniel Cronqvist Date: Fri, 16 Aug 2024 23:27:15 +0200 Subject: [PATCH] Use folder structure namespaces --- Makefile | 2 +- src/DotTiled.Tests/Assert/AssertData.cs | 2 ++ src/DotTiled.Tests/Assert/AssertImage.cs | 2 ++ src/DotTiled.Tests/Assert/AssertLayer.cs | 2 ++ src/DotTiled.Tests/Assert/AssertMap.cs | 1 + src/DotTiled.Tests/Assert/AssertObject.cs | 24 ++++++++++--------- src/DotTiled.Tests/Assert/AssertProperties.cs | 2 ++ src/DotTiled.Tests/Assert/AssertTileset.cs | 3 +++ src/DotTiled.Tests/Serialization/TestData.cs | 2 ++ .../TestData/Map/default-map/default-map.cs | 3 +++ .../map-external-tileset-multi.cs | 4 ++++ .../map-external-tileset-wangset.cs | 3 +++ .../map-with-common-props.cs | 3 +++ .../map-with-custom-type-props.cs | 4 ++++ .../map-with-embedded-tileset.cs | 3 +++ .../map-with-external-tileset.cs | 3 +++ .../map-with-flippingflags.cs | 3 +++ .../map-with-many-layers.cs | 5 ++++ .../Serialization/Tmj/TmjMapReaderTests.cs | 5 ++++ .../Serialization/Tmx/TmxMapReaderTests.cs | 4 ++++ src/DotTiled/Model/Color.cs | 2 +- src/DotTiled/Model/Layers/BaseLayer.cs | 3 ++- src/DotTiled/Model/Layers/Data.cs | 2 +- src/DotTiled/Model/Layers/Group.cs | 2 +- src/DotTiled/Model/Layers/ImageLayer.cs | 4 +++- src/DotTiled/Model/Layers/ObjectLayer.cs | 3 ++- .../Model/Layers/Objects/EllipseObject.cs | 2 +- src/DotTiled/Model/Layers/Objects/Object.cs | 3 ++- .../Model/Layers/Objects/PointObject.cs | 2 +- .../Model/Layers/Objects/PolygonObject.cs | 2 +- .../Model/Layers/Objects/PolylineObject.cs | 2 +- .../Model/Layers/Objects/RectangleObject.cs | 2 +- .../Model/Layers/Objects/TextObject.cs | 2 +- .../Model/Layers/Objects/TileObject.cs | 2 +- src/DotTiled/Model/Layers/TileLayer.cs | 2 +- src/DotTiled/Model/Map.cs | 5 +++- src/DotTiled/Model/Properties/BoolProperty.cs | 2 +- .../Model/Properties/ClassProperty.cs | 4 ++-- .../Model/Properties/ColorProperty.cs | 2 +- .../CustomTypes/CustomClassDefinition.cs | 2 +- .../CustomTypes/CustomEnumDefinition.cs | 2 +- .../CustomTypes/CustomTypeDefinition.cs | 2 +- src/DotTiled/Model/Properties/FileProperty.cs | 2 +- .../Model/Properties/FloatProperty.cs | 2 +- src/DotTiled/Model/Properties/IProperty.cs | 2 +- src/DotTiled/Model/Properties/IntProperty.cs | 2 +- .../Model/Properties/ObjectProperty.cs | 2 +- src/DotTiled/Model/Properties/PropertyType.cs | 2 +- .../Model/Properties/StringProperty.cs | 2 +- src/DotTiled/Model/Template.cs | 5 +++- .../Model/{Tileset => Tilesets}/Frame.cs | 2 +- .../Model/{Tileset => Tilesets}/Grid.cs | 2 +- .../Model/{Tileset => Tilesets}/Image.cs | 2 +- .../Model/{Tileset => Tilesets}/Tile.cs | 4 +++- .../Model/{Tileset => Tilesets}/TileOffset.cs | 2 +- .../Model/{Tileset => Tilesets}/Tileset.cs | 3 ++- .../{Tileset => Tilesets}/Transformations.cs | 2 +- .../Model/{Tileset => Tilesets}/WangColor.cs | 3 ++- .../Model/{Tileset => Tilesets}/WangTile.cs | 2 +- .../Model/{Tileset => Tilesets}/Wangset.cs | 3 ++- src/DotTiled/Serialization/Helpers.cs | 5 +++- src/DotTiled/Serialization/IMapReader.cs | 3 ++- src/DotTiled/Serialization/ITemplateReader.cs | 3 ++- src/DotTiled/Serialization/ITilesetReader.cs | 3 ++- .../Tmj/ExtensionsJsonElement.cs | 2 +- .../Serialization/Tmj/TjTemplateReader.cs | 5 +++- src/DotTiled/Serialization/Tmj/Tmj.Data.cs | 3 ++- src/DotTiled/Serialization/Tmj/Tmj.Group.cs | 6 ++++- .../Serialization/Tmj/Tmj.ImageLayer.cs | 7 +++++- src/DotTiled/Serialization/Tmj/Tmj.Layer.cs | 5 +++- src/DotTiled/Serialization/Tmj/Tmj.Map.cs | 7 +++++- .../Serialization/Tmj/Tmj.ObjectLayer.cs | 13 ++++++---- .../Serialization/Tmj/Tmj.Properties.cs | 5 +++- .../Serialization/Tmj/Tmj.Template.cs | 7 ++++-- .../Serialization/Tmj/Tmj.TileLayer.cs | 7 ++++-- src/DotTiled/Serialization/Tmj/Tmj.Tileset.cs | 7 +++++- src/DotTiled/Serialization/Tmj/Tmj.Wangset.cs | 13 ---------- .../Serialization/Tmj/TmjMapReader.cs | 5 +++- .../Serialization/Tmj/TsjTilesetReader.cs | 5 +++- .../Serialization/Tmx/ExtensionsXmlReader.cs | 2 +- src/DotTiled/Serialization/Tmx/Tmx.Chunk.cs | 3 ++- src/DotTiled/Serialization/Tmx/Tmx.Data.cs | 3 ++- src/DotTiled/Serialization/Tmx/Tmx.Map.cs | 7 +++++- .../Serialization/Tmx/Tmx.ObjectLayer.cs | 20 ++++++++++------ .../Serialization/Tmx/Tmx.Properties.cs | 5 +++- .../Serialization/Tmx/Tmx.TileLayer.cs | 7 +++++- src/DotTiled/Serialization/Tmx/Tmx.Tileset.cs | 7 +++++- .../Serialization/Tmx/TmxMapReader.cs | 5 +++- .../Serialization/Tmx/TsxTilesetReader.cs | 5 +++- .../Serialization/Tmx/TxTemplateReader.cs | 5 +++- 90 files changed, 252 insertions(+), 106 deletions(-) rename src/DotTiled/Model/{Tileset => Tilesets}/Frame.cs (78%) rename src/DotTiled/Model/{Tileset => Tilesets}/Grid.cs (88%) rename src/DotTiled/Model/{Tileset => Tilesets}/Image.cs (89%) rename src/DotTiled/Model/{Tileset => Tilesets}/Tile.cs (85%) rename src/DotTiled/Model/{Tileset => Tilesets}/TileOffset.cs (77%) rename src/DotTiled/Model/{Tileset => Tilesets}/Tileset.cs (95%) rename src/DotTiled/Model/{Tileset => Tilesets}/Transformations.cs (87%) rename src/DotTiled/Model/{Tileset => Tilesets}/WangColor.cs (84%) rename src/DotTiled/Model/{Tileset => Tilesets}/WangTile.cs (79%) rename src/DotTiled/Model/{Tileset => Tilesets}/Wangset.cs (87%) delete mode 100644 src/DotTiled/Serialization/Tmj/Tmj.Wangset.cs diff --git a/Makefile b/Makefile index e7dc7a5..a79c862 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ test: - dotnet test + dotnet test src/DotTiled.sln BENCHMARK_SOURCES = DotTiled.Benchmark/Program.cs DotTiled.Benchmark/DotTiled.Benchmark.csproj BENCHMARK_OUTPUTDIR = DotTiled.Benchmark/BenchmarkDotNet.Artifacts diff --git a/src/DotTiled.Tests/Assert/AssertData.cs b/src/DotTiled.Tests/Assert/AssertData.cs index 31ffff2..3c18ef9 100644 --- a/src/DotTiled.Tests/Assert/AssertData.cs +++ b/src/DotTiled.Tests/Assert/AssertData.cs @@ -1,3 +1,5 @@ +using DotTiled.Model.Layers; + namespace DotTiled.Tests; public static partial class DotTiledAssert diff --git a/src/DotTiled.Tests/Assert/AssertImage.cs b/src/DotTiled.Tests/Assert/AssertImage.cs index a674faa..613318b 100644 --- a/src/DotTiled.Tests/Assert/AssertImage.cs +++ b/src/DotTiled.Tests/Assert/AssertImage.cs @@ -1,3 +1,5 @@ +using DotTiled.Model.Tilesets; + namespace DotTiled.Tests; public static partial class DotTiledAssert diff --git a/src/DotTiled.Tests/Assert/AssertLayer.cs b/src/DotTiled.Tests/Assert/AssertLayer.cs index 5432d62..1cb9e36 100644 --- a/src/DotTiled.Tests/Assert/AssertLayer.cs +++ b/src/DotTiled.Tests/Assert/AssertLayer.cs @@ -1,3 +1,5 @@ +using DotTiled.Model.Layers; + namespace DotTiled.Tests; public static partial class DotTiledAssert diff --git a/src/DotTiled.Tests/Assert/AssertMap.cs b/src/DotTiled.Tests/Assert/AssertMap.cs index e9ad8be..6984b79 100644 --- a/src/DotTiled.Tests/Assert/AssertMap.cs +++ b/src/DotTiled.Tests/Assert/AssertMap.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Numerics; +using DotTiled.Model; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Assert/AssertObject.cs b/src/DotTiled.Tests/Assert/AssertObject.cs index 6c586bb..f234ed2 100644 --- a/src/DotTiled.Tests/Assert/AssertObject.cs +++ b/src/DotTiled.Tests/Assert/AssertObject.cs @@ -1,20 +1,22 @@ +using DotTiled.Model.Layers.Objects; + namespace DotTiled.Tests; public static partial class DotTiledAssert { - internal static void AssertObject(Object expected, Object actual) + internal static void AssertObject(Model.Layers.Objects.Object expected, Model.Layers.Objects.Object actual) { // Attributes - AssertEqual(expected.ID, actual.ID, nameof(Object.ID)); - AssertEqual(expected.Name, actual.Name, nameof(Object.Name)); - AssertEqual(expected.Type, actual.Type, nameof(Object.Type)); - AssertEqual(expected.X, actual.X, nameof(Object.X)); - AssertEqual(expected.Y, actual.Y, nameof(Object.Y)); - AssertEqual(expected.Width, actual.Width, nameof(Object.Width)); - AssertEqual(expected.Height, actual.Height, nameof(Object.Height)); - AssertEqual(expected.Rotation, actual.Rotation, nameof(Object.Rotation)); - AssertEqual(expected.Visible, actual.Visible, nameof(Object.Visible)); - AssertEqual(expected.Template, actual.Template, nameof(Object.Template)); + AssertEqual(expected.ID, actual.ID, nameof(Model.Layers.Objects.Object.ID)); + AssertEqual(expected.Name, actual.Name, nameof(Model.Layers.Objects.Object.Name)); + AssertEqual(expected.Type, actual.Type, nameof(Model.Layers.Objects.Object.Type)); + AssertEqual(expected.X, actual.X, nameof(Model.Layers.Objects.Object.X)); + AssertEqual(expected.Y, actual.Y, nameof(Model.Layers.Objects.Object.Y)); + AssertEqual(expected.Width, actual.Width, nameof(Model.Layers.Objects.Object.Width)); + AssertEqual(expected.Height, actual.Height, nameof(Model.Layers.Objects.Object.Height)); + AssertEqual(expected.Rotation, actual.Rotation, nameof(Model.Layers.Objects.Object.Rotation)); + AssertEqual(expected.Visible, actual.Visible, nameof(Model.Layers.Objects.Object.Visible)); + AssertEqual(expected.Template, actual.Template, nameof(Model.Layers.Objects.Object.Template)); AssertProperties(expected.Properties, actual.Properties); diff --git a/src/DotTiled.Tests/Assert/AssertProperties.cs b/src/DotTiled.Tests/Assert/AssertProperties.cs index 740ba2b..ddd0e69 100644 --- a/src/DotTiled.Tests/Assert/AssertProperties.cs +++ b/src/DotTiled.Tests/Assert/AssertProperties.cs @@ -1,3 +1,5 @@ +using DotTiled.Model.Properties; + namespace DotTiled.Tests; public static partial class DotTiledAssert diff --git a/src/DotTiled.Tests/Assert/AssertTileset.cs b/src/DotTiled.Tests/Assert/AssertTileset.cs index e6b39bb..c0e5e8e 100644 --- a/src/DotTiled.Tests/Assert/AssertTileset.cs +++ b/src/DotTiled.Tests/Assert/AssertTileset.cs @@ -1,3 +1,6 @@ +using DotTiled.Model.Layers; +using DotTiled.Model.Tilesets; + namespace DotTiled.Tests; public static partial class DotTiledAssert diff --git a/src/DotTiled.Tests/Serialization/TestData.cs b/src/DotTiled.Tests/Serialization/TestData.cs index c3d52f8..467e1df 100644 --- a/src/DotTiled.Tests/Serialization/TestData.cs +++ b/src/DotTiled.Tests/Serialization/TestData.cs @@ -1,4 +1,6 @@ using System.Xml; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs b/src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs index eff73d9..c445069 100644 --- a/src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs +++ b/src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs @@ -1,3 +1,6 @@ +using DotTiled.Model; +using DotTiled.Model.Layers; + namespace DotTiled.Tests; public partial class TestData diff --git a/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.cs b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.cs index 24651b6..e1aecda 100644 --- a/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.cs +++ b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.cs @@ -1,4 +1,8 @@ using System.Globalization; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Tilesets; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.cs b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.cs index 9aaa7d7..7e21c54 100644 --- a/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.cs +++ b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.cs @@ -1,4 +1,7 @@ using System.Globalization; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Tilesets; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.cs b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.cs index 8c3283e..7b4de68 100644 --- a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.cs +++ b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.cs @@ -1,4 +1,7 @@ using System.Globalization; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.cs b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.cs index 1343f62..47a6b6b 100644 --- a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.cs +++ b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.cs @@ -1,4 +1,8 @@ using System.Globalization; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.cs b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.cs index fb3c95f..0673cf6 100644 --- a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.cs +++ b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.cs @@ -1,4 +1,7 @@ using System.Globalization; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Tilesets; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.cs b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.cs index 10c4d67..efea5c0 100644 --- a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.cs +++ b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.cs @@ -1,4 +1,7 @@ using System.Globalization; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Tilesets; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.cs b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.cs index 4e181c4..d2f1813 100644 --- a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.cs +++ b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.cs @@ -1,4 +1,7 @@ using System.Globalization; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Tilesets; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.cs b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.cs index 2ef98d0..2b09178 100644 --- a/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.cs +++ b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.cs @@ -1,4 +1,9 @@ using System.Numerics; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Layers.Objects; +using DotTiled.Model.Properties; +using DotTiled.Model.Tilesets; namespace DotTiled.Tests; diff --git a/src/DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs b/src/DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs index 670fdf6..c862203 100644 --- a/src/DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs +++ b/src/DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs @@ -1,3 +1,8 @@ +using DotTiled.Model; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; +using DotTiled.Serialization.Tmj; + namespace DotTiled.Tests; public partial class TmjMapReaderTests diff --git a/src/DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs b/src/DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs index a99ee9a..ab48769 100644 --- a/src/DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs +++ b/src/DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs @@ -1,4 +1,8 @@ using System.Xml; +using DotTiled.Model; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; +using DotTiled.Serialization.Tmx; namespace DotTiled.Tests; diff --git a/src/DotTiled/Model/Color.cs b/src/DotTiled/Model/Color.cs index ae74d0d..4700e0c 100644 --- a/src/DotTiled/Model/Color.cs +++ b/src/DotTiled/Model/Color.cs @@ -2,7 +2,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Globalization; -namespace DotTiled; +namespace DotTiled.Model; public class Color : IParsable, IEquatable { diff --git a/src/DotTiled/Model/Layers/BaseLayer.cs b/src/DotTiled/Model/Layers/BaseLayer.cs index 0f10a95..adeee69 100644 --- a/src/DotTiled/Model/Layers/BaseLayer.cs +++ b/src/DotTiled/Model/Layers/BaseLayer.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; +using DotTiled.Model.Properties; -namespace DotTiled; +namespace DotTiled.Model.Layers; public abstract class BaseLayer { diff --git a/src/DotTiled/Model/Layers/Data.cs b/src/DotTiled/Model/Layers/Data.cs index 0785cec..2d54020 100644 --- a/src/DotTiled/Model/Layers/Data.cs +++ b/src/DotTiled/Model/Layers/Data.cs @@ -1,6 +1,6 @@ using System; -namespace DotTiled; +namespace DotTiled.Model.Layers; public enum DataEncoding { diff --git a/src/DotTiled/Model/Layers/Group.cs b/src/DotTiled/Model/Layers/Group.cs index f58a83c..fd89f61 100644 --- a/src/DotTiled/Model/Layers/Group.cs +++ b/src/DotTiled/Model/Layers/Group.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DotTiled; +namespace DotTiled.Model.Layers; public class Group : BaseLayer { diff --git a/src/DotTiled/Model/Layers/ImageLayer.cs b/src/DotTiled/Model/Layers/ImageLayer.cs index a140b0d..cd35a41 100644 --- a/src/DotTiled/Model/Layers/ImageLayer.cs +++ b/src/DotTiled/Model/Layers/ImageLayer.cs @@ -1,4 +1,6 @@ -namespace DotTiled; +using DotTiled.Model.Tilesets; + +namespace DotTiled.Model.Layers; public class ImageLayer : BaseLayer { diff --git a/src/DotTiled/Model/Layers/ObjectLayer.cs b/src/DotTiled/Model/Layers/ObjectLayer.cs index ca3be60..817e95e 100644 --- a/src/DotTiled/Model/Layers/ObjectLayer.cs +++ b/src/DotTiled/Model/Layers/ObjectLayer.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; +using DotTiled.Model.Layers.Objects; -namespace DotTiled; +namespace DotTiled.Model.Layers; public enum DrawOrder { diff --git a/src/DotTiled/Model/Layers/Objects/EllipseObject.cs b/src/DotTiled/Model/Layers/Objects/EllipseObject.cs index a4c2297..fe57573 100644 --- a/src/DotTiled/Model/Layers/Objects/EllipseObject.cs +++ b/src/DotTiled/Model/Layers/Objects/EllipseObject.cs @@ -1,3 +1,3 @@ -namespace DotTiled; +namespace DotTiled.Model.Layers.Objects; public class EllipseObject : Object { } diff --git a/src/DotTiled/Model/Layers/Objects/Object.cs b/src/DotTiled/Model/Layers/Objects/Object.cs index 765de69..82254e5 100644 --- a/src/DotTiled/Model/Layers/Objects/Object.cs +++ b/src/DotTiled/Model/Layers/Objects/Object.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; +using DotTiled.Model.Properties; -namespace DotTiled; +namespace DotTiled.Model.Layers.Objects; public abstract class Object { diff --git a/src/DotTiled/Model/Layers/Objects/PointObject.cs b/src/DotTiled/Model/Layers/Objects/PointObject.cs index 7dc8d14..f2949a2 100644 --- a/src/DotTiled/Model/Layers/Objects/PointObject.cs +++ b/src/DotTiled/Model/Layers/Objects/PointObject.cs @@ -1,3 +1,3 @@ -namespace DotTiled; +namespace DotTiled.Model.Layers.Objects; public class PointObject : Object { } diff --git a/src/DotTiled/Model/Layers/Objects/PolygonObject.cs b/src/DotTiled/Model/Layers/Objects/PolygonObject.cs index 073f317..57e3f06 100644 --- a/src/DotTiled/Model/Layers/Objects/PolygonObject.cs +++ b/src/DotTiled/Model/Layers/Objects/PolygonObject.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Numerics; -namespace DotTiled; +namespace DotTiled.Model.Layers.Objects; public class PolygonObject : Object { diff --git a/src/DotTiled/Model/Layers/Objects/PolylineObject.cs b/src/DotTiled/Model/Layers/Objects/PolylineObject.cs index 9b1a90d..03cd6b4 100644 --- a/src/DotTiled/Model/Layers/Objects/PolylineObject.cs +++ b/src/DotTiled/Model/Layers/Objects/PolylineObject.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Numerics; -namespace DotTiled; +namespace DotTiled.Model.Layers.Objects; public class PolylineObject : Object { diff --git a/src/DotTiled/Model/Layers/Objects/RectangleObject.cs b/src/DotTiled/Model/Layers/Objects/RectangleObject.cs index 27a3753..ff64a76 100644 --- a/src/DotTiled/Model/Layers/Objects/RectangleObject.cs +++ b/src/DotTiled/Model/Layers/Objects/RectangleObject.cs @@ -1,3 +1,3 @@ -namespace DotTiled; +namespace DotTiled.Model.Layers.Objects; public class RectangleObject : Object { } diff --git a/src/DotTiled/Model/Layers/Objects/TextObject.cs b/src/DotTiled/Model/Layers/Objects/TextObject.cs index b41906a..f39f84a 100644 --- a/src/DotTiled/Model/Layers/Objects/TextObject.cs +++ b/src/DotTiled/Model/Layers/Objects/TextObject.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace DotTiled; +namespace DotTiled.Model.Layers.Objects; public enum TextHorizontalAlignment diff --git a/src/DotTiled/Model/Layers/Objects/TileObject.cs b/src/DotTiled/Model/Layers/Objects/TileObject.cs index c066780..992ac3c 100644 --- a/src/DotTiled/Model/Layers/Objects/TileObject.cs +++ b/src/DotTiled/Model/Layers/Objects/TileObject.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Layers.Objects; public class TileObject : Object { diff --git a/src/DotTiled/Model/Layers/TileLayer.cs b/src/DotTiled/Model/Layers/TileLayer.cs index 7692266..9002397 100644 --- a/src/DotTiled/Model/Layers/TileLayer.cs +++ b/src/DotTiled/Model/Layers/TileLayer.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Layers; public class TileLayer : BaseLayer { diff --git a/src/DotTiled/Model/Map.cs b/src/DotTiled/Model/Map.cs index fdcdbd1..3102567 100644 --- a/src/DotTiled/Model/Map.cs +++ b/src/DotTiled/Model/Map.cs @@ -1,7 +1,10 @@ using System.Collections.Generic; using System.Globalization; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Model; public enum MapOrientation { diff --git a/src/DotTiled/Model/Properties/BoolProperty.cs b/src/DotTiled/Model/Properties/BoolProperty.cs index 949858f..6360a3a 100644 --- a/src/DotTiled/Model/Properties/BoolProperty.cs +++ b/src/DotTiled/Model/Properties/BoolProperty.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties; public class BoolProperty : IProperty { diff --git a/src/DotTiled/Model/Properties/ClassProperty.cs b/src/DotTiled/Model/Properties/ClassProperty.cs index 0b1391d..e46389f 100644 --- a/src/DotTiled/Model/Properties/ClassProperty.cs +++ b/src/DotTiled/Model/Properties/ClassProperty.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.Linq; -namespace DotTiled; +namespace DotTiled.Model.Properties; public class ClassProperty : IProperty { public required string Name { get; set; } - public PropertyType Type => DotTiled.PropertyType.Class; + public PropertyType Type => Model.Properties.PropertyType.Class; public required string PropertyType { get; set; } public required Dictionary Properties { get; set; } diff --git a/src/DotTiled/Model/Properties/ColorProperty.cs b/src/DotTiled/Model/Properties/ColorProperty.cs index 07ca25e..06d8fc1 100644 --- a/src/DotTiled/Model/Properties/ColorProperty.cs +++ b/src/DotTiled/Model/Properties/ColorProperty.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties; public class ColorProperty : IProperty { diff --git a/src/DotTiled/Model/Properties/CustomTypes/CustomClassDefinition.cs b/src/DotTiled/Model/Properties/CustomTypes/CustomClassDefinition.cs index ec92b3f..c080e2a 100644 --- a/src/DotTiled/Model/Properties/CustomTypes/CustomClassDefinition.cs +++ b/src/DotTiled/Model/Properties/CustomTypes/CustomClassDefinition.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace DotTiled; +namespace DotTiled.Model.Properties.CustomTypes; [Flags] public enum CustomClassUseAs diff --git a/src/DotTiled/Model/Properties/CustomTypes/CustomEnumDefinition.cs b/src/DotTiled/Model/Properties/CustomTypes/CustomEnumDefinition.cs index d570442..9d15b7d 100644 --- a/src/DotTiled/Model/Properties/CustomTypes/CustomEnumDefinition.cs +++ b/src/DotTiled/Model/Properties/CustomTypes/CustomEnumDefinition.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace DotTiled; +namespace DotTiled.Model.Properties.CustomTypes; public enum CustomEnumStorageType { diff --git a/src/DotTiled/Model/Properties/CustomTypes/CustomTypeDefinition.cs b/src/DotTiled/Model/Properties/CustomTypes/CustomTypeDefinition.cs index 1f50462..f535215 100644 --- a/src/DotTiled/Model/Properties/CustomTypes/CustomTypeDefinition.cs +++ b/src/DotTiled/Model/Properties/CustomTypes/CustomTypeDefinition.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties.CustomTypes; public abstract class CustomTypeDefinition { diff --git a/src/DotTiled/Model/Properties/FileProperty.cs b/src/DotTiled/Model/Properties/FileProperty.cs index edc939c..42b9d15 100644 --- a/src/DotTiled/Model/Properties/FileProperty.cs +++ b/src/DotTiled/Model/Properties/FileProperty.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties; public class FileProperty : IProperty { diff --git a/src/DotTiled/Model/Properties/FloatProperty.cs b/src/DotTiled/Model/Properties/FloatProperty.cs index 469cc45..ccb18ae 100644 --- a/src/DotTiled/Model/Properties/FloatProperty.cs +++ b/src/DotTiled/Model/Properties/FloatProperty.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties; public class FloatProperty : IProperty { diff --git a/src/DotTiled/Model/Properties/IProperty.cs b/src/DotTiled/Model/Properties/IProperty.cs index f4294cd..0414c3c 100644 --- a/src/DotTiled/Model/Properties/IProperty.cs +++ b/src/DotTiled/Model/Properties/IProperty.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties; public interface IProperty { diff --git a/src/DotTiled/Model/Properties/IntProperty.cs b/src/DotTiled/Model/Properties/IntProperty.cs index b8fb02a..cfaf7d0 100644 --- a/src/DotTiled/Model/Properties/IntProperty.cs +++ b/src/DotTiled/Model/Properties/IntProperty.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties; public class IntProperty : IProperty { diff --git a/src/DotTiled/Model/Properties/ObjectProperty.cs b/src/DotTiled/Model/Properties/ObjectProperty.cs index 1591319..5f37607 100644 --- a/src/DotTiled/Model/Properties/ObjectProperty.cs +++ b/src/DotTiled/Model/Properties/ObjectProperty.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties; public class ObjectProperty : IProperty { diff --git a/src/DotTiled/Model/Properties/PropertyType.cs b/src/DotTiled/Model/Properties/PropertyType.cs index 79b05cb..bb01960 100644 --- a/src/DotTiled/Model/Properties/PropertyType.cs +++ b/src/DotTiled/Model/Properties/PropertyType.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties; public enum PropertyType { diff --git a/src/DotTiled/Model/Properties/StringProperty.cs b/src/DotTiled/Model/Properties/StringProperty.cs index 655b7b4..9842ca4 100644 --- a/src/DotTiled/Model/Properties/StringProperty.cs +++ b/src/DotTiled/Model/Properties/StringProperty.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Properties; public class StringProperty : IProperty { diff --git a/src/DotTiled/Model/Template.cs b/src/DotTiled/Model/Template.cs index 11ae128..834f8d8 100644 --- a/src/DotTiled/Model/Template.cs +++ b/src/DotTiled/Model/Template.cs @@ -1,4 +1,7 @@ -namespace DotTiled; +using DotTiled.Model.Layers.Objects; +using DotTiled.Model.Tilesets; + +namespace DotTiled.Model; public class Template { diff --git a/src/DotTiled/Model/Tileset/Frame.cs b/src/DotTiled/Model/Tilesets/Frame.cs similarity index 78% rename from src/DotTiled/Model/Tileset/Frame.cs rename to src/DotTiled/Model/Tilesets/Frame.cs index 9c308fe..8762423 100644 --- a/src/DotTiled/Model/Tileset/Frame.cs +++ b/src/DotTiled/Model/Tilesets/Frame.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public class Frame { diff --git a/src/DotTiled/Model/Tileset/Grid.cs b/src/DotTiled/Model/Tilesets/Grid.cs similarity index 88% rename from src/DotTiled/Model/Tileset/Grid.cs rename to src/DotTiled/Model/Tilesets/Grid.cs index 027e36b..81d5e06 100644 --- a/src/DotTiled/Model/Tileset/Grid.cs +++ b/src/DotTiled/Model/Tilesets/Grid.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public enum GridOrientation { diff --git a/src/DotTiled/Model/Tileset/Image.cs b/src/DotTiled/Model/Tilesets/Image.cs similarity index 89% rename from src/DotTiled/Model/Tileset/Image.cs rename to src/DotTiled/Model/Tilesets/Image.cs index bd64838..e5ea154 100644 --- a/src/DotTiled/Model/Tileset/Image.cs +++ b/src/DotTiled/Model/Tilesets/Image.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public enum ImageFormat { diff --git a/src/DotTiled/Model/Tileset/Tile.cs b/src/DotTiled/Model/Tilesets/Tile.cs similarity index 85% rename from src/DotTiled/Model/Tileset/Tile.cs rename to src/DotTiled/Model/Tilesets/Tile.cs index f6b40ff..55669ee 100644 --- a/src/DotTiled/Model/Tileset/Tile.cs +++ b/src/DotTiled/Model/Tilesets/Tile.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public class Tile { diff --git a/src/DotTiled/Model/Tileset/TileOffset.cs b/src/DotTiled/Model/Tilesets/TileOffset.cs similarity index 77% rename from src/DotTiled/Model/Tileset/TileOffset.cs rename to src/DotTiled/Model/Tilesets/TileOffset.cs index fdd0506..cbe9111 100644 --- a/src/DotTiled/Model/Tileset/TileOffset.cs +++ b/src/DotTiled/Model/Tilesets/TileOffset.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public class TileOffset { diff --git a/src/DotTiled/Model/Tileset/Tileset.cs b/src/DotTiled/Model/Tilesets/Tileset.cs similarity index 95% rename from src/DotTiled/Model/Tileset/Tileset.cs rename to src/DotTiled/Model/Tilesets/Tileset.cs index 7b1a982..15bd56b 100644 --- a/src/DotTiled/Model/Tileset/Tileset.cs +++ b/src/DotTiled/Model/Tilesets/Tileset.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; +using DotTiled.Model.Properties; -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public enum ObjectAlignment { diff --git a/src/DotTiled/Model/Tileset/Transformations.cs b/src/DotTiled/Model/Tilesets/Transformations.cs similarity index 87% rename from src/DotTiled/Model/Tileset/Transformations.cs rename to src/DotTiled/Model/Tilesets/Transformations.cs index 86ef359..83187a7 100644 --- a/src/DotTiled/Model/Tileset/Transformations.cs +++ b/src/DotTiled/Model/Tilesets/Transformations.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public class Transformations { diff --git a/src/DotTiled/Model/Tileset/WangColor.cs b/src/DotTiled/Model/Tilesets/WangColor.cs similarity index 84% rename from src/DotTiled/Model/Tileset/WangColor.cs rename to src/DotTiled/Model/Tilesets/WangColor.cs index 9ac751c..c13b0da 100644 --- a/src/DotTiled/Model/Tileset/WangColor.cs +++ b/src/DotTiled/Model/Tilesets/WangColor.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; +using DotTiled.Model.Properties; -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public class WangColor { diff --git a/src/DotTiled/Model/Tileset/WangTile.cs b/src/DotTiled/Model/Tilesets/WangTile.cs similarity index 79% rename from src/DotTiled/Model/Tileset/WangTile.cs rename to src/DotTiled/Model/Tilesets/WangTile.cs index 7fad06f..488a12a 100644 --- a/src/DotTiled/Model/Tileset/WangTile.cs +++ b/src/DotTiled/Model/Tilesets/WangTile.cs @@ -1,4 +1,4 @@ -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public class WangTile { diff --git a/src/DotTiled/Model/Tileset/Wangset.cs b/src/DotTiled/Model/Tilesets/Wangset.cs similarity index 87% rename from src/DotTiled/Model/Tileset/Wangset.cs rename to src/DotTiled/Model/Tilesets/Wangset.cs index 61f8496..6101347 100644 --- a/src/DotTiled/Model/Tileset/Wangset.cs +++ b/src/DotTiled/Model/Tilesets/Wangset.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; +using DotTiled.Model.Properties; -namespace DotTiled; +namespace DotTiled.Model.Tilesets; public class Wangset { diff --git a/src/DotTiled/Serialization/Helpers.cs b/src/DotTiled/Serialization/Helpers.cs index 2e36124..abfba09 100644 --- a/src/DotTiled/Serialization/Helpers.cs +++ b/src/DotTiled/Serialization/Helpers.cs @@ -3,8 +3,11 @@ using System.Collections.Generic; using System.IO; using System.IO.Compression; using System.Linq; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization; internal static partial class Helpers { diff --git a/src/DotTiled/Serialization/IMapReader.cs b/src/DotTiled/Serialization/IMapReader.cs index 97c1fd7..a1e8b05 100644 --- a/src/DotTiled/Serialization/IMapReader.cs +++ b/src/DotTiled/Serialization/IMapReader.cs @@ -1,6 +1,7 @@ using System; +using DotTiled.Model; -namespace DotTiled; +namespace DotTiled.Serialization; public interface IMapReader : IDisposable { diff --git a/src/DotTiled/Serialization/ITemplateReader.cs b/src/DotTiled/Serialization/ITemplateReader.cs index 8de77bc..45832fa 100644 --- a/src/DotTiled/Serialization/ITemplateReader.cs +++ b/src/DotTiled/Serialization/ITemplateReader.cs @@ -1,6 +1,7 @@ using System; +using DotTiled.Model; -namespace DotTiled; +namespace DotTiled.Serialization; public interface ITemplateReader : IDisposable { diff --git a/src/DotTiled/Serialization/ITilesetReader.cs b/src/DotTiled/Serialization/ITilesetReader.cs index 37f5257..fa4a94c 100644 --- a/src/DotTiled/Serialization/ITilesetReader.cs +++ b/src/DotTiled/Serialization/ITilesetReader.cs @@ -1,6 +1,7 @@ using System; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization; public interface ITilesetReader : IDisposable { diff --git a/src/DotTiled/Serialization/Tmj/ExtensionsJsonElement.cs b/src/DotTiled/Serialization/Tmj/ExtensionsJsonElement.cs index 7462c56..0e76d84 100644 --- a/src/DotTiled/Serialization/Tmj/ExtensionsJsonElement.cs +++ b/src/DotTiled/Serialization/Tmj/ExtensionsJsonElement.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text.Json; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal static class ExtensionsJsonElement { diff --git a/src/DotTiled/Serialization/Tmj/TjTemplateReader.cs b/src/DotTiled/Serialization/Tmj/TjTemplateReader.cs index 0dc1dd8..69747bb 100644 --- a/src/DotTiled/Serialization/Tmj/TjTemplateReader.cs +++ b/src/DotTiled/Serialization/Tmj/TjTemplateReader.cs @@ -1,7 +1,10 @@ using System; using System.Collections.Generic; +using DotTiled.Model; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; public class TjTemplateReader : ITemplateReader { diff --git a/src/DotTiled/Serialization/Tmj/Tmj.Data.cs b/src/DotTiled/Serialization/Tmj/Tmj.Data.cs index 0b05c01..ac3d30b 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.Data.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.Data.cs @@ -5,8 +5,9 @@ using System.IO; using System.IO.Compression; using System.Linq; using System.Text.Json; +using DotTiled.Model.Layers; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { diff --git a/src/DotTiled/Serialization/Tmj/Tmj.Group.cs b/src/DotTiled/Serialization/Tmj/Tmj.Group.cs index 44e8b4d..159d892 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.Group.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.Group.cs @@ -3,8 +3,12 @@ using System.Collections.Generic; using System.Globalization; using System.Numerics; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { diff --git a/src/DotTiled/Serialization/Tmj/Tmj.ImageLayer.cs b/src/DotTiled/Serialization/Tmj/Tmj.ImageLayer.cs index dbd75a1..e3d6112 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.ImageLayer.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.ImageLayer.cs @@ -3,8 +3,13 @@ using System.Collections.Generic; using System.Globalization; using System.Numerics; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { diff --git a/src/DotTiled/Serialization/Tmj/Tmj.Layer.cs b/src/DotTiled/Serialization/Tmj/Tmj.Layer.cs index f14d614..d81ce17 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.Layer.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.Layer.cs @@ -3,8 +3,11 @@ using System.Collections.Generic; using System.Globalization; using System.Numerics; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties.CustomTypes; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { diff --git a/src/DotTiled/Serialization/Tmj/Tmj.Map.cs b/src/DotTiled/Serialization/Tmj/Tmj.Map.cs index ea7313f..e27dfed 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.Map.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.Map.cs @@ -4,8 +4,13 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { diff --git a/src/DotTiled/Serialization/Tmj/Tmj.ObjectLayer.cs b/src/DotTiled/Serialization/Tmj/Tmj.ObjectLayer.cs index 564f2db..0662fc9 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.ObjectLayer.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.ObjectLayer.cs @@ -3,15 +3,20 @@ using System.Collections.Generic; using System.Globalization; using System.Numerics; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Layers.Objects; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { internal static ObjectLayer ReadObjectLayer( JsonElement element, Func externalTemplateResolver, - IReadOnlyCollection customTypeDefinitions) + IReadOnlyCollection customTypeDefinitions) { var id = element.GetRequiredProperty("id"); var name = element.GetRequiredProperty("name"); @@ -37,7 +42,7 @@ internal partial class Tmj _ => throw new JsonException($"Unknown draw order '{s}'.") }, DrawOrder.TopDown); - var objects = element.GetOptionalPropertyCustom>("objects", e => e.GetValueAsList(el => ReadObject(el, externalTemplateResolver, customTypeDefinitions)), []); + var objects = element.GetOptionalPropertyCustom>("objects", e => e.GetValueAsList(el => ReadObject(el, externalTemplateResolver, customTypeDefinitions)), []); return new ObjectLayer { @@ -62,7 +67,7 @@ internal partial class Tmj }; } - internal static Object ReadObject( + internal static Model.Layers.Objects.Object ReadObject( JsonElement element, Func externalTemplateResolver, IReadOnlyCollection customTypeDefinitions) diff --git a/src/DotTiled/Serialization/Tmj/Tmj.Properties.cs b/src/DotTiled/Serialization/Tmj/Tmj.Properties.cs index 6981521..1ef4944 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.Properties.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.Properties.cs @@ -3,8 +3,11 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { diff --git a/src/DotTiled/Serialization/Tmj/Tmj.Template.cs b/src/DotTiled/Serialization/Tmj/Tmj.Template.cs index 79c7860..65d6f87 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.Template.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.Template.cs @@ -3,8 +3,11 @@ using System.Collections.Generic; using System.Globalization; using System.Numerics; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { @@ -16,7 +19,7 @@ internal partial class Tmj { var type = element.GetRequiredProperty("type"); var tileset = element.GetOptionalPropertyCustom("tileset", el => ReadTileset(el, externalTilesetResolver, externalTemplateResolver, customTypeDefinitions), null); - var @object = element.GetRequiredPropertyCustom("object", el => ReadObject(el, externalTemplateResolver, customTypeDefinitions)); + var @object = element.GetRequiredPropertyCustom("object", el => ReadObject(el, externalTemplateResolver, customTypeDefinitions)); return new Template { diff --git a/src/DotTiled/Serialization/Tmj/Tmj.TileLayer.cs b/src/DotTiled/Serialization/Tmj/Tmj.TileLayer.cs index 5528177..d2fd53d 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.TileLayer.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.TileLayer.cs @@ -3,12 +3,15 @@ using System.Collections.Generic; using System.Globalization; using System.Numerics; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { - internal static TileLayer ReadTileLayer( JsonElement element, IReadOnlyCollection customTypeDefinitions) diff --git a/src/DotTiled/Serialization/Tmj/Tmj.Tileset.cs b/src/DotTiled/Serialization/Tmj/Tmj.Tileset.cs index d455b42..8b206c9 100644 --- a/src/DotTiled/Serialization/Tmj/Tmj.Tileset.cs +++ b/src/DotTiled/Serialization/Tmj/Tmj.Tileset.cs @@ -5,8 +5,13 @@ using System.IO; using System.IO.Compression; using System.Linq; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; internal partial class Tmj { diff --git a/src/DotTiled/Serialization/Tmj/Tmj.Wangset.cs b/src/DotTiled/Serialization/Tmj/Tmj.Wangset.cs deleted file mode 100644 index cf9f024..0000000 --- a/src/DotTiled/Serialization/Tmj/Tmj.Wangset.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.IO.Compression; -using System.Linq; -using System.Text.Json; - -namespace DotTiled; - -internal partial class Tmj -{ -} diff --git a/src/DotTiled/Serialization/Tmj/TmjMapReader.cs b/src/DotTiled/Serialization/Tmj/TmjMapReader.cs index 260cd21..3eb1df0 100644 --- a/src/DotTiled/Serialization/Tmj/TmjMapReader.cs +++ b/src/DotTiled/Serialization/Tmj/TmjMapReader.cs @@ -3,8 +3,11 @@ using System.Collections.Generic; using System.IO; using System.Text; using System.Text.Json; +using DotTiled.Model; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; public class TmjMapReader : IMapReader { diff --git a/src/DotTiled/Serialization/Tmj/TsjTilesetReader.cs b/src/DotTiled/Serialization/Tmj/TsjTilesetReader.cs index 14e5323..a41adfe 100644 --- a/src/DotTiled/Serialization/Tmj/TsjTilesetReader.cs +++ b/src/DotTiled/Serialization/Tmj/TsjTilesetReader.cs @@ -1,7 +1,10 @@ using System; using System.Collections.Generic; +using DotTiled.Model; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmj; public class TsjTilesetReader : ITilesetReader { diff --git a/src/DotTiled/Serialization/Tmx/ExtensionsXmlReader.cs b/src/DotTiled/Serialization/Tmx/ExtensionsXmlReader.cs index 79ddb31..ca5f836 100644 --- a/src/DotTiled/Serialization/Tmx/ExtensionsXmlReader.cs +++ b/src/DotTiled/Serialization/Tmx/ExtensionsXmlReader.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Xml; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; internal static class ExtensionsXmlReader { diff --git a/src/DotTiled/Serialization/Tmx/Tmx.Chunk.cs b/src/DotTiled/Serialization/Tmx/Tmx.Chunk.cs index 9d06082..d0db01f 100644 --- a/src/DotTiled/Serialization/Tmx/Tmx.Chunk.cs +++ b/src/DotTiled/Serialization/Tmx/Tmx.Chunk.cs @@ -1,6 +1,7 @@ using System.Xml; +using DotTiled.Model.Layers; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; internal partial class Tmx { diff --git a/src/DotTiled/Serialization/Tmx/Tmx.Data.cs b/src/DotTiled/Serialization/Tmx/Tmx.Data.cs index 85598e0..5d55ba4 100644 --- a/src/DotTiled/Serialization/Tmx/Tmx.Data.cs +++ b/src/DotTiled/Serialization/Tmx/Tmx.Data.cs @@ -4,8 +4,9 @@ using System.IO; using System.IO.Compression; using System.Linq; using System.Xml; +using DotTiled.Model.Layers; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; internal partial class Tmx { diff --git a/src/DotTiled/Serialization/Tmx/Tmx.Map.cs b/src/DotTiled/Serialization/Tmx/Tmx.Map.cs index bb7f1ae..2152852 100644 --- a/src/DotTiled/Serialization/Tmx/Tmx.Map.cs +++ b/src/DotTiled/Serialization/Tmx/Tmx.Map.cs @@ -3,8 +3,13 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Xml; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; internal partial class Tmx { diff --git a/src/DotTiled/Serialization/Tmx/Tmx.ObjectLayer.cs b/src/DotTiled/Serialization/Tmx/Tmx.ObjectLayer.cs index 4d70b91..5f5bda0 100644 --- a/src/DotTiled/Serialization/Tmx/Tmx.ObjectLayer.cs +++ b/src/DotTiled/Serialization/Tmx/Tmx.ObjectLayer.cs @@ -4,8 +4,14 @@ using System.Globalization; using System.Linq; using System.Numerics; using System.Xml; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Layers.Objects; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; internal partial class Tmx { @@ -39,7 +45,7 @@ internal partial class Tmx // Elements Dictionary? properties = null; - List objects = []; + List objects = []; reader.ProcessChildren("objectgroup", (r, elementName) => elementName switch { @@ -71,14 +77,14 @@ internal partial class Tmx }; } - internal static Object ReadObject( + internal static Model.Layers.Objects.Object ReadObject( XmlReader reader, Func externalTemplateResolver, IReadOnlyCollection customTypeDefinitions) { // Attributes var template = reader.GetOptionalAttribute("template"); - Object? obj = null; + Model.Layers.Objects.Object? obj = null; if (template is not null) obj = externalTemplateResolver(template).Object; @@ -106,7 +112,7 @@ internal partial class Tmx var visible = reader.GetOptionalAttributeParseable("visible") ?? visibleDefault; // Elements - Object? foundObject = null; + Model.Layers.Objects.Object? foundObject = null; int propertiesCounter = 0; Dictionary? properties = propertiesDefault; @@ -144,7 +150,7 @@ internal partial class Tmx return OverrideObject(obj, foundObject); } - internal static Object OverrideObject(Object? obj, Object foundObject) + internal static Model.Layers.Objects.Object OverrideObject(Model.Layers.Objects.Object? obj, Model.Layers.Objects.Object foundObject) { if (obj is null) return foundObject; @@ -315,7 +321,7 @@ internal partial class Tmx Tileset? tileset = null; // Should contain exactly one of - Object? obj = null; + Model.Layers.Objects.Object? obj = null; reader.ProcessChildren("template", (r, elementName) => elementName switch { diff --git a/src/DotTiled/Serialization/Tmx/Tmx.Properties.cs b/src/DotTiled/Serialization/Tmx/Tmx.Properties.cs index 6ea65e5..7f62358 100644 --- a/src/DotTiled/Serialization/Tmx/Tmx.Properties.cs +++ b/src/DotTiled/Serialization/Tmx/Tmx.Properties.cs @@ -1,8 +1,11 @@ using System.Collections.Generic; using System.Linq; using System.Xml; +using DotTiled.Model; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; internal partial class Tmx { diff --git a/src/DotTiled/Serialization/Tmx/Tmx.TileLayer.cs b/src/DotTiled/Serialization/Tmx/Tmx.TileLayer.cs index 6fc64fb..41e720b 100644 --- a/src/DotTiled/Serialization/Tmx/Tmx.TileLayer.cs +++ b/src/DotTiled/Serialization/Tmx/Tmx.TileLayer.cs @@ -2,8 +2,13 @@ using System; using System.Collections.Generic; using System.Linq; using System.Xml; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; internal partial class Tmx { diff --git a/src/DotTiled/Serialization/Tmx/Tmx.Tileset.cs b/src/DotTiled/Serialization/Tmx/Tmx.Tileset.cs index 1912df2..5d8aac6 100644 --- a/src/DotTiled/Serialization/Tmx/Tmx.Tileset.cs +++ b/src/DotTiled/Serialization/Tmx/Tmx.Tileset.cs @@ -3,8 +3,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml; +using DotTiled.Model; +using DotTiled.Model.Layers; +using DotTiled.Model.Properties; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; internal partial class Tmx { diff --git a/src/DotTiled/Serialization/Tmx/TmxMapReader.cs b/src/DotTiled/Serialization/Tmx/TmxMapReader.cs index 02388bb..f9228b4 100644 --- a/src/DotTiled/Serialization/Tmx/TmxMapReader.cs +++ b/src/DotTiled/Serialization/Tmx/TmxMapReader.cs @@ -1,8 +1,11 @@ using System; using System.Collections.Generic; using System.Xml; +using DotTiled.Model; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; public class TmxMapReader : IMapReader { diff --git a/src/DotTiled/Serialization/Tmx/TsxTilesetReader.cs b/src/DotTiled/Serialization/Tmx/TsxTilesetReader.cs index dba516b..f7a1565 100644 --- a/src/DotTiled/Serialization/Tmx/TsxTilesetReader.cs +++ b/src/DotTiled/Serialization/Tmx/TsxTilesetReader.cs @@ -1,8 +1,11 @@ using System; using System.Collections.Generic; using System.Xml; +using DotTiled.Model; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; public class TsxTilesetReader : ITilesetReader { diff --git a/src/DotTiled/Serialization/Tmx/TxTemplateReader.cs b/src/DotTiled/Serialization/Tmx/TxTemplateReader.cs index eba6299..3fa6c69 100644 --- a/src/DotTiled/Serialization/Tmx/TxTemplateReader.cs +++ b/src/DotTiled/Serialization/Tmx/TxTemplateReader.cs @@ -1,8 +1,11 @@ using System; using System.Collections.Generic; using System.Xml; +using DotTiled.Model; +using DotTiled.Model.Properties.CustomTypes; +using DotTiled.Model.Tilesets; -namespace DotTiled; +namespace DotTiled.Serialization.Tmx; public class TxTemplateReader : ITemplateReader {