Change Library Namespaces (#2)

sandandstonesdev · web-flow · commit ae187a1c98e9 · 2025-02-20T09:52:39.000+01:00
diff --git a/SandAndStonesEngine/Assets/Assets/GameAssetBase.cs b/SandAndStonesEngine/Assets/Assets/GameAssetBase.cs
@@ -3,6 +3,7 @@
 using SandAndStonesEngine.DataModels.Quads;
 using SandAndStonesEngine.DataModels.Tiles;
 using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 using System.Numerics;
 
 namespace SandAndStonesEngine.Assets.Assets
diff --git a/SandAndStonesEngine/Assets/Assets/GameBackgroundAsset.cs b/SandAndStonesEngine/Assets/Assets/GameBackgroundAsset.cs
@@ -2,6 +2,7 @@
 using SandAndStonesEngine.DataModels.Quads;
 using SandAndStonesEngine.DataModels.Tiles;
 using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 using System.Numerics;
 
 namespace SandAndStonesEngine.Assets.Assets
diff --git a/SandAndStonesEngine/Assets/Assets/GameCharacterSpriteAsset.cs b/SandAndStonesEngine/Assets/Assets/GameCharacterSpriteAsset.cs
@@ -2,6 +2,7 @@
 using SandAndStonesEngine.DataModels.Tiles;
 using SandAndStonesEngine.MathModule;
 using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 using System.Numerics;
 
 namespace SandAndStonesEngine.Assets.Assets
diff --git a/SandAndStonesEngine/Assets/Assets/GameFPSCounterTextAsset.cs b/SandAndStonesEngine/Assets/Assets/GameFPSCounterTextAsset.cs
@@ -1,4 +1,5 @@
 ﻿using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 
 namespace SandAndStonesEngine.Assets.Assets
 {
diff --git a/SandAndStonesEngine/Assets/Assets/GamePointsCounterTextAsset.cs b/SandAndStonesEngine/Assets/Assets/GamePointsCounterTextAsset.cs
@@ -1,4 +1,5 @@
 ﻿using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 
 namespace SandAndStonesEngine.Assets.Assets
 {
diff --git a/SandAndStonesEngine/Assets/Assets/GameSpriteAsset.cs b/SandAndStonesEngine/Assets/Assets/GameSpriteAsset.cs
@@ -2,6 +2,7 @@
 using SandAndStonesEngine.DataModels.Tiles;
 using System.Numerics;
 using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 
 namespace SandAndStonesEngine.Assets.Assets
 {
diff --git a/SandAndStonesEngine/Assets/Assets/GameStatusBarBackgroundAsset.cs b/SandAndStonesEngine/Assets/Assets/GameStatusBarBackgroundAsset.cs
@@ -1,6 +1,7 @@
 ﻿using SandAndStonesEngine.DataModels.Quads;
 using SandAndStonesEngine.DataModels.Tiles;
 using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 using System.Numerics;
 
 namespace SandAndStonesEngine.Assets.Assets
diff --git a/SandAndStonesEngine/Assets/Assets/GameTextAsset.cs b/SandAndStonesEngine/Assets/Assets/GameTextAsset.cs
@@ -1,6 +1,7 @@
 ﻿using SandAndStonesEngine.DataModels.Quads;
 using SandAndStonesEngine.DataModels.Tiles;
 using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 using System.Numerics;
 
 namespace SandAndStonesEngine.Assets.Assets
diff --git a/SandAndStonesEngine/Assets/Batches/GameAssetBatch.cs b/SandAndStonesEngine/Assets/Batches/GameAssetBatch.cs
@@ -5,7 +5,7 @@
 using SandAndStonesEngine.GraphicAbstractions;
 using SandAndStonesEngine.MathModule;
 using SandAndStonesEngine.MemoryStores;
-using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 using System.Numerics;
 using Veldrid;
 
diff --git a/SandAndStonesEngine/Assets/Batches/GameAssetBatchBase.cs b/SandAndStonesEngine/Assets/Batches/GameAssetBatchBase.cs
@@ -4,7 +4,7 @@
 using SandAndStonesEngine.GameFactories;
 using SandAndStonesEngine.GraphicAbstractions;
 using SandAndStonesEngine.MemoryStores;
-using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 using Veldrid;
 
 namespace SandAndStonesEngine.Assets.Batches
diff --git a/SandAndStonesEngine/Assets/Batches/GameStatusBarAssetBatch.cs b/SandAndStonesEngine/Assets/Batches/GameStatusBarAssetBatch.cs
@@ -4,7 +4,7 @@
 using SandAndStonesEngine.GameFactories;
 using SandAndStonesEngine.GraphicAbstractions;
 using SandAndStonesEngine.MemoryStores;
-using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 using Veldrid;
 
 namespace SandAndStonesEngine.Assets.Batches
diff --git a/SandAndStonesEngine/Clients/InputAssetServiceReader.cs b/SandAndStonesEngine/Clients/InputAssetServiceReader.cs
@@ -1,4 +1,4 @@
-﻿using SandAndStonesLibrary.AssetConfig;
+﻿using SandAndStonesLibrary.Assets;
 using System.Diagnostics;
 using System.Text.Json;
 
diff --git a/SandAndStonesEngine/GameFactories/AssetFactory.cs b/SandAndStonesEngine/GameFactories/AssetFactory.cs
@@ -8,6 +8,7 @@
 using SandAndStonesEngine.DataModels.Tiles;
 using SandAndStonesEngine.MathModule;
 using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 using Veldrid;
 using TextureType = SandAndStonesEngine.Assets.Textures.TextureType;
 
diff --git a/SandAndStonesEngine/MemoryStores/AssetMemoryStore.cs b/SandAndStonesEngine/MemoryStores/AssetMemoryStore.cs
@@ -2,7 +2,7 @@
 using SandAndStonesEngine.Assets.Textures;
 using SandAndStonesEngine.DataModels.Quads;
 using SandAndStonesEngine.MemoryStore;
-using SandAndStonesLibrary.AssetConfig;
+using SandAndStonesLibrary.Assets;
 
 namespace SandAndStonesEngine.MemoryStores
 {
diff --git a/SandAndStonesLibrary/Assets/AssetBatchType.cs b/SandAndStonesLibrary/Assets/AssetBatchType.cs
@@ -1,4 +1,4 @@
-﻿namespace SandAndStonesLibrary.AssetConfig
+﻿namespace SandAndStonesLibrary.Assets
 {
     public enum AssetBatchType : uint
     {
diff --git a/SandAndStonesLibrary/Assets/AssetType.cs b/SandAndStonesLibrary/Assets/AssetType.cs
diff --git a/SandAndStonesLibrary/Assets/IAsyncAssetReader.cs b/SandAndStonesLibrary/Assets/IAsyncAssetReader.cs
@@ -1,4 +1,4 @@
-﻿namespace SandAndStonesLibrary.AssetConfig
+﻿namespace SandAndStonesLibrary.Assets
 {
     public interface IAsyncAssetReader
     {
diff --git a/SandAndStonesLibrary/Assets/InputAsset.cs b/SandAndStonesLibrary/Assets/InputAsset.cs
@@ -1,7 +1,8 @@
-﻿using System.Numerics;
+﻿using SandAndStonesLibrary.AssetConfig;
+using System.Numerics;
 using System.Text.Json.Serialization;
 
-namespace SandAndStonesLibrary.AssetConfig
+namespace SandAndStonesLibrary.Assets
 {
     public class InputAsset
     {
diff --git a/SandAndStonesLibrary/Assets/InputAssetBatch.cs b/SandAndStonesLibrary/Assets/InputAssetBatch.cs
@@ -1,8 +1,8 @@
 ﻿using System.Text.Json.Serialization;
 
-namespace SandAndStonesLibrary.AssetConfig
+namespace SandAndStonesLibrary.Assets
 {
-    public  class InputAssetBatch
+    public class InputAssetBatch
     {
         [JsonRequired]
         [JsonPropertyName("id")]
diff --git a/SandAndStonesLibrary/Assets/InputAssetReader.cs b/SandAndStonesLibrary/Assets/InputAssetReader.cs
@@ -1,6 +1,6 @@
 ﻿using System.Text.Json;
 
-namespace SandAndStonesLibrary.AssetConfig
+namespace SandAndStonesLibrary.Assets
 {
     public class InputAssetReader : IAsyncAssetReader
     {
diff --git a/SandAndStonesLibrary/Assets/JsonColorVectorConverter.cs b/SandAndStonesLibrary/Assets/JsonColorVectorConverter.cs
@@ -2,7 +2,7 @@
 using System.Text.Json.Serialization;
 using System.Text.Json;
 
-namespace SandAndStonesLibrary.AssetConfig
+namespace SandAndStonesLibrary.Assets
 {
     public class JsonColorVectorConverter : JsonConverter<Vector4>
     {
diff --git a/SandAndStonesLibrary/Assets/JsonPosVectorConverter.cs b/SandAndStonesLibrary/Assets/JsonPosVectorConverter.cs
@@ -2,7 +2,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace SandAndStonesLibrary.AssetConfig
+namespace SandAndStonesLibrary.Assets
 {
     public class JsonPosVectorConverter : JsonConverter<Vector4>
     {
@@ -13,7 +13,7 @@ public override Vector4 Read(
         {
             var list = JsonSerializer.Deserialize<List<float>>(ref reader, options);
             _ = list ?? throw new Exception();
-            return new Vector4(list[0], list[1], 
+            return new Vector4(list[0], list[1],
                             list.Count > 2 ? list[2] : 0,
                             list.Count > 3 ? list[3] : 0);
         }
diff --git a/SandAndStonesLibrary/SandAndStonesLibrary.csproj b/SandAndStonesLibrary/SandAndStonesLibrary.csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="TextureConfig\" />
+    <Folder Include="Textures\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SandAndStonesLibrary/Textures/IAsyncTextureReader.cs b/SandAndStonesLibrary/Textures/IAsyncTextureReader.cs
@@ -1,4 +1,4 @@
-﻿namespace InputTextureService.TextureConfig
+﻿namespace SandAndStonesLibrary.Textures
 {
     public interface IAsyncTextureReader
     {
diff --git a/SandAndStonesLibrary/Textures/InputTexture.cs b/SandAndStonesLibrary/Textures/InputTexture.cs
@@ -1,4 +1,4 @@
-﻿namespace InputTextureService.TextureConfig
+﻿namespace SandAndStonesLibrary.Textures
 {
     public class InputTexture
     {
@@ -12,12 +12,12 @@ public InputTexture()
         }
         public InputTexture(int width, int height, byte[] data) : this()
         {
-            this.Width = width;
-            this.Height = height;
+            Width = width;
+            Height = height;
             if (data is not null && data.Length > 0)
             {
-                this.Data = data;
-                this.Loaded = true;
+                Data = data;
+                Loaded = true;
             }
         }
     }
diff --git a/SandAndStonesLibrary/Textures/InputTextureReader.cs b/SandAndStonesLibrary/Textures/InputTextureReader.cs
@@ -1,7 +1,7 @@
 ﻿using SkiaSharp;
 using System.Runtime.InteropServices;
 
-namespace InputTextureService.TextureConfig
+namespace SandAndStonesLibrary.Textures
 {
     public class InputTextureReader : IAsyncTextureReader
     {
diff --git a/SandAndStonesLibrary/Textures/TextureDescription.cs b/SandAndStonesLibrary/Textures/TextureDescription.cs
@@ -1,4 +1,4 @@
-﻿namespace InputTextureService.TextureConfig
+﻿namespace SandAndStonesLibrary.Textures
 {
     public record TextureDescription(int id, string name);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using SandAndStonesLibrary.AssetConfig;`
	`2`	`+using SandAndStonesLibrary.Assets;`
`2`	`3`
`3`	`4`	`namespace SandAndStonesEngine.Assets.Assets`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using SandAndStonesEngine.DataModels.Tiles;`
`3`	`3`	`using System.Numerics;`
`4`	`4`	`using SandAndStonesLibrary.AssetConfig;`
	`5`	`+using SandAndStonesLibrary.Assets;`
`5`	`6`
`6`	`7`	`namespace SandAndStonesEngine.Assets.Assets`
`7`	`8`	`{`