diff --git a/Engine.Core/Engine.Core.csproj b/Engine.Core/Engine.Core.csproj index 402f9f6..497688f 100644 --- a/Engine.Core/Engine.Core.csproj +++ b/Engine.Core/Engine.Core.csproj @@ -7,4 +7,8 @@ Syntriax.Engine.Core + + + + diff --git a/Engine.Serialization/Converters/Abstract/IEngineTypeYamlConverter.cs b/Engine.Core/Serialization/Converters/Abstract/IEngineTypeYamlConverter.cs similarity index 68% rename from Engine.Serialization/Converters/Abstract/IEngineTypeYamlConverter.cs rename to Engine.Core/Serialization/Converters/Abstract/IEngineTypeYamlConverter.cs index f260755..8764bf0 100644 --- a/Engine.Serialization/Converters/Abstract/IEngineTypeYamlConverter.cs +++ b/Engine.Core/Serialization/Converters/Abstract/IEngineTypeYamlConverter.cs @@ -1,5 +1,5 @@ using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public interface IEngineTypeYamlConverter : IYamlTypeConverter; diff --git a/Engine.Serialization/Converters/BehaviourControllerConverter.cs b/Engine.Core/Serialization/Converters/BehaviourControllerConverter.cs similarity index 96% rename from Engine.Serialization/Converters/BehaviourControllerConverter.cs rename to Engine.Core/Serialization/Converters/BehaviourControllerConverter.cs index 4fb0f30..93e8908 100644 --- a/Engine.Serialization/Converters/BehaviourControllerConverter.cs +++ b/Engine.Core/Serialization/Converters/BehaviourControllerConverter.cs @@ -1,10 +1,12 @@ -using Syntriax.Engine.Core; +using System; +using System.Collections.Generic; +using System.Linq; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class BehaviourControllerConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/BehaviourConverter.cs b/Engine.Core/Serialization/Converters/BehaviourConverter.cs similarity index 97% rename from Engine.Serialization/Converters/BehaviourConverter.cs rename to Engine.Core/Serialization/Converters/BehaviourConverter.cs index c600330..0be9aa8 100644 --- a/Engine.Serialization/Converters/BehaviourConverter.cs +++ b/Engine.Core/Serialization/Converters/BehaviourConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class BehaviourConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/AABBConverter.cs b/Engine.Core/Serialization/Converters/Primitives/AABBConverter.cs similarity index 95% rename from Engine.Serialization/Converters/Primitives/AABBConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/AABBConverter.cs index f013fba..4f7770e 100644 --- a/Engine.Serialization/Converters/Primitives/AABBConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/AABBConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class AABBConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/CircleConverter.cs b/Engine.Core/Serialization/Converters/Primitives/CircleConverter.cs similarity index 95% rename from Engine.Serialization/Converters/Primitives/CircleConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/CircleConverter.cs index c2d1a3e..50cbc94 100644 --- a/Engine.Serialization/Converters/Primitives/CircleConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/CircleConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class CircleConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/Line2DConverter.cs b/Engine.Core/Serialization/Converters/Primitives/Line2DConverter.cs similarity index 95% rename from Engine.Serialization/Converters/Primitives/Line2DConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/Line2DConverter.cs index 1da6495..6e907bf 100644 --- a/Engine.Serialization/Converters/Primitives/Line2DConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/Line2DConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class Line2DConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/Line2DEquationConverter.cs b/Engine.Core/Serialization/Converters/Primitives/Line2DEquationConverter.cs similarity index 95% rename from Engine.Serialization/Converters/Primitives/Line2DEquationConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/Line2DEquationConverter.cs index b982666..2bf5e90 100644 --- a/Engine.Serialization/Converters/Primitives/Line2DEquationConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/Line2DEquationConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class Line2DEquationConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/Projection1DConverter.cs b/Engine.Core/Serialization/Converters/Primitives/Projection1DConverter.cs similarity index 95% rename from Engine.Serialization/Converters/Primitives/Projection1DConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/Projection1DConverter.cs index f2bb88c..f16750b 100644 --- a/Engine.Serialization/Converters/Primitives/Projection1DConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/Projection1DConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class Projection1DConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/QuaternionConverter.cs b/Engine.Core/Serialization/Converters/Primitives/QuaternionConverter.cs similarity index 93% rename from Engine.Serialization/Converters/Primitives/QuaternionConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/QuaternionConverter.cs index 8552ee7..2e940f5 100644 --- a/Engine.Serialization/Converters/Primitives/QuaternionConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/QuaternionConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class QuaternionConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/Shape2DConverter.cs b/Engine.Core/Serialization/Converters/Primitives/Shape2DConverter.cs similarity index 93% rename from Engine.Serialization/Converters/Primitives/Shape2DConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/Shape2DConverter.cs index 4c7f2f1..6aa78e7 100644 --- a/Engine.Serialization/Converters/Primitives/Shape2DConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/Shape2DConverter.cs @@ -1,10 +1,11 @@ -using Syntriax.Engine.Core; +using System; +using System.Collections.Generic; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class Shape2DConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/TriangleConverter.cs b/Engine.Core/Serialization/Converters/Primitives/TriangleConverter.cs similarity index 96% rename from Engine.Serialization/Converters/Primitives/TriangleConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/TriangleConverter.cs index e989905..8016413 100644 --- a/Engine.Serialization/Converters/Primitives/TriangleConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/TriangleConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class TriangleConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/Vector2DConverter.cs b/Engine.Core/Serialization/Converters/Primitives/Vector2DConverter.cs similarity index 92% rename from Engine.Serialization/Converters/Primitives/Vector2DConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/Vector2DConverter.cs index fde0561..559ee05 100644 --- a/Engine.Serialization/Converters/Primitives/Vector2DConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/Vector2DConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class Vector2DConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/Primitives/Vector3DConverter.cs b/Engine.Core/Serialization/Converters/Primitives/Vector3DConverter.cs similarity index 93% rename from Engine.Serialization/Converters/Primitives/Vector3DConverter.cs rename to Engine.Core/Serialization/Converters/Primitives/Vector3DConverter.cs index 3970625..bf49062 100644 --- a/Engine.Serialization/Converters/Primitives/Vector3DConverter.cs +++ b/Engine.Core/Serialization/Converters/Primitives/Vector3DConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class Vector3DConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/StateEnableConverter.cs b/Engine.Core/Serialization/Converters/StateEnableConverter.cs similarity index 95% rename from Engine.Serialization/Converters/StateEnableConverter.cs rename to Engine.Core/Serialization/Converters/StateEnableConverter.cs index d663a36..9dba1e2 100644 --- a/Engine.Serialization/Converters/StateEnableConverter.cs +++ b/Engine.Core/Serialization/Converters/StateEnableConverter.cs @@ -1,10 +1,10 @@ -using Syntriax.Engine.Core; +using System; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class StateEnableConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/Converters/UniverseObjectConverter.cs b/Engine.Core/Serialization/Converters/UniverseObjectConverter.cs similarity index 96% rename from Engine.Serialization/Converters/UniverseObjectConverter.cs rename to Engine.Core/Serialization/Converters/UniverseObjectConverter.cs index 1a12a83..b60253a 100644 --- a/Engine.Serialization/Converters/UniverseObjectConverter.cs +++ b/Engine.Core/Serialization/Converters/UniverseObjectConverter.cs @@ -1,10 +1,12 @@ -using Syntriax.Engine.Core; +using System; +using System.Collections.Generic; +using System.Linq; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class UniverseObjectConverter : IEngineTypeYamlConverter { diff --git a/Engine.Serialization/IgnoreSerializationAttribute.cs b/Engine.Core/Serialization/IgnoreSerializationAttribute.cs similarity index 71% rename from Engine.Serialization/IgnoreSerializationAttribute.cs rename to Engine.Core/Serialization/IgnoreSerializationAttribute.cs index f182578..f0dcb16 100644 --- a/Engine.Serialization/IgnoreSerializationAttribute.cs +++ b/Engine.Core/Serialization/IgnoreSerializationAttribute.cs @@ -1,4 +1,6 @@ -namespace Syntriax.Engine.Serialization; +using System; + +namespace Syntriax.Engine.Core.Serialization; [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Class)] public class IgnoreSerializationAttribute : Attribute; diff --git a/Engine.Serialization/SerializeAllAttribute.cs b/Engine.Core/Serialization/SerializeAllAttribute.cs similarity index 65% rename from Engine.Serialization/SerializeAllAttribute.cs rename to Engine.Core/Serialization/SerializeAllAttribute.cs index 9ed6d50..fa6e8a1 100644 --- a/Engine.Serialization/SerializeAllAttribute.cs +++ b/Engine.Core/Serialization/SerializeAllAttribute.cs @@ -1,4 +1,6 @@ -namespace Syntriax.Engine.Serialization; +using System; + +namespace Syntriax.Engine.Core.Serialization; [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)] public class SerializeAllAttribute : Attribute; diff --git a/Engine.Core/Serialization/SerializeAttribute.cs b/Engine.Core/Serialization/SerializeAttribute.cs new file mode 100644 index 0000000..6f94860 --- /dev/null +++ b/Engine.Core/Serialization/SerializeAttribute.cs @@ -0,0 +1,6 @@ +using System; + +namespace Syntriax.Engine.Core.Serialization; + +[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)] +public class SerializeAttribute : Attribute; diff --git a/Engine.Serialization/SerializedClass.cs b/Engine.Core/Serialization/SerializedClass.cs similarity index 97% rename from Engine.Serialization/SerializedClass.cs rename to Engine.Core/Serialization/SerializedClass.cs index d01209d..f9a4f56 100644 --- a/Engine.Serialization/SerializedClass.cs +++ b/Engine.Core/Serialization/SerializedClass.cs @@ -1,9 +1,10 @@ +using System; +using System.Collections.Generic; using System.Reflection; -using Syntriax.Engine.Core; using Syntriax.Engine.Core.Factory; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public class SerializedClass { diff --git a/Engine.Serialization/Serializer.cs b/Engine.Core/Serialization/Serializer.cs similarity index 94% rename from Engine.Serialization/Serializer.cs rename to Engine.Core/Serialization/Serializer.cs index 6e6cb3d..6933fc7 100644 --- a/Engine.Serialization/Serializer.cs +++ b/Engine.Core/Serialization/Serializer.cs @@ -1,8 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; using System.Reflection; + using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; public static class Serializer { diff --git a/Engine.Serialization/Utils.cs b/Engine.Core/Serialization/Utils.cs similarity index 96% rename from Engine.Serialization/Utils.cs rename to Engine.Core/Serialization/Utils.cs index 79f7c8f..5f9aa4f 100644 --- a/Engine.Serialization/Utils.cs +++ b/Engine.Core/Serialization/Utils.cs @@ -1,6 +1,9 @@ +using System; +using System.Collections.Generic; +using System.Linq; using System.Reflection; -namespace Syntriax.Engine.Serialization; +namespace Syntriax.Engine.Core.Serialization; internal static class Utils { diff --git a/Engine.Serialization/Engine.Serialization.csproj b/Engine.Serialization/Engine.Serialization.csproj deleted file mode 100644 index c549648..0000000 --- a/Engine.Serialization/Engine.Serialization.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net8.0 - enable - enable - Syntriax.Engine.Serialization - - - - - - - - diff --git a/Engine.Serialization/SerializeAttribute.cs b/Engine.Serialization/SerializeAttribute.cs deleted file mode 100644 index eed67f3..0000000 --- a/Engine.Serialization/SerializeAttribute.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace Syntriax.Engine.Serialization; - -[AttributeUsage(AttributeTargets.Field)] -public class SerializeAttribute : Attribute; diff --git a/Engine.sln b/Engine.sln index ef83b4a..ae3e447 100644 --- a/Engine.sln +++ b/Engine.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Systems", "Engine.Sy EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine", "Engine\Engine.csproj", "{58AE79C1-9203-44AE-8022-AA180F0A71DC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Serialization", "Engine.Serialization\Engine.Serialization.csproj", "{9B46BE51-DD6B-4EDD-AAA8-41E993D7422C}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YamlDotNet", "YamlDotNet\YamlDotNet\YamlDotNet.csproj", "{4C4906EB-0210-493E-A7D0-7DEBDF2969E8}" EndProject Global @@ -20,9 +18,6 @@ Global Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {71719EAD-1B6B-4229-B39E-E53A2E8BFAB1}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -40,13 +35,12 @@ Global {58AE79C1-9203-44AE-8022-AA180F0A71DC}.Debug|Any CPU.Build.0 = Debug|Any CPU {58AE79C1-9203-44AE-8022-AA180F0A71DC}.Release|Any CPU.ActiveCfg = Release|Any CPU {58AE79C1-9203-44AE-8022-AA180F0A71DC}.Release|Any CPU.Build.0 = Release|Any CPU - {9B46BE51-DD6B-4EDD-AAA8-41E993D7422C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B46BE51-DD6B-4EDD-AAA8-41E993D7422C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B46BE51-DD6B-4EDD-AAA8-41E993D7422C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B46BE51-DD6B-4EDD-AAA8-41E993D7422C}.Release|Any CPU.Build.0 = Release|Any CPU {4C4906EB-0210-493E-A7D0-7DEBDF2969E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C4906EB-0210-493E-A7D0-7DEBDF2969E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C4906EB-0210-493E-A7D0-7DEBDF2969E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C4906EB-0210-493E-A7D0-7DEBDF2969E8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal