diff --git a/.editorconfig b/.editorconfig index 70cefcd..0c2a84a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,4 +5,11 @@ charset = utf-8 end_of_line = lf indent_size = 2 indent_style = space -insert_final_newline = true \ No newline at end of file +insert_final_newline = true + +[.github/**/*.yml] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml new file mode 100644 index 0000000..e83a26d --- /dev/null +++ b/.github/workflows/deploy-docs.yml @@ -0,0 +1,41 @@ +on: + push: + branches: + - master + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + actions: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + deploy-docs: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + - name: Setup DocFX + run: dotnet tool update -g docfx + - name: Build docs + run: make docs-build + - name: Upload docs + uses: actions/upload-pages-artifact@v3 + with: + path: docs/_site + - name: Deploy docs + id: deployment + uses: actions/deploy-pages@v4 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 90c7e5a..3e0d43b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,7 +5,7 @@ on: - dev jobs: - build: + tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -14,9 +14,9 @@ jobs: with: dotnet-version: 8.0.x - name: Restore dependencies - run: dotnet restore + run: dotnet restore src/DotTiled.sln - name: Build - run: dotnet build --no-restore + run: dotnet build --no-restore src/DotTiled.sln - name: Test - run: dotnet test --no-build --verbosity normal + run: dotnet test --no-build --verbosity normal src/DotTiled.sln \ No newline at end of file diff --git a/.gitignore b/.gitignore index aa2d18e..a2b8d83 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,11 @@ ## ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore +# Generated docs +docs/_site/ +docs/api/ +docs/index.md + # User-specific files *.rsuser *.suo diff --git a/DotTiled/Model/Layers/Objects/PointObject.cs b/DotTiled/Model/Layers/Objects/PointObject.cs deleted file mode 100644 index 7dc8d14..0000000 --- a/DotTiled/Model/Layers/Objects/PointObject.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace DotTiled; - -public class PointObject : Object { } diff --git a/DotTiled/Serialization/Tmj/Tmj.Wangset.cs b/DotTiled/Serialization/Tmj/Tmj.Wangset.cs deleted file mode 100644 index cf9f024..0000000 --- a/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/FUNDING.yml b/FUNDING.yml deleted file mode 100644 index b34a804..0000000 --- a/FUNDING.yml +++ /dev/null @@ -1,15 +0,0 @@ -# These are supported funding model platforms - -github: [dcronqvist] -patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry -polar: # Replace with a single Polar username -buy_me_a_coffee: # Replace with a single Buy Me a Coffee username -thanks_dev: # Replace with a single thanks.dev username -custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/Makefile b/Makefile index e7dc7a5..66cf561 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,12 @@ test: - dotnet test + dotnet test src/DotTiled.sln + +docs-serve: docs-build + docfx docs/docfx.json --serve + +docs-build: + cp README.md docs/index.md + docfx docs/docfx.json BENCHMARK_SOURCES = DotTiled.Benchmark/Program.cs DotTiled.Benchmark/DotTiled.Benchmark.csproj BENCHMARK_OUTPUTDIR = DotTiled.Benchmark/BenchmarkDotNet.Artifacts diff --git a/README.md b/README.md index 27ee68c..48772d1 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,7 @@ DotTiled is designed to be a lightweight and efficient library that provides a s - [Alternative libraries and comparison + benchmarks](#alternative-libraries-and-comparison) - [Feature coverage comparison](#feature-coverage-comparison) -- [Quickstart](#quickstart) - - [Installing DotTiled](#installing-dottiled) +- [Installing DotTiled](#installing-dottiled) # Alternative libraries and comparison @@ -74,9 +73,7 @@ Below is a comparison of the feature coverage of DotTiled and other similar libr > [!NOTE] > ✅ Full support. ⚠️ Partial support, see respective library for details about supported features. ❌ No support. -# Quickstart - -### Installing DotTiled +# Installing DotTiled DotTiled is available as a NuGet package. You can install it by using the NuGet Package Manager UI in Visual Studio, or equivalent, or using the following command for the .NET CLI: diff --git a/docs/docfx.json b/docs/docfx.json new file mode 100644 index 0000000..fa6feed --- /dev/null +++ b/docs/docfx.json @@ -0,0 +1,46 @@ +{ + "metadata": [ + { + "src": [ + { + "src": "../src", + "files": [ + "DotTiled/DotTiled.csproj" + ] + } + ], + "dest": "api" + } + ], + "build": { + "content": [ + { + "files": [ + "**/*.{md,yml}" + ], + "exclude": [ + "_site/**" + ] + } + ], + "resource": [ + { + "files": [ + "images/**" + ] + } + ], + "output": "_site", + "template": [ + "default", + "modern", + "template" + ], + "globalMetadata": { + "_appName": "DotTiled", + "_appTitle": "DotTiled", + "_enableSearch": true, + "pdf": true + } + } +} \ No newline at end of file diff --git a/docs/docs/loading-a-map.md b/docs/docs/loading-a-map.md new file mode 100644 index 0000000..9a7dc64 --- /dev/null +++ b/docs/docs/loading-a-map.md @@ -0,0 +1 @@ +# Loading a map \ No newline at end of file diff --git a/docs/docs/quickstart.md b/docs/docs/quickstart.md new file mode 100644 index 0000000..1d2e852 --- /dev/null +++ b/docs/docs/quickstart.md @@ -0,0 +1 @@ +# Quick Start \ No newline at end of file diff --git a/docs/docs/toc.yml b/docs/docs/toc.yml new file mode 100644 index 0000000..13cc1f7 --- /dev/null +++ b/docs/docs/toc.yml @@ -0,0 +1,6 @@ +- name: Introduction +- href: ../index.md +- href: quickstart.md + +- name: Essentials +- href: loading-a-map.md \ No newline at end of file diff --git a/docs/template/public/main.css b/docs/template/public/main.css new file mode 100644 index 0000000..a8f7612 --- /dev/null +++ b/docs/template/public/main.css @@ -0,0 +1,4 @@ +body { + --bs-link-color-rgb: 66, 184, 131 !important; + --bs-link-hover-color-rgb: 64, 180, 128 !important; +} \ No newline at end of file diff --git a/docs/toc.yml b/docs/toc.yml new file mode 100644 index 0000000..6da36ae --- /dev/null +++ b/docs/toc.yml @@ -0,0 +1,4 @@ +- name: Docs + href: docs/ +- name: API + href: api/ \ No newline at end of file diff --git a/DotTiled.Benchmark/DotTiled.Benchmark.csproj b/src/DotTiled.Benchmark/DotTiled.Benchmark.csproj similarity index 100% rename from DotTiled.Benchmark/DotTiled.Benchmark.csproj rename to src/DotTiled.Benchmark/DotTiled.Benchmark.csproj diff --git a/DotTiled.Benchmark/Program.cs b/src/DotTiled.Benchmark/Program.cs similarity index 87% rename from DotTiled.Benchmark/Program.cs rename to src/DotTiled.Benchmark/Program.cs index 2acbce2..e04c6b1 100644 --- a/DotTiled.Benchmark/Program.cs +++ b/src/DotTiled.Benchmark/Program.cs @@ -39,19 +39,19 @@ namespace MyBenchmarks [BenchmarkCategory("MapFromInMemoryTmxString")] [Benchmark(Baseline = true, Description = "DotTiled")] - public DotTiled.Map LoadWithDotTiledFromInMemoryTmxString() + public DotTiled.Model.Map LoadWithDotTiledFromInMemoryTmxString() { using var stringReader = new StringReader(_tmxContents); using var xmlReader = XmlReader.Create(stringReader); - using var mapReader = new DotTiled.TmxMapReader(xmlReader, _ => throw new Exception(), _ => throw new Exception(), []); + using var mapReader = new DotTiled.Serialization.Tmx.TmxMapReader(xmlReader, _ => throw new Exception(), _ => throw new Exception(), []); return mapReader.ReadMap(); } [BenchmarkCategory("MapFromInMemoryTmjString")] [Benchmark(Baseline = true, Description = "DotTiled")] - public DotTiled.Map LoadWithDotTiledFromInMemoryTmjString() + public DotTiled.Model.Map LoadWithDotTiledFromInMemoryTmjString() { - using var mapReader = new DotTiled.TmjMapReader(_tmjContents, _ => throw new Exception(), _ => throw new Exception(), []); + using var mapReader = new DotTiled.Serialization.Tmj.TmjMapReader(_tmjContents, _ => throw new Exception(), _ => throw new Exception(), []); return mapReader.ReadMap(); } diff --git a/DotTiled.Tests/Assert/AssertData.cs b/src/DotTiled.Tests/Assert/AssertData.cs similarity index 97% rename from DotTiled.Tests/Assert/AssertData.cs rename to src/DotTiled.Tests/Assert/AssertData.cs index 31ffff2..3c18ef9 100644 --- a/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/DotTiled.Tests/Assert/AssertImage.cs b/src/DotTiled.Tests/Assert/AssertImage.cs similarity index 95% rename from DotTiled.Tests/Assert/AssertImage.cs rename to src/DotTiled.Tests/Assert/AssertImage.cs index a674faa..613318b 100644 --- a/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/DotTiled.Tests/Assert/AssertLayer.cs b/src/DotTiled.Tests/Assert/AssertLayer.cs similarity index 98% rename from DotTiled.Tests/Assert/AssertLayer.cs rename to src/DotTiled.Tests/Assert/AssertLayer.cs index 5432d62..1cb9e36 100644 --- a/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/DotTiled.Tests/Assert/AssertMap.cs b/src/DotTiled.Tests/Assert/AssertMap.cs similarity index 99% rename from DotTiled.Tests/Assert/AssertMap.cs rename to src/DotTiled.Tests/Assert/AssertMap.cs index e9ad8be..6984b79 100644 --- a/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/DotTiled.Tests/Assert/AssertObject.cs b/src/DotTiled.Tests/Assert/AssertObject.cs similarity index 70% rename from DotTiled.Tests/Assert/AssertObject.cs rename to src/DotTiled.Tests/Assert/AssertObject.cs index 6c586bb..f234ed2 100644 --- a/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/DotTiled.Tests/Assert/AssertProperties.cs b/src/DotTiled.Tests/Assert/AssertProperties.cs similarity index 98% rename from DotTiled.Tests/Assert/AssertProperties.cs rename to src/DotTiled.Tests/Assert/AssertProperties.cs index 740ba2b..ddd0e69 100644 --- a/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/DotTiled.Tests/Assert/AssertTileset.cs b/src/DotTiled.Tests/Assert/AssertTileset.cs similarity index 99% rename from DotTiled.Tests/Assert/AssertTileset.cs rename to src/DotTiled.Tests/Assert/AssertTileset.cs index e6b39bb..c0e5e8e 100644 --- a/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/DotTiled.Tests/DotTiled.Tests.csproj b/src/DotTiled.Tests/DotTiled.Tests.csproj similarity index 100% rename from DotTiled.Tests/DotTiled.Tests.csproj rename to src/DotTiled.Tests/DotTiled.Tests.csproj diff --git a/DotTiled.Tests/Serialization/TestData.cs b/src/DotTiled.Tests/Serialization/TestData.cs similarity index 97% rename from DotTiled.Tests/Serialization/TestData.cs rename to src/DotTiled.Tests/Serialization/TestData.cs index c3d52f8..467e1df 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs b/src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs similarity index 96% rename from DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs rename to src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.cs index eff73d9..c445069 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.tmj b/src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.tmj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.tmj rename to src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.tmj diff --git a/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.tmx b/src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.tmx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.tmx rename to src/DotTiled.Tests/Serialization/TestData/Map/default-map/default-map.tmx diff --git a/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 similarity index 96% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.cs rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.cs index 24651b6..e1aecda 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.tmj b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.tmj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.tmj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.tmj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.tmx b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.tmx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.tmx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/map-external-tileset-multi.tmx diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/multi-tileset.tsj b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/multi-tileset.tsj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/multi-tileset.tsj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/multi-tileset.tsj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/multi-tileset.tsx b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/multi-tileset.tsx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/multi-tileset.tsx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/multi-tileset.tsx diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/tileset.png b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/tileset.png similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/tileset.png rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-multi/tileset.png diff --git a/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 similarity index 97% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.cs rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.cs index 9aaa7d7..7e21c54 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.tmj b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.tmj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.tmj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.tmj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.tmx b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.tmx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.tmx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/map-external-tileset-wangset.tmx diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/tileset.png b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/tileset.png similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/tileset.png rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/tileset.png diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/wangset-tileset.tsj b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/wangset-tileset.tsj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/wangset-tileset.tsj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/wangset-tileset.tsj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/wangset-tileset.tsx b/src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/wangset-tileset.tsx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/wangset-tileset.tsx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-external-tileset-wangset/wangset-tileset.tsx diff --git a/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 similarity index 96% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.cs rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.cs index 8c3283e..7b4de68 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.tmj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.tmj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.tmj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.tmj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.tmx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.tmx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.tmx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-common-props/map-with-common-props.tmx diff --git a/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 similarity index 96% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.cs rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.cs index 1343f62..47a6b6b 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.tmj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.tmj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.tmj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.tmj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.tmx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.tmx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.tmx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/map-with-custom-type-props.tmx diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/propertytypes.json b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/propertytypes.json similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/propertytypes.json rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-custom-type-props/propertytypes.json diff --git a/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 similarity index 96% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.cs rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.cs index fb3c95f..0673cf6 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.tmj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.tmj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.tmj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.tmj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.tmx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.tmx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.tmx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/map-with-embedded-tileset.tmx diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/tileset.png b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/tileset.png similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/tileset.png rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-embedded-tileset/tileset.png diff --git a/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 similarity index 96% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.cs rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.cs index 10c4d67..efea5c0 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.tmj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.tmj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.tmj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.tmj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.tmx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.tmx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.tmx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/map-with-external-tileset.tmx diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.png b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.png similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.png rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.png diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.tsj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.tsj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.tsj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.tsj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.tsx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.tsx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.tsx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-external-tileset/tileset.tsx diff --git a/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 similarity index 96% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.cs rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.cs index 4e181c4..d2f1813 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.tmj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.tmj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.tmj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.tmj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.tmx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.tmx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.tmx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/map-with-flippingflags.tmx diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.png b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.png similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.png rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.png diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.tsj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.tsj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.tsj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.tsj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.tsx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.tsx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.tsx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-flippingflags/tileset.tsx diff --git a/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 similarity index 97% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.cs rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.cs index 2ef98d0..2b09178 100644 --- a/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/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.tmj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.tmj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.tmj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.tmj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.tmx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.tmx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.tmx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/map-with-many-layers.tmx diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/poly.tj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/poly.tj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/poly.tj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/poly.tj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/poly.tx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/poly.tx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/poly.tx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/poly.tx diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.png b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.png similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.png rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.png diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.tsj b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.tsj similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.tsj rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.tsj diff --git a/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.tsx b/src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.tsx similarity index 100% rename from DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.tsx rename to src/DotTiled.Tests/Serialization/TestData/Map/map-with-many-layers/tileset.tsx diff --git a/DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs b/src/DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs similarity index 91% rename from DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs rename to src/DotTiled.Tests/Serialization/Tmj/TmjMapReaderTests.cs index 670fdf6..c862203 100644 --- a/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/DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs b/src/DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs similarity index 91% rename from DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs rename to src/DotTiled.Tests/Serialization/Tmx/TmxMapReaderTests.cs index a99ee9a..ab48769 100644 --- a/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/DotTiled.sln b/src/DotTiled.sln similarity index 100% rename from DotTiled.sln rename to src/DotTiled.sln diff --git a/DotTiled/DotTiled.csproj b/src/DotTiled/DotTiled.csproj similarity index 100% rename from DotTiled/DotTiled.csproj rename to src/DotTiled/DotTiled.csproj diff --git a/DotTiled/Model/Color.cs b/src/DotTiled/Model/Color.cs similarity index 98% rename from DotTiled/Model/Color.cs rename to src/DotTiled/Model/Color.cs index ae74d0d..4700e0c 100644 --- a/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/DotTiled/Model/Layers/BaseLayer.cs b/src/DotTiled/Model/Layers/BaseLayer.cs similarity index 90% rename from DotTiled/Model/Layers/BaseLayer.cs rename to src/DotTiled/Model/Layers/BaseLayer.cs index 0f10a95..adeee69 100644 --- a/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/DotTiled/Model/Layers/Data.cs b/src/DotTiled/Model/Layers/Data.cs similarity index 96% rename from DotTiled/Model/Layers/Data.cs rename to src/DotTiled/Model/Layers/Data.cs index 0785cec..2d54020 100644 --- a/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/DotTiled/Model/Layers/Group.cs b/src/DotTiled/Model/Layers/Group.cs similarity index 84% rename from DotTiled/Model/Layers/Group.cs rename to src/DotTiled/Model/Layers/Group.cs index f58a83c..fd89f61 100644 --- a/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/DotTiled/Model/Layers/ImageLayer.cs b/src/DotTiled/Model/Layers/ImageLayer.cs similarity index 80% rename from DotTiled/Model/Layers/ImageLayer.cs rename to src/DotTiled/Model/Layers/ImageLayer.cs index a140b0d..cd35a41 100644 --- a/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/DotTiled/Model/Layers/ObjectLayer.cs b/src/DotTiled/Model/Layers/ObjectLayer.cs similarity index 86% rename from DotTiled/Model/Layers/ObjectLayer.cs rename to src/DotTiled/Model/Layers/ObjectLayer.cs index ca3be60..817e95e 100644 --- a/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/DotTiled/Model/Layers/Objects/EllipseObject.cs b/src/DotTiled/Model/Layers/Objects/EllipseObject.cs similarity index 50% rename from DotTiled/Model/Layers/Objects/EllipseObject.cs rename to src/DotTiled/Model/Layers/Objects/EllipseObject.cs index a4c2297..fe57573 100644 --- a/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/DotTiled/Model/Layers/Objects/Object.cs b/src/DotTiled/Model/Layers/Objects/Object.cs similarity index 88% rename from DotTiled/Model/Layers/Objects/Object.cs rename to src/DotTiled/Model/Layers/Objects/Object.cs index 765de69..82254e5 100644 --- a/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 new file mode 100644 index 0000000..f2949a2 --- /dev/null +++ b/src/DotTiled/Model/Layers/Objects/PointObject.cs @@ -0,0 +1,3 @@ +namespace DotTiled.Model.Layers.Objects; + +public class PointObject : Object { } diff --git a/DotTiled/Model/Layers/Objects/PolygonObject.cs b/src/DotTiled/Model/Layers/Objects/PolygonObject.cs similarity index 80% rename from DotTiled/Model/Layers/Objects/PolygonObject.cs rename to src/DotTiled/Model/Layers/Objects/PolygonObject.cs index 073f317..57e3f06 100644 --- a/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/DotTiled/Model/Layers/Objects/PolylineObject.cs b/src/DotTiled/Model/Layers/Objects/PolylineObject.cs similarity index 80% rename from DotTiled/Model/Layers/Objects/PolylineObject.cs rename to src/DotTiled/Model/Layers/Objects/PolylineObject.cs index 9b1a90d..03cd6b4 100644 --- a/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/DotTiled/Model/Layers/Objects/RectangleObject.cs b/src/DotTiled/Model/Layers/Objects/RectangleObject.cs similarity index 51% rename from DotTiled/Model/Layers/Objects/RectangleObject.cs rename to src/DotTiled/Model/Layers/Objects/RectangleObject.cs index 27a3753..ff64a76 100644 --- a/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/DotTiled/Model/Layers/Objects/TextObject.cs b/src/DotTiled/Model/Layers/Objects/TextObject.cs similarity index 95% rename from DotTiled/Model/Layers/Objects/TextObject.cs rename to src/DotTiled/Model/Layers/Objects/TextObject.cs index b41906a..f39f84a 100644 --- a/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/DotTiled/Model/Layers/Objects/TileObject.cs b/src/DotTiled/Model/Layers/Objects/TileObject.cs similarity index 63% rename from DotTiled/Model/Layers/Objects/TileObject.cs rename to src/DotTiled/Model/Layers/Objects/TileObject.cs index c066780..992ac3c 100644 --- a/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/DotTiled/Model/Layers/TileLayer.cs b/src/DotTiled/Model/Layers/TileLayer.cs similarity index 89% rename from DotTiled/Model/Layers/TileLayer.cs rename to src/DotTiled/Model/Layers/TileLayer.cs index 7692266..9002397 100644 --- a/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/DotTiled/Model/Map.cs b/src/DotTiled/Model/Map.cs similarity index 92% rename from DotTiled/Model/Map.cs rename to src/DotTiled/Model/Map.cs index fdcdbd1..3102567 100644 --- a/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/DotTiled/Model/Properties/BoolProperty.cs b/src/DotTiled/Model/Properties/BoolProperty.cs similarity index 87% rename from DotTiled/Model/Properties/BoolProperty.cs rename to src/DotTiled/Model/Properties/BoolProperty.cs index 949858f..6360a3a 100644 --- a/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/DotTiled/Model/Properties/ClassProperty.cs b/src/DotTiled/Model/Properties/ClassProperty.cs similarity index 81% rename from DotTiled/Model/Properties/ClassProperty.cs rename to src/DotTiled/Model/Properties/ClassProperty.cs index 0b1391d..e46389f 100644 --- a/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/DotTiled/Model/Properties/ColorProperty.cs b/src/DotTiled/Model/Properties/ColorProperty.cs similarity index 88% rename from DotTiled/Model/Properties/ColorProperty.cs rename to src/DotTiled/Model/Properties/ColorProperty.cs index 07ca25e..06d8fc1 100644 --- a/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/DotTiled/Model/Properties/CustomTypes/CustomClassDefinition.cs b/src/DotTiled/Model/Properties/CustomTypes/CustomClassDefinition.cs similarity index 91% rename from DotTiled/Model/Properties/CustomTypes/CustomClassDefinition.cs rename to src/DotTiled/Model/Properties/CustomTypes/CustomClassDefinition.cs index ec92b3f..c080e2a 100644 --- a/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/DotTiled/Model/Properties/CustomTypes/CustomEnumDefinition.cs b/src/DotTiled/Model/Properties/CustomTypes/CustomEnumDefinition.cs similarity index 85% rename from DotTiled/Model/Properties/CustomTypes/CustomEnumDefinition.cs rename to src/DotTiled/Model/Properties/CustomTypes/CustomEnumDefinition.cs index d570442..9d15b7d 100644 --- a/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/DotTiled/Model/Properties/CustomTypes/CustomTypeDefinition.cs b/src/DotTiled/Model/Properties/CustomTypes/CustomTypeDefinition.cs similarity index 71% rename from DotTiled/Model/Properties/CustomTypes/CustomTypeDefinition.cs rename to src/DotTiled/Model/Properties/CustomTypes/CustomTypeDefinition.cs index 1f50462..f535215 100644 --- a/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/DotTiled/Model/Properties/FileProperty.cs b/src/DotTiled/Model/Properties/FileProperty.cs similarity index 88% rename from DotTiled/Model/Properties/FileProperty.cs rename to src/DotTiled/Model/Properties/FileProperty.cs index edc939c..42b9d15 100644 --- a/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/DotTiled/Model/Properties/FloatProperty.cs b/src/DotTiled/Model/Properties/FloatProperty.cs similarity index 88% rename from DotTiled/Model/Properties/FloatProperty.cs rename to src/DotTiled/Model/Properties/FloatProperty.cs index 469cc45..ccb18ae 100644 --- a/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/DotTiled/Model/Properties/IProperty.cs b/src/DotTiled/Model/Properties/IProperty.cs similarity index 77% rename from DotTiled/Model/Properties/IProperty.cs rename to src/DotTiled/Model/Properties/IProperty.cs index f4294cd..0414c3c 100644 --- a/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/DotTiled/Model/Properties/IntProperty.cs b/src/DotTiled/Model/Properties/IntProperty.cs similarity index 87% rename from DotTiled/Model/Properties/IntProperty.cs rename to src/DotTiled/Model/Properties/IntProperty.cs index b8fb02a..cfaf7d0 100644 --- a/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/DotTiled/Model/Properties/ObjectProperty.cs b/src/DotTiled/Model/Properties/ObjectProperty.cs similarity index 88% rename from DotTiled/Model/Properties/ObjectProperty.cs rename to src/DotTiled/Model/Properties/ObjectProperty.cs index 1591319..5f37607 100644 --- a/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/DotTiled/Model/Properties/PropertyType.cs b/src/DotTiled/Model/Properties/PropertyType.cs similarity index 72% rename from DotTiled/Model/Properties/PropertyType.cs rename to src/DotTiled/Model/Properties/PropertyType.cs index 79b05cb..bb01960 100644 --- a/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/DotTiled/Model/Properties/StringProperty.cs b/src/DotTiled/Model/Properties/StringProperty.cs similarity index 88% rename from DotTiled/Model/Properties/StringProperty.cs rename to src/DotTiled/Model/Properties/StringProperty.cs index 655b7b4..9842ca4 100644 --- a/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/DotTiled/Model/Template.cs b/src/DotTiled/Model/Template.cs similarity index 63% rename from DotTiled/Model/Template.cs rename to src/DotTiled/Model/Template.cs index 11ae128..834f8d8 100644 --- a/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/DotTiled/Model/Tileset/Frame.cs b/src/DotTiled/Model/Tilesets/Frame.cs similarity index 78% rename from DotTiled/Model/Tileset/Frame.cs rename to src/DotTiled/Model/Tilesets/Frame.cs index 9c308fe..8762423 100644 --- a/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/DotTiled/Model/Tileset/Grid.cs b/src/DotTiled/Model/Tilesets/Grid.cs similarity index 88% rename from DotTiled/Model/Tileset/Grid.cs rename to src/DotTiled/Model/Tilesets/Grid.cs index 027e36b..81d5e06 100644 --- a/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/DotTiled/Model/Tileset/Image.cs b/src/DotTiled/Model/Tilesets/Image.cs similarity index 89% rename from DotTiled/Model/Tileset/Image.cs rename to src/DotTiled/Model/Tilesets/Image.cs index bd64838..e5ea154 100644 --- a/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/DotTiled/Model/Tileset/Tile.cs b/src/DotTiled/Model/Tilesets/Tile.cs similarity index 85% rename from DotTiled/Model/Tileset/Tile.cs rename to src/DotTiled/Model/Tilesets/Tile.cs index f6b40ff..55669ee 100644 --- a/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/DotTiled/Model/Tileset/TileOffset.cs b/src/DotTiled/Model/Tilesets/TileOffset.cs similarity index 77% rename from DotTiled/Model/Tileset/TileOffset.cs rename to src/DotTiled/Model/Tilesets/TileOffset.cs index fdd0506..cbe9111 100644 --- a/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/DotTiled/Model/Tileset/Tileset.cs b/src/DotTiled/Model/Tilesets/Tileset.cs similarity index 95% rename from DotTiled/Model/Tileset/Tileset.cs rename to src/DotTiled/Model/Tilesets/Tileset.cs index 7b1a982..15bd56b 100644 --- a/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/DotTiled/Model/Tileset/Transformations.cs b/src/DotTiled/Model/Tilesets/Transformations.cs similarity index 87% rename from DotTiled/Model/Tileset/Transformations.cs rename to src/DotTiled/Model/Tilesets/Transformations.cs index 86ef359..83187a7 100644 --- a/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/DotTiled/Model/Tileset/WangColor.cs b/src/DotTiled/Model/Tilesets/WangColor.cs similarity index 84% rename from DotTiled/Model/Tileset/WangColor.cs rename to src/DotTiled/Model/Tilesets/WangColor.cs index 9ac751c..c13b0da 100644 --- a/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/DotTiled/Model/Tileset/WangTile.cs b/src/DotTiled/Model/Tilesets/WangTile.cs similarity index 79% rename from DotTiled/Model/Tileset/WangTile.cs rename to src/DotTiled/Model/Tilesets/WangTile.cs index 7fad06f..488a12a 100644 --- a/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/DotTiled/Model/Tileset/Wangset.cs b/src/DotTiled/Model/Tilesets/Wangset.cs similarity index 87% rename from DotTiled/Model/Tileset/Wangset.cs rename to src/DotTiled/Model/Tilesets/Wangset.cs index 61f8496..6101347 100644 --- a/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/DotTiled/Serialization/Helpers.cs b/src/DotTiled/Serialization/Helpers.cs similarity index 96% rename from DotTiled/Serialization/Helpers.cs rename to src/DotTiled/Serialization/Helpers.cs index 2e36124..abfba09 100644 --- a/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/DotTiled/Serialization/IMapReader.cs b/src/DotTiled/Serialization/IMapReader.cs similarity index 58% rename from DotTiled/Serialization/IMapReader.cs rename to src/DotTiled/Serialization/IMapReader.cs index 97c1fd7..a1e8b05 100644 --- a/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/DotTiled/Serialization/ITemplateReader.cs b/src/DotTiled/Serialization/ITemplateReader.cs similarity index 62% rename from DotTiled/Serialization/ITemplateReader.cs rename to src/DotTiled/Serialization/ITemplateReader.cs index 8de77bc..45832fa 100644 --- a/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/DotTiled/Serialization/ITilesetReader.cs b/src/DotTiled/Serialization/ITilesetReader.cs similarity index 58% rename from DotTiled/Serialization/ITilesetReader.cs rename to src/DotTiled/Serialization/ITilesetReader.cs index 37f5257..fa4a94c 100644 --- a/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/DotTiled/Serialization/Tmj/ExtensionsJsonElement.cs b/src/DotTiled/Serialization/Tmj/ExtensionsJsonElement.cs similarity index 99% rename from DotTiled/Serialization/Tmj/ExtensionsJsonElement.cs rename to src/DotTiled/Serialization/Tmj/ExtensionsJsonElement.cs index 7462c56..0e76d84 100644 --- a/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/DotTiled/Serialization/Tmj/TjTemplateReader.cs b/src/DotTiled/Serialization/Tmj/TjTemplateReader.cs similarity index 94% rename from DotTiled/Serialization/Tmj/TjTemplateReader.cs rename to src/DotTiled/Serialization/Tmj/TjTemplateReader.cs index 0dc1dd8..69747bb 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.Data.cs b/src/DotTiled/Serialization/Tmj/Tmj.Data.cs similarity index 97% rename from DotTiled/Serialization/Tmj/Tmj.Data.cs rename to src/DotTiled/Serialization/Tmj/Tmj.Data.cs index 0b05c01..ac3d30b 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.Group.cs b/src/DotTiled/Serialization/Tmj/Tmj.Group.cs similarity index 91% rename from DotTiled/Serialization/Tmj/Tmj.Group.cs rename to src/DotTiled/Serialization/Tmj/Tmj.Group.cs index 44e8b4d..159d892 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.ImageLayer.cs b/src/DotTiled/Serialization/Tmj/Tmj.ImageLayer.cs similarity index 92% rename from DotTiled/Serialization/Tmj/Tmj.ImageLayer.cs rename to src/DotTiled/Serialization/Tmj/Tmj.ImageLayer.cs index dbd75a1..e3d6112 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.Layer.cs b/src/DotTiled/Serialization/Tmj/Tmj.Layer.cs similarity index 86% rename from DotTiled/Serialization/Tmj/Tmj.Layer.cs rename to src/DotTiled/Serialization/Tmj/Tmj.Layer.cs index f14d614..d81ce17 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.Map.cs b/src/DotTiled/Serialization/Tmj/Tmj.Map.cs similarity index 95% rename from DotTiled/Serialization/Tmj/Tmj.Map.cs rename to src/DotTiled/Serialization/Tmj/Tmj.Map.cs index ea7313f..e27dfed 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.ObjectLayer.cs b/src/DotTiled/Serialization/Tmj/Tmj.ObjectLayer.cs similarity index 94% rename from DotTiled/Serialization/Tmj/Tmj.ObjectLayer.cs rename to src/DotTiled/Serialization/Tmj/Tmj.ObjectLayer.cs index 564f2db..0662fc9 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.Properties.cs b/src/DotTiled/Serialization/Tmj/Tmj.Properties.cs similarity index 97% rename from DotTiled/Serialization/Tmj/Tmj.Properties.cs rename to src/DotTiled/Serialization/Tmj/Tmj.Properties.cs index 6981521..1ef4944 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.Template.cs b/src/DotTiled/Serialization/Tmj/Tmj.Template.cs similarity index 70% rename from DotTiled/Serialization/Tmj/Tmj.Template.cs rename to src/DotTiled/Serialization/Tmj/Tmj.Template.cs index 79c7860..65d6f87 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.TileLayer.cs b/src/DotTiled/Serialization/Tmj/Tmj.TileLayer.cs similarity index 94% rename from DotTiled/Serialization/Tmj/Tmj.TileLayer.cs rename to src/DotTiled/Serialization/Tmj/Tmj.TileLayer.cs index 5528177..d2fd53d 100644 --- a/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/DotTiled/Serialization/Tmj/Tmj.Tileset.cs b/src/DotTiled/Serialization/Tmj/Tmj.Tileset.cs similarity index 98% rename from DotTiled/Serialization/Tmj/Tmj.Tileset.cs rename to src/DotTiled/Serialization/Tmj/Tmj.Tileset.cs index d455b42..8b206c9 100644 --- a/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/DotTiled/Serialization/Tmj/TmjMapReader.cs b/src/DotTiled/Serialization/Tmj/TmjMapReader.cs similarity index 94% rename from DotTiled/Serialization/Tmj/TmjMapReader.cs rename to src/DotTiled/Serialization/Tmj/TmjMapReader.cs index 260cd21..3eb1df0 100644 --- a/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/DotTiled/Serialization/Tmj/TsjTilesetReader.cs b/src/DotTiled/Serialization/Tmj/TsjTilesetReader.cs similarity index 93% rename from DotTiled/Serialization/Tmj/TsjTilesetReader.cs rename to src/DotTiled/Serialization/Tmj/TsjTilesetReader.cs index 14e5323..a41adfe 100644 --- a/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/DotTiled/Serialization/Tmx/ExtensionsXmlReader.cs b/src/DotTiled/Serialization/Tmx/ExtensionsXmlReader.cs similarity index 99% rename from DotTiled/Serialization/Tmx/ExtensionsXmlReader.cs rename to src/DotTiled/Serialization/Tmx/ExtensionsXmlReader.cs index 79ddb31..ca5f836 100644 --- a/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/DotTiled/Serialization/Tmx/Tmx.Chunk.cs b/src/DotTiled/Serialization/Tmx/Tmx.Chunk.cs similarity index 94% rename from DotTiled/Serialization/Tmx/Tmx.Chunk.cs rename to src/DotTiled/Serialization/Tmx/Tmx.Chunk.cs index 9d06082..d0db01f 100644 --- a/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/DotTiled/Serialization/Tmx/Tmx.Data.cs b/src/DotTiled/Serialization/Tmx/Tmx.Data.cs similarity index 98% rename from DotTiled/Serialization/Tmx/Tmx.Data.cs rename to src/DotTiled/Serialization/Tmx/Tmx.Data.cs index 85598e0..5d55ba4 100644 --- a/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/DotTiled/Serialization/Tmx/Tmx.Map.cs b/src/DotTiled/Serialization/Tmx/Tmx.Map.cs similarity index 95% rename from DotTiled/Serialization/Tmx/Tmx.Map.cs rename to src/DotTiled/Serialization/Tmx/Tmx.Map.cs index bb7f1ae..2152852 100644 --- a/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/DotTiled/Serialization/Tmx/Tmx.ObjectLayer.cs b/src/DotTiled/Serialization/Tmx/Tmx.ObjectLayer.cs similarity index 95% rename from DotTiled/Serialization/Tmx/Tmx.ObjectLayer.cs rename to src/DotTiled/Serialization/Tmx/Tmx.ObjectLayer.cs index 4d70b91..5f5bda0 100644 --- a/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/DotTiled/Serialization/Tmx/Tmx.Properties.cs b/src/DotTiled/Serialization/Tmx/Tmx.Properties.cs similarity index 95% rename from DotTiled/Serialization/Tmx/Tmx.Properties.cs rename to src/DotTiled/Serialization/Tmx/Tmx.Properties.cs index 6ea65e5..7f62358 100644 --- a/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/DotTiled/Serialization/Tmx/Tmx.TileLayer.cs b/src/DotTiled/Serialization/Tmx/Tmx.TileLayer.cs similarity index 96% rename from DotTiled/Serialization/Tmx/Tmx.TileLayer.cs rename to src/DotTiled/Serialization/Tmx/Tmx.TileLayer.cs index 6fc64fb..41e720b 100644 --- a/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/DotTiled/Serialization/Tmx/Tmx.Tileset.cs b/src/DotTiled/Serialization/Tmx/Tmx.Tileset.cs similarity index 98% rename from DotTiled/Serialization/Tmx/Tmx.Tileset.cs rename to src/DotTiled/Serialization/Tmx/Tmx.Tileset.cs index 1912df2..5d8aac6 100644 --- a/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/DotTiled/Serialization/Tmx/TmxMapReader.cs b/src/DotTiled/Serialization/Tmx/TmxMapReader.cs similarity index 93% rename from DotTiled/Serialization/Tmx/TmxMapReader.cs rename to src/DotTiled/Serialization/Tmx/TmxMapReader.cs index 02388bb..f9228b4 100644 --- a/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/DotTiled/Serialization/Tmx/TsxTilesetReader.cs b/src/DotTiled/Serialization/Tmx/TsxTilesetReader.cs similarity index 93% rename from DotTiled/Serialization/Tmx/TsxTilesetReader.cs rename to src/DotTiled/Serialization/Tmx/TsxTilesetReader.cs index dba516b..f7a1565 100644 --- a/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/DotTiled/Serialization/Tmx/TxTemplateReader.cs b/src/DotTiled/Serialization/Tmx/TxTemplateReader.cs similarity index 93% rename from DotTiled/Serialization/Tmx/TxTemplateReader.cs rename to src/DotTiled/Serialization/Tmx/TxTemplateReader.cs index eba6299..3fa6c69 100644 --- a/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 {