diff --git a/src/Immersion/ObserverTest.cs b/src/Immersion/ObserverTest.cs index ebaf740..d593599 100644 --- a/src/Immersion/ObserverTest.cs +++ b/src/Immersion/ObserverTest.cs @@ -1,5 +1,6 @@ using System; using gaemstone.ECS; +using gaemstone.Flecs; using static gaemstone.Bloxel.Components.CoreComponents; using static gaemstone.Client.Components.RenderingComponents; diff --git a/src/Immersion/Program.cs b/src/Immersion/Program.cs index e28acfa..ee68435 100644 --- a/src/Immersion/Program.cs +++ b/src/Immersion/Program.cs @@ -4,6 +4,7 @@ using System.Threading; using gaemstone.Bloxel; using gaemstone.Client; using gaemstone.ECS; +using gaemstone.Flecs; using gaemstone.Utility; using Silk.NET.Maths; using Silk.NET.OpenGL; @@ -22,8 +23,8 @@ Resources.ResourceAssembly = typeof(Program).Assembly; var universe = new Universe(); var game = universe.LookupOrThrow(); -universe.Modules.Register(); -universe.Modules.Register(); +universe.Modules.Register(); +universe.Modules.Register(); var window = Window.Create(WindowOptions.Default with { Title = "gæmstone", diff --git a/src/gaemstone.Client/Systems/Input.cs b/src/gaemstone.Client/Systems/Input.cs index c5abe54..9f954be 100644 --- a/src/gaemstone.Client/Systems/Input.cs +++ b/src/gaemstone.Client/Systems/Input.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using gaemstone.ECS; +using gaemstone.Flecs; using Silk.NET.Input; using Silk.NET.Maths; using static gaemstone.Client.Systems.Windowing; diff --git a/src/gaemstone.Client/Systems/Renderer.cs b/src/gaemstone.Client/Systems/Renderer.cs index d80d62a..2607c72 100644 --- a/src/gaemstone.Client/Systems/Renderer.cs +++ b/src/gaemstone.Client/Systems/Renderer.cs @@ -2,6 +2,7 @@ using System; using System.Diagnostics; using System.Runtime.InteropServices; using gaemstone.ECS; +using gaemstone.Flecs; using Silk.NET.Maths; using Silk.NET.OpenGL; using Silk.NET.Windowing; diff --git a/src/gaemstone.Client/Systems/Windowing.cs b/src/gaemstone.Client/Systems/Windowing.cs index b5c8171..6205ba5 100644 --- a/src/gaemstone.Client/Systems/Windowing.cs +++ b/src/gaemstone.Client/Systems/Windowing.cs @@ -1,4 +1,5 @@ using gaemstone.ECS; +using gaemstone.Flecs; using Silk.NET.Maths; using Silk.NET.OpenGL; using Silk.NET.Windowing; diff --git a/src/gaemstone/ECS/Entity.cs b/src/gaemstone/ECS/Entity.cs index 6d3b9d8..40016cd 100644 --- a/src/gaemstone/ECS/Entity.cs +++ b/src/gaemstone/ECS/Entity.cs @@ -21,7 +21,7 @@ public readonly struct Entity public bool IsNone => Value.Data == 0; public Entity ThrowIfNone() => !IsNone ? this - : throw new FlecsException(this + " is none"); + : throw new InvalidOperationException(this + " is none"); public Entity(ecs_entity_t value) => Value = value; diff --git a/src/gaemstone/ECS/EntityBase.cs b/src/gaemstone/ECS/EntityBase.cs index d4197fc..e05883b 100644 --- a/src/gaemstone/ECS/EntityBase.cs +++ b/src/gaemstone/ECS/EntityBase.cs @@ -1,4 +1,4 @@ -using static gaemstone.ECS.BuiltIn; +using static gaemstone.Flecs.Core; namespace gaemstone.ECS; diff --git a/src/gaemstone/ECS/System.cs b/src/gaemstone/ECS/System.cs index eaf4655..0474234 100644 --- a/src/gaemstone/ECS/System.cs +++ b/src/gaemstone/ECS/System.cs @@ -1,9 +1,11 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using gaemstone.Flecs; using gaemstone.Utility; using gaemstone.Utility.IL; using static flecs_hub.flecs; +using static gaemstone.Flecs.Core; namespace gaemstone.ECS; @@ -26,7 +28,7 @@ public static class SystemExtensions var desc = new ecs_system_desc_t { query = query.ToFlecs(), entity = universe.New(name) - .Add(phase) + .Add(phase) .Add(phase) .Build(), binding_ctx = (void*)CallbackContextHelper.Create((universe, callback)), diff --git a/src/gaemstone/ECS/Universe+Modules.cs b/src/gaemstone/ECS/Universe+Modules.cs index 01edca4..d0c5b02 100644 --- a/src/gaemstone/ECS/Universe+Modules.cs +++ b/src/gaemstone/ECS/Universe+Modules.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using gaemstone.Utility; -using static gaemstone.ECS.BuiltIn; +using static gaemstone.Flecs.Core; namespace gaemstone.ECS; diff --git a/src/gaemstone/ECS/Universe.cs b/src/gaemstone/ECS/Universe.cs index 663655b..8f49a06 100644 --- a/src/gaemstone/ECS/Universe.cs +++ b/src/gaemstone/ECS/Universe.cs @@ -18,9 +18,9 @@ public unsafe partial class Universe CStrings.FreeCStrings(argv, args.Length); Modules = new(this); - Modules.Register(typeof(BuiltIn)); - Modules.Register(typeof(ObserverEvent)); - Modules.Register(typeof(SystemPhase)); + Modules.Register(typeof(Flecs.Core)); + Modules.Register(typeof(Flecs.ObserverEvent)); + Modules.Register(typeof(Flecs.SystemPhase)); New("Game", "Game").Build().CreateLookup(); } diff --git a/src/gaemstone/ECS/BuiltIn.cs b/src/gaemstone/Flecs/Core.cs similarity index 91% rename from src/gaemstone/ECS/BuiltIn.cs rename to src/gaemstone/Flecs/Core.cs index 18aa9b3..c4618b8 100644 --- a/src/gaemstone/ECS/BuiltIn.cs +++ b/src/gaemstone/Flecs/Core.cs @@ -1,7 +1,9 @@ -namespace gaemstone.ECS; +using gaemstone.ECS; + +namespace gaemstone.Flecs; [Module(Name = "flecs.core")] -public static class BuiltIn +public static class Core { // Entity Tags [Tag] public struct Module { } diff --git a/src/gaemstone/ECS/FlecsException.cs b/src/gaemstone/Flecs/FlecsException.cs similarity index 89% rename from src/gaemstone/ECS/FlecsException.cs rename to src/gaemstone/Flecs/FlecsException.cs index 5c90a12..d280d8e 100644 --- a/src/gaemstone/ECS/FlecsException.cs +++ b/src/gaemstone/Flecs/FlecsException.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using static flecs_hub.flecs; -namespace gaemstone.ECS; +namespace gaemstone.Flecs; public class FlecsException : Exception @@ -31,5 +31,6 @@ public class FlecsAbortException } [UnmanagedCallersOnly] - private static void Abort() => throw new FlecsAbortException(); + private static void Abort() + => throw new FlecsAbortException(); } diff --git a/src/gaemstone/ECS/BuiltIn+ObserverEvent.cs b/src/gaemstone/Flecs/ObserverEvent.cs similarity index 93% rename from src/gaemstone/ECS/BuiltIn+ObserverEvent.cs rename to src/gaemstone/Flecs/ObserverEvent.cs index fd99d79..ec4c740 100644 --- a/src/gaemstone/ECS/BuiltIn+ObserverEvent.cs +++ b/src/gaemstone/Flecs/ObserverEvent.cs @@ -1,6 +1,6 @@ -using System.Reflection; +using gaemstone.ECS; -namespace gaemstone.ECS; +namespace gaemstone.Flecs; [Module(Name = "flecs.core")] public static class ObserverEvent diff --git a/src/gaemstone/ECS/BuiltIn+SystemPhase.cs b/src/gaemstone/Flecs/SystemPhase.cs similarity index 98% rename from src/gaemstone/ECS/BuiltIn+SystemPhase.cs rename to src/gaemstone/Flecs/SystemPhase.cs index 9c3b070..34f0dfb 100644 --- a/src/gaemstone/ECS/BuiltIn+SystemPhase.cs +++ b/src/gaemstone/Flecs/SystemPhase.cs @@ -1,4 +1,6 @@ -namespace gaemstone.ECS; +using gaemstone.ECS; + +namespace gaemstone.Flecs; [Module(Name = "flecs.pipeline")] public static class SystemPhase diff --git a/src/gaemstone/Systems/Monitor.cs b/src/gaemstone/Flecs/Systems/Monitor.cs similarity index 92% rename from src/gaemstone/Systems/Monitor.cs rename to src/gaemstone/Flecs/Systems/Monitor.cs index 52fa273..dae75a8 100644 --- a/src/gaemstone/Systems/Monitor.cs +++ b/src/gaemstone/Flecs/Systems/Monitor.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using gaemstone.ECS; using static flecs_hub.flecs; -namespace gaemstone.Systems; +namespace gaemstone.Flecs.Systems; [Module(Name = "flecs.monitor")] public unsafe class Monitor diff --git a/src/gaemstone/Systems/Rest.cs b/src/gaemstone/Flecs/Systems/Rest.cs similarity index 93% rename from src/gaemstone/Systems/Rest.cs rename to src/gaemstone/Flecs/Systems/Rest.cs index 8d156d3..96481fc 100644 --- a/src/gaemstone/Systems/Rest.cs +++ b/src/gaemstone/Flecs/Systems/Rest.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using gaemstone.ECS; using static flecs_hub.flecs; -namespace gaemstone.Systems; +namespace gaemstone.Flecs.Systems; [Module(Name = "flecs.rest")] public unsafe class Rest