From c7aafd85bc10fbeca27295a1432079d70e31800f Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sat, 3 May 2025 15:37:52 +0300 Subject: [PATCH] refactor: renamed assert helper and moved to Debug subfolder --- Engine.Core/.gitignore | 2 ++ Engine.Core/Behaviour.cs | 6 +++--- Engine.Core/BehaviourBase.cs | 4 ++-- Engine.Core/BehaviourController.cs | 6 +++--- Engine.Core/{Helpers => Debug}/AssertHelpers.cs | 2 +- Engine.Core/Universe.cs | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) rename Engine.Core/{Helpers => Debug}/AssertHelpers.cs (98%) diff --git a/Engine.Core/.gitignore b/Engine.Core/.gitignore index 104b544..3cca8d5 100644 --- a/Engine.Core/.gitignore +++ b/Engine.Core/.gitignore @@ -482,3 +482,5 @@ $RECYCLE.BIN/ # Vim temporary swap files *.swp + +!Debug diff --git a/Engine.Core/Behaviour.cs b/Engine.Core/Behaviour.cs index 1d3fb7b..25a7edb 100644 --- a/Engine.Core/Behaviour.cs +++ b/Engine.Core/Behaviour.cs @@ -53,7 +53,7 @@ public abstract class Behaviour : BehaviourBase protected virtual void OnPreUpdate() { } protected virtual void PreUpdate(IBehaviourController _) { - Debug.AssertHelpers.AssertInitialized(this); + Debug.Assert.AssertInitialized(this); OnPreUpdatePreActiveCheck(); @@ -77,7 +77,7 @@ public abstract class Behaviour : BehaviourBase protected virtual void OnUpdate() { } protected virtual void Update(IBehaviourController _) { - Debug.AssertHelpers.AssertInitialized(this); + Debug.Assert.AssertInitialized(this); OnUpdatePreActiveCheck(); @@ -91,7 +91,7 @@ public abstract class Behaviour : BehaviourBase protected virtual void OnPreDraw() { } protected virtual void PreDraw(IBehaviourController _) { - Debug.AssertHelpers.AssertInitialized(this); + Debug.Assert.AssertInitialized(this); OnPreDrawPreActiveCheck(); diff --git a/Engine.Core/BehaviourBase.cs b/Engine.Core/BehaviourBase.cs index b30d51b..b0aa87e 100644 --- a/Engine.Core/BehaviourBase.cs +++ b/Engine.Core/BehaviourBase.cs @@ -66,8 +66,8 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour protected override void InitializeInternal() { - Debug.AssertHelpers.AssertBehaviourControllerAssigned(this); - Debug.AssertHelpers.AssertStateEnableAssigned(this); + Debug.Assert.AssertBehaviourControllerAssigned(this); + Debug.Assert.AssertStateEnableAssigned(this); } private void OnStateEnabledChanged(IStateEnable sender, bool previousState) => UpdateActive(); diff --git a/Engine.Core/BehaviourController.cs b/Engine.Core/BehaviourController.cs index ee31151..0560833 100644 --- a/Engine.Core/BehaviourController.cs +++ b/Engine.Core/BehaviourController.cs @@ -113,7 +113,7 @@ public class BehaviourController : BaseEntity, IBehaviourController protected override void InitializeInternal() { - Debug.AssertHelpers.AssertUniverseObjectAssigned(this); + Debug.Assert.AssertUniverseObjectAssigned(this); foreach (IBehaviour behaviour in behaviours) behaviour.Initialize(); @@ -127,7 +127,7 @@ public class BehaviourController : BaseEntity, IBehaviourController public void Update() { - Debug.AssertHelpers.AssertInitialized(this); + Debug.Assert.AssertInitialized(this); if (!UniverseObject.StateEnable.Enabled || !StateEnable.Enabled) return; @@ -138,7 +138,7 @@ public class BehaviourController : BaseEntity, IBehaviourController public void UpdatePreDraw() { - Debug.AssertHelpers.AssertInitialized(this); + Debug.Assert.AssertInitialized(this); if (!UniverseObject.StateEnable.Enabled || !StateEnable.Enabled) return; diff --git a/Engine.Core/Helpers/AssertHelpers.cs b/Engine.Core/Debug/AssertHelpers.cs similarity index 98% rename from Engine.Core/Helpers/AssertHelpers.cs rename to Engine.Core/Debug/AssertHelpers.cs index 67e5819..0da4bc9 100644 --- a/Engine.Core/Helpers/AssertHelpers.cs +++ b/Engine.Core/Debug/AssertHelpers.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; namespace Syntriax.Engine.Core.Debug; -public class AssertHelpers +public static class Assert { [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void AssertInitialized(IInitializable initializable) diff --git a/Engine.Core/Universe.cs b/Engine.Core/Universe.cs index 0fa11eb..19e8d7b 100644 --- a/Engine.Core/Universe.cs +++ b/Engine.Core/Universe.cs @@ -110,7 +110,7 @@ public class Universe : BaseEntity, IUniverse public void Update(UniverseTime engineTime) { - Debug.AssertHelpers.AssertInitialized(this); + Debug.Assert.AssertInitialized(this); UnscaledTime = engineTime; Time = new(TimeSpan.FromTicks((long)(Time.TimeSinceStart.Ticks + engineTime.DeltaSpan.Ticks * TimeScale)), TimeSpan.FromTicks((long)(engineTime.DeltaSpan.Ticks * TimeScale))); @@ -125,7 +125,7 @@ public class Universe : BaseEntity, IUniverse public void PreDraw() { - Debug.AssertHelpers.AssertInitialized(this); + Debug.Assert.AssertInitialized(this); for (int i = 0; i < UniverseObjects.Count; i++) UniverseObjects[i].BehaviourController.UpdatePreDraw();