From dae72b11c5b2643c79bae8e2dcaad42587d34445 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sun, 13 Apr 2025 19:12:34 +0300 Subject: [PATCH] refactor: renamed AssertHelpers namespace to Core.Debug --- Engine.Core/Behaviour.cs | 7 +++---- Engine.Core/BehaviourBase.cs | 6 ++---- Engine.Core/BehaviourController.cs | 3 +-- Engine.Core/GameManager.cs | 5 ++--- Engine.Core/Helpers/AssertHelpers.cs | 15 +++++++-------- 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Engine.Core/Behaviour.cs b/Engine.Core/Behaviour.cs index a93e240..c528d8b 100644 --- a/Engine.Core/Behaviour.cs +++ b/Engine.Core/Behaviour.cs @@ -1,5 +1,4 @@ using Syntriax.Engine.Core.Abstract; -using Syntriax.Engine.Core.Helpers; namespace Syntriax.Engine.Core; @@ -56,7 +55,7 @@ public abstract class Behaviour : BehaviourBase protected virtual void OnPreUpdate() { } protected virtual void PreUpdate(IBehaviourController _) { - AssertHelpers.AssertInitialized(this); + Debug.AssertHelpers.AssertInitialized(this); OnPreUpdatePreActiveCheck(); @@ -80,7 +79,7 @@ public abstract class Behaviour : BehaviourBase protected virtual void OnUpdate() { } protected virtual void Update(IBehaviourController _) { - AssertHelpers.AssertInitialized(this); + Debug.AssertHelpers.AssertInitialized(this); OnUpdatePreActiveCheck(); @@ -94,7 +93,7 @@ public abstract class Behaviour : BehaviourBase protected virtual void OnPreDraw() { } protected virtual void PreDraw(IBehaviourController _) { - AssertHelpers.AssertInitialized(this); + Debug.AssertHelpers.AssertInitialized(this); OnPreDrawPreActiveCheck(); diff --git a/Engine.Core/BehaviourBase.cs b/Engine.Core/BehaviourBase.cs index 7f76c95..a3d18e0 100644 --- a/Engine.Core/BehaviourBase.cs +++ b/Engine.Core/BehaviourBase.cs @@ -1,6 +1,4 @@ using Syntriax.Engine.Core.Abstract; -using Syntriax.Engine.Core.Exceptions; -using Syntriax.Engine.Core.Helpers; namespace Syntriax.Engine.Core; @@ -70,8 +68,8 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour protected override void InitializeInternal() { - AssertHelpers.AssertBehaviourControllerAssigned(this); - AssertHelpers.AssertStateEnableAssigned(this); + Debug.AssertHelpers.AssertBehaviourControllerAssigned(this); + Debug.AssertHelpers.AssertStateEnableAssigned(this); } private void OnStateEnabledChanged(IStateEnable sender, bool previousState) => UpdateActive(); diff --git a/Engine.Core/BehaviourController.cs b/Engine.Core/BehaviourController.cs index ad226d9..85ac6a5 100644 --- a/Engine.Core/BehaviourController.cs +++ b/Engine.Core/BehaviourController.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using Syntriax.Engine.Core.Abstract; -using Syntriax.Engine.Core.Helpers; namespace Syntriax.Engine.Core; @@ -141,7 +140,7 @@ public class BehaviourController : IBehaviourController if (IsInitialized) return false; - AssertHelpers.AssertHierarchyObjectAssigned(this); + Debug.AssertHelpers.AssertHierarchyObjectAssigned(this); foreach (IBehaviour behaviour in behaviours) behaviour.Initialize(); diff --git a/Engine.Core/GameManager.cs b/Engine.Core/GameManager.cs index 781f162..9fc6b81 100644 --- a/Engine.Core/GameManager.cs +++ b/Engine.Core/GameManager.cs @@ -3,7 +3,6 @@ using System.Collections; using System.Collections.Generic; using Syntriax.Engine.Core.Abstract; -using Syntriax.Engine.Core.Helpers; namespace Syntriax.Engine.Core; @@ -102,7 +101,7 @@ public class GameManager : BaseEntity, IGameManager public void Update(EngineTime engineTime) { - AssertHelpers.AssertInitialized(this); + Debug.AssertHelpers.AssertInitialized(this); UnscaledTime = engineTime; Time = new(TimeSpan.FromTicks((long)(Time.TimeSinceStart.Ticks + engineTime.DeltaSpan.Ticks * TimeScale)), TimeSpan.FromTicks((long)(engineTime.DeltaSpan.Ticks * TimeScale))); @@ -117,7 +116,7 @@ public class GameManager : BaseEntity, IGameManager public void PreDraw() { - AssertHelpers.AssertInitialized(this); + Debug.AssertHelpers.AssertInitialized(this); for (int i = 0; i < HierarchyObjects.Count; i++) HierarchyObjects[i].BehaviourController.UpdatePreDraw(); diff --git a/Engine.Core/Helpers/AssertHelpers.cs b/Engine.Core/Helpers/AssertHelpers.cs index c4e2e97..f01a167 100644 --- a/Engine.Core/Helpers/AssertHelpers.cs +++ b/Engine.Core/Helpers/AssertHelpers.cs @@ -1,33 +1,32 @@ -using System.Diagnostics; using System.Runtime.CompilerServices; using Syntriax.Engine.Core.Abstract; -namespace Syntriax.Engine.Core.Helpers; +namespace Syntriax.Engine.Core.Debug; public class AssertHelpers { [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void AssertInitialized(IInitializable initializable) - => Debug.Assert(initializable.IsInitialized, $"{initializable.GetType().Name} must be initialized"); + => System.Diagnostics.Debug.Assert(initializable.IsInitialized, $"{initializable.GetType().Name} must be initialized"); [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void AssertBehaviourControllerAssigned(IHasBehaviourController assignable) - => Debug.Assert(assignable.BehaviourController is not null, $"{assignable.GetType().Name} must be initialized"); + => System.Diagnostics.Debug.Assert(assignable.BehaviourController is not null, $"{assignable.GetType().Name} must be initialized"); [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void AssertEntityAssigned(IHasEntity assignable) - => Debug.Assert(assignable.Entity is not null, $"{assignable.GetType().Name} must be initialized"); + => System.Diagnostics.Debug.Assert(assignable.Entity is not null, $"{assignable.GetType().Name} must be initialized"); [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void AssertGameManagerAssigned(IHasGameManager assignable) - => Debug.Assert(assignable.GameManager is not null, $"{assignable.GetType().Name} must be initialized"); + => System.Diagnostics.Debug.Assert(assignable.GameManager is not null, $"{assignable.GetType().Name} must be initialized"); [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void AssertHierarchyObjectAssigned(IHasHierarchyObject assignable) - => Debug.Assert(assignable.HierarchyObject is not null, $"{assignable.GetType().Name} must be initialized"); + => System.Diagnostics.Debug.Assert(assignable.HierarchyObject is not null, $"{assignable.GetType().Name} must be initialized"); [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void AssertStateEnableAssigned(IHasStateEnable assignable) - => Debug.Assert(assignable.StateEnable is not null, $"{assignable.GetType().Name} must be initialized"); + => System.Diagnostics.Debug.Assert(assignable.StateEnable is not null, $"{assignable.GetType().Name} must be initialized"); }