Syntriax/Syntriax.Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf!: events refactored throughout all the project to use Event<> class

Browse Source 
All delegate events are refactored to use the Event<TSender> and Event<TSender, TArgument> for performance issues regarding delegate events creating garbage, also this gives us better control on event invocation since C# Delegates did also create unnecessary garbage during Delegate.DynamicInvoke
This commit is contained in:
Syntriax 2025-05-31 00:14:43 +03:00
parent 996e61d0ad
commit 61e2761580
58 changed files with 637 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Engine.Core/Abstract/Assignable/IAssignable.cs
View File

@ -8,7 +8,7 @@ public interface IAssignable
/// <summary> /// <summary>
/// Event triggered when the <see cref="IAssignable"/>'s fields are unassigned and completely ready to recycle. /// Event triggered when the <see cref="IAssignable"/>'s fields are unassigned and completely ready to recycle.
/// </summary> /// </summary>
event UnassignEventHandler? OnUnassigned; Event<IAssignable>? OnUnassigned { get; }
/// <summary> /// <summary>
/// Unassign <see cref="IAssignable"/>'s all fields and make it ready to recycle. /// Unassign <see cref="IAssignable"/>'s all fields and make it ready to recycle.
@ -17,6 +17,4 @@ public interface IAssignable
/// <see cref="true"/>, if the fields are unsigned successfully, <see cref="false"/> if not. /// <see cref="true"/>, if the fields are unsigned successfully, <see cref="false"/> if not.
/// </returns> /// </returns>
bool Unassign(); bool Unassign();
delegate void UnassignEventHandler(IAssignable sender);
} }

4
Engine.Core/Abstract/Assignable/IHasBehaviourController.cs
View File

@ -8,7 +8,7 @@ public interface IHasBehaviourController : IAssignable
/// <summary> /// <summary>
/// Event triggered when the <see cref="IBehaviourController"/> value has has been assigned a new value. /// Event triggered when the <see cref="IBehaviourController"/> value has has been assigned a new value.
/// </summary> /// </summary>
event BehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned; Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; }
/// <inheritdoc cref="IBehaviourController" /> /// <inheritdoc cref="IBehaviourController" />
IBehaviourController BehaviourController { get; } IBehaviourController BehaviourController { get; }
@ -21,6 +21,4 @@ public interface IHasBehaviourController : IAssignable
/// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not. /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
/// </returns> /// </returns>
bool Assign(IBehaviourController behaviourController); bool Assign(IBehaviourController behaviourController);
delegate void BehaviourControllerAssignedEventHandler(IHasBehaviourController sender);
} }

4
Engine.Core/Abstract/Assignable/IHasEntity.cs
View File

@ -8,7 +8,7 @@ public interface IHasEntity : IAssignable
/// <summary> /// <summary>
/// Event triggered when the <see cref="IEntity"/> value has has been assigned a new value. /// Event triggered when the <see cref="IEntity"/> value has has been assigned a new value.
/// </summary> /// </summary>
event EntityAssignedEventHandler? OnEntityAssigned; Event<IHasEntity> OnEntityAssigned { get; }
/// <inheritdoc cref="IEntity" /> /// <inheritdoc cref="IEntity" />
IEntity Entity { get; } IEntity Entity { get; }
@ -21,6 +21,4 @@ public interface IHasEntity : IAssignable
/// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not. /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
/// </returns> /// </returns>
bool Assign(IEntity entity); bool Assign(IEntity entity);
delegate void EntityAssignedEventHandler(IHasEntity sender);
} }

4
Engine.Core/Abstract/Assignable/IHasStateEnable.cs
View File

@ -8,7 +8,7 @@ public interface IHasStateEnable : IAssignable
/// <summary> /// <summary>
/// Event triggered when the <see cref="IStateEnable"/> value has has been assigned a new value. /// Event triggered when the <see cref="IStateEnable"/> value has has been assigned a new value.
/// </summary> /// </summary>
event StateEnableAssignedEventHandler? OnStateEnableAssigned; Event<IHasStateEnable> OnStateEnableAssigned { get; }
/// <inheritdoc cref="IStateEnable" /> /// <inheritdoc cref="IStateEnable" />
IStateEnable StateEnable { get; } IStateEnable StateEnable { get; }
@ -21,6 +21,4 @@ public interface IHasStateEnable : IAssignable
/// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not. /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
/// </returns> /// </returns>
bool Assign(IStateEnable stateEnable); bool Assign(IStateEnable stateEnable);
delegate void StateEnableAssignedEventHandler(IHasStateEnable sender);
} }

4
Engine.Core/Abstract/Assignable/IHasUniverse.cs
View File

@ -8,7 +8,7 @@ public interface IHasUniverse : IAssignable
/// <summary> /// <summary>
/// Event triggered when the <see cref="IUniverse"/> value has has been assigned a new value. /// Event triggered when the <see cref="IUniverse"/> value has has been assigned a new value.
/// </summary> /// </summary>
event UniverseAssignedEventHandler? OnUniverseAssigned; Event<IHasUniverse> OnUniverseAssigned { get; }
/// <inheritdoc cref="IUniverse" /> /// <inheritdoc cref="IUniverse" />
IUniverse Universe { get; } IUniverse Universe { get; }
@ -21,6 +21,4 @@ public interface IHasUniverse : IAssignable
/// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not. /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
/// </returns> /// </returns>
bool Assign(IUniverse universe); bool Assign(IUniverse universe);
delegate void UniverseAssignedEventHandler(IHasUniverse sender);
} }

4
Engine.Core/Abstract/Assignable/IHasUniverseObject.cs
View File

@ -8,7 +8,7 @@ public interface IHasUniverseObject : IAssignable
/// <summary> /// <summary>
/// Event triggered when the <see cref="IUniverseObject"/> value has has been assigned a new value. /// Event triggered when the <see cref="IUniverseObject"/> value has has been assigned a new value.
/// </summary> /// </summary>
event UniverseObjectAssignedEventHandler? OnUniverseObjectAssigned; Event<IHasUniverseObject> OnUniverseObjectAssigned { get; }
/// <inheritdoc cref="IUniverseObject" /> /// <inheritdoc cref="IUniverseObject" />
IUniverseObject UniverseObject { get; } IUniverseObject UniverseObject { get; }
@ -21,6 +21,4 @@ public interface IHasUniverseObject : IAssignable
/// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not. /// <see cref="true"/>, if the value given assigned successfully assigned, <see cref="false"/> if not.
/// </returns> /// </returns>
bool Assign(IUniverseObject universeObject); bool Assign(IUniverseObject universeObject);
delegate void UniverseObjectAssignedEventHandler(IHasUniverseObject sender);
} }

4
Engine.Core/Abstract/IActive.cs
View File

@ -8,12 +8,12 @@ public interface IActive
/// <summary> /// <summary>
/// Event triggered when the <see cref="IsActive"/> state of the <see cref="IActive"/> changes. /// Event triggered when the <see cref="IsActive"/> state of the <see cref="IActive"/> changes.
/// </summary> /// </summary>
event ActiveChangedEventHandler? OnActiveChanged; Event<IActive, ActiveChangedArguments> OnActiveChanged { get; }
/// <summary> /// <summary>
/// The value indicating whether the <see cref="IActive"/> is enabled. /// The value indicating whether the <see cref="IActive"/> is enabled.
/// </summary> /// </summary>
bool IsActive { get; } bool IsActive { get; }
delegate void ActiveChangedEventHandler(IActive sender, bool previousState); readonly record struct ActiveChangedArguments(bool PreviousState);
} }

4
Engine.Core/Abstract/IBehaviour.cs
View File

@ -8,12 +8,12 @@ public interface IBehaviour : IEntity, IActive, IHasBehaviourController, IHasSta
/// <summary> /// <summary>
/// Event triggered when the priority of the <see cref="IBehaviour"/> changes. /// Event triggered when the priority of the <see cref="IBehaviour"/> changes.
/// </summary> /// </summary>
event PriorityChangedEventHandler? OnPriorityChanged; Event<IBehaviour, PriorityChangedArguments> OnPriorityChanged { get; }
/// <summary> /// <summary>
/// The priority of the <see cref="IBehaviour"/>. /// The priority of the <see cref="IBehaviour"/>.
/// </summary> /// </summary>
int Priority { get; set; } int Priority { get; set; }
delegate void PriorityChangedEventHandler(IBehaviour sender, int previousPriority); readonly record struct PriorityChangedArguments(int PreviousPriority);
} }

11
Engine.Core/Abstract/IBehaviourCollector.cs
View File

@ -10,12 +10,12 @@ public interface IBehaviourCollector<T> : IHasUniverse where T : class
/// <summary> /// <summary>
/// Event triggered when an object of type <typeparamref name="T"/> is added to the collector. /// Event triggered when an object of type <typeparamref name="T"/> is added to the collector.
/// </summary> /// </summary>
event CollectedEventHandler? OnCollected; Event<IBehaviourCollector<T>, BehaviourCollectedArguments> OnCollected { get; }
/// <summary> /// <summary>
/// Event triggered when an object of type <typeparamref name="T"/> is removed from the collector. /// Event triggered when an object of type <typeparamref name="T"/> is removed from the collector.
/// </summary> /// </summary>
event RemovedEventHandler? OnRemoved; Event<IBehaviourCollector<T>, BehaviourRemovedArguments> OnRemoved { get; }
/// <summary> /// <summary>
/// Amount of <typeparamref name="T"/> collected. /// Amount of <typeparamref name="T"/> collected.
@ -32,12 +32,11 @@ public interface IBehaviourCollector<T> : IHasUniverse where T : class
/// </summary> /// </summary>
/// <param name="sender">The instance of the <see cref="IBehaviourCollector{T}"/> that triggered the event.</param> /// <param name="sender">The instance of the <see cref="IBehaviourCollector{T}"/> that triggered the event.</param>
/// <param name="behaviourCollected">The object of type <typeparamref name="T"/> that was added to the collector.</param> /// <param name="behaviourCollected">The object of type <typeparamref name="T"/> that was added to the collector.</param>
delegate void CollectedEventHandler(IBehaviourCollector<T> sender, T behaviourCollected); readonly record struct BehaviourCollectedArguments(T BehaviourCollected);
/// <summary> /// <summary>
/// Delegate for handling the <see cref="OnRemoved"/> event. /// Delegate for handling the <see cref="OnRemoved"/> event.
/// </summary> /// </summary>
/// <param name="sender">The instance of the <see cref="IBehaviourCollector{T}"/> that triggered the event.</param> /// <param name="BehaviourRemoved">The object of type <typeparamref name="T"/> that was removed from the collector.</param>
/// <param name="behaviourRemoved">The object of type <typeparamref name="T"/> that was removed from the collector.</param> readonly record struct BehaviourRemovedArguments(T BehaviourRemoved);
delegate void RemovedEventHandler(IBehaviourCollector<T> sender, T behaviourRemoved);
} }

8
Engine.Core/Abstract/IBehaviourController.cs
View File

@ -10,12 +10,12 @@ public interface IBehaviourController : IEntity, IHasUniverseObject
/// <summary> /// <summary>
/// Event triggered when a <see cref="IBehaviour"/> is added to the <see cref="IBehaviourController"/>. /// Event triggered when a <see cref="IBehaviour"/> is added to the <see cref="IBehaviourController"/>.
/// </summary> /// </summary>
event BehaviourAddedEventHandler? OnBehaviourAdded; Event<IBehaviourController, BehaviourAddedArguments> OnBehaviourAdded { get; }
/// <summary> /// <summary>
/// Event triggered when a <see cref="IBehaviour"/> is removed from the <see cref="IBehaviourController"/>. /// Event triggered when a <see cref="IBehaviour"/> is removed from the <see cref="IBehaviourController"/>.
/// </summary> /// </summary>
event BehaviourRemovedEventHandler? OnBehaviourRemoved; Event<IBehaviourController, BehaviourRemovedArguments> OnBehaviourRemoved { get; }
/// <summary> /// <summary>
/// Amount of <see cref="IBehaviour"/> collected. /// Amount of <see cref="IBehaviour"/> collected.
@ -78,6 +78,6 @@ public interface IBehaviourController : IEntity, IHasUniverseObject
/// <param name="behaviour">The <see cref="IBehaviour"/> to remove.</param> /// <param name="behaviour">The <see cref="IBehaviour"/> to remove.</param>
void RemoveBehaviour<T>(T behaviour) where T : class, IBehaviour; void RemoveBehaviour<T>(T behaviour) where T : class, IBehaviour;
delegate void BehaviourAddedEventHandler(IBehaviourController sender, IBehaviour behaviourAdded); readonly record struct BehaviourAddedArguments(IBehaviour BehaviourAdded);
delegate void BehaviourRemovedEventHandler(IBehaviourController sender, IBehaviour behaviourRemoved); readonly record struct BehaviourRemovedArguments(IBehaviour BehaviourRemoved);
} }

4
Engine.Core/Abstract/IEntity.cs
View File

@ -9,12 +9,12 @@ public interface IEntity : IInitializable, IHasStateEnable
/// Event triggered when the <see cref="Id"/> of the <see cref="IEntity"/> changes. /// Event triggered when the <see cref="Id"/> of the <see cref="IEntity"/> changes.
/// The string action parameter is the previous <see cref="Id"/> of the <see cref="IEntity"/>. /// The string action parameter is the previous <see cref="Id"/> of the <see cref="IEntity"/>.
/// </summary> /// </summary>
event IdChangedEventHandler? OnIdChanged; Event<IEntity, IdChangedArguments> OnIdChanged { get; }
/// <summary> /// <summary>
/// The ID of the <see cref="IEntity"/>. /// The ID of the <see cref="IEntity"/>.
/// </summary> /// </summary>
string Id { get; set; } string Id { get; set; }
delegate void IdChangedEventHandler(IEntity sender, string previousId); readonly record struct IdChangedArguments(string PreviousId);
} }

7
Engine.Core/Abstract/IInitializable.cs
View File

@ -8,12 +8,12 @@ public interface IInitializable
/// <summary> /// <summary>
/// Event triggered when the <see cref="Initialize"/> method is called successfully. /// Event triggered when the <see cref="Initialize"/> method is called successfully.
/// </summary> /// </summary>
event InitializedEventHandler? OnInitialized; Event<IInitializable> OnInitialized { get; }
/// <summary> /// <summary>
/// Event triggered when the <see cref="IInitializable"/> method is called successfully. /// Event triggered when the <see cref="IInitializable"/> method is called successfully.
/// </summary> /// </summary>
event FinalizedEventHandler? OnFinalized; Event<IInitializable> OnFinalized { get; }
/// <summary> /// <summary>
/// The value indicating whether the entity has been initialized. /// The value indicating whether the entity has been initialized.
@ -31,7 +31,4 @@ public interface IInitializable
/// </summary> /// </summary>
/// <returns><see cref="true"/> if finalization is successful, otherwise <see cref="false"/>.</returns> /// <returns><see cref="true"/> if finalization is successful, otherwise <see cref="false"/>.</returns>
bool Finalize(); bool Finalize();
delegate void InitializedEventHandler(IInitializable sender);
delegate void FinalizedEventHandler(IInitializable sender);
} }

4
Engine.Core/Abstract/INameable.cs
View File

@ -8,12 +8,12 @@ public interface INameable
/// <summary> /// <summary>
/// Event triggered when the name of the entity changes. /// Event triggered when the name of the entity changes.
/// </summary> /// </summary>
event NameChangedEventHandler? OnNameChanged; Event<INameable, NameChangedArguments> OnNameChanged { get; }
/// <summary> /// <summary>
/// The name of the entity. /// The name of the entity.
/// </summary> /// </summary>
string Name { get; set; } string Name { get; set; }
delegate void NameChangedEventHandler(INameable sender, string previousName); readonly record struct NameChangedArguments(string PreviousName);
} }

4
Engine.Core/Abstract/IStateEnable.cs
View File

@ -8,12 +8,12 @@ public interface IStateEnable : IHasEntity
/// <summary> /// <summary>
/// Event triggered when the <see cref="Enabled"/> state of the <see cref="IStateEnable"/> changes. /// Event triggered when the <see cref="Enabled"/> state of the <see cref="IStateEnable"/> changes.
/// </summary> /// </summary>
event EnabledChangedEventHandler? OnEnabledChanged; Event<IStateEnable, EnabledChangedArguments> OnEnabledChanged { get; }
/// <summary> /// <summary>
/// The value indicating whether the <see cref="IStateEnable"/> is enabled. /// The value indicating whether the <see cref="IStateEnable"/> is enabled.
/// </summary> /// </summary>
bool Enabled { get; set; } bool Enabled { get; set; }
delegate void EnabledChangedEventHandler(IStateEnable sender, bool previousState); readonly record struct EnabledChangedArguments(bool PreviousState);
} }

27
Engine.Core/Abstract/ITransform2D.cs
View File

@ -8,17 +8,17 @@ public interface ITransform2D : IBehaviour
/// <summary> /// <summary>
/// Event triggered when the <see cref="Position"/> of the <see cref="ITransform2D"/> changes. /// Event triggered when the <see cref="Position"/> of the <see cref="ITransform2D"/> changes.
/// </summary> /// </summary>
event PositionChangedEventHandler? OnPositionChanged; Event<ITransform2D, PositionChangedArguments> OnPositionChanged { get; }
/// <summary> /// <summary>
/// Event triggered when the <see cref="Scale"/> of the <see cref="ITransform2D"/> changes. /// Event triggered when the <see cref="Scale"/> of the <see cref="ITransform2D"/> changes.
/// </summary> /// </summary>
event ScaleChangedEventHandler? OnScaleChanged; Event<ITransform2D, ScaleChangedArguments> OnScaleChanged { get; }
/// <summary> /// <summary>
/// Event triggered when the <see cref="Rotation"/> of the <see cref="ITransform"/> changes. /// Event triggered when the <see cref="Rotation"/> of the <see cref="ITransform"/> changes.
/// </summary> /// </summary>
event RotationChangedEventHandler? OnRotationChanged; Event<ITransform2D, RotationChangedArguments> OnRotationChanged { get; }
/// <summary> /// <summary>
/// The world position of the <see cref="ITransform2D"/> in 2D space. /// The world position of the <see cref="ITransform2D"/> in 2D space.
@ -51,23 +51,20 @@ public interface ITransform2D : IBehaviour
float LocalRotation { get; set; } float LocalRotation { get; set; }
/// <summary> /// <summary>
/// Delegate for the event triggered when the <see cref="ITransform2D"/>'s rotation changes. /// Arguments for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
/// </summary> /// </summary>
/// <param name="sender">The <see cref="ITransform2D"/> that the parent has changed.</param> /// <param name="PreviousPosition">The previous <see cref="Position"/> of the <see cref="ITransform2D"/>.</param>
/// <param name="previousPosition">The previous <see cref="Position"/> of the <see cref="ITransform2D"/>.</param> readonly record struct PositionChangedArguments(Vector2D PreviousPosition);
delegate void PositionChangedEventHandler(ITransform2D sender, Vector2D previousPosition);
/// <summary> /// <summary>
/// Delegate for the event triggered when the <see cref="ITransform2D"/>'s rotation changes. /// Arguments for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
/// </summary> /// </summary>
/// <param name="sender">The <see cref="ITransform2D"/> that the parent has changed.</param> /// <param name="PreviousScale">The previous <see cref="Scale"/> of the <see cref="ITransform2D"/>.</param>
/// <param name="previousScale">The previous <see cref="Scale"/> of the <see cref="ITransform2D"/>.</param> readonly record struct ScaleChangedArguments(Vector2D PreviousScale);
delegate void ScaleChangedEventHandler(ITransform2D sender, Vector2D previousScale);
/// <summary> /// <summary>
/// Delegate for the event triggered when the <see cref="ITransform2D"/>'s rotation changes. /// Arguments for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
/// </summary> /// </summary>
/// <param name="sender">The <see cref="ITransform2D"/> that the parent has changed.</param> /// <param name="PreviousRotation">The previous <see cref="Rotation"/> of the <see cref="ITransform2D"/>.</param>
/// <param name="previousRotation">The previous <see cref="Rotation"/> of the <see cref="ITransform2D"/>.</param> readonly record struct RotationChangedArguments(float PreviousRotation);
delegate void RotationChangedEventHandler(ITransform2D sender, float previousRotation);
} }

29
Engine.Core/Abstract/IUniverse.cs
View File

@ -10,47 +10,47 @@ public interface IUniverse : IEntity, IEnumerable<IUniverseObject>
/// <summary> /// <summary>
/// Event triggered when <see cref="Update(UniverseTime)"/> is about to be called called on the <see cref="IUniverse"/>. /// Event triggered when <see cref="Update(UniverseTime)"/> is about to be called called on the <see cref="IUniverse"/>.
/// </summary> /// </summary>
event UpdateEventHandler? OnPreUpdate; Event<IUniverse, UpdateArguments> OnPreUpdate { get; }
/// <summary> /// <summary>
/// Event triggered when <see cref="Update(UniverseTime)"/> is called on the <see cref="IUniverse"/>. /// Event triggered when <see cref="Update(UniverseTime)"/> is called on the <see cref="IUniverse"/>.
/// </summary> /// </summary>
event UpdateEventHandler? OnUpdate; Event<IUniverse, UpdateArguments> OnUpdate { get; }
/// <summary> /// <summary>
/// Event triggered after <see cref="Update(UniverseTime)"/> is called on the <see cref="IUniverse"/>. /// Event triggered after <see cref="Update(UniverseTime)"/> is called on the <see cref="IUniverse"/>.
/// </summary> /// </summary>
event UpdateEventHandler? OnPostUpdate; Event<IUniverse, UpdateArguments> OnPostUpdate { get; }
/// <summary> /// <summary>
/// Event triggered when <see cref="Draw"/> is about to be called called on the <see cref="IUniverse"/>. /// Event triggered when <see cref="Draw"/> is about to be called called on the <see cref="IUniverse"/>.
/// </summary> /// </summary>
event DrawEventHandler? OnPreDraw; Event<IUniverse> OnPreDraw { get; }
/// <summary> /// <summary>
/// Event triggered when <see cref="Draw"/> is called on the <see cref="IUniverse"/>. /// Event triggered when <see cref="Draw"/> is called on the <see cref="IUniverse"/>.
/// </summary> /// </summary>
event DrawEventHandler? OnDraw; Event<IUniverse> OnDraw { get; }
/// <summary> /// <summary>
/// Event triggered after <see cref="Draw"/> is called on the <see cref="IUniverse"/>. /// Event triggered after <see cref="Draw"/> is called on the <see cref="IUniverse"/>.
/// </summary> /// </summary>
event DrawEventHandler? OnPostDraw; Event<IUniverse> OnPostDraw { get; }
/// <summary> /// <summary>
/// Event triggered when a <see cref="IUniverseObject"/> is registered to the <see cref="IUniverse"/>. /// Event triggered when a <see cref="IUniverseObject"/> is registered to the <see cref="IUniverse"/>.
/// </summary> /// </summary>
event UniverseObjectRegisteredEventHandler? OnUniverseObjectRegistered; Event<IUniverse, UniverseObjectRegisteredArguments> OnUniverseObjectRegistered { get; }
/// <summary> /// <summary>
/// Event triggered when a <see cref="IUniverseObject"/> is unregistered from the <see cref="IUniverse"/>. /// Event triggered when a <see cref="IUniverseObject"/> is unregistered from the <see cref="IUniverse"/>.
/// </summary> /// </summary>
event UniverseObjectUnRegisteredEventHandler? OnUniverseObjectUnRegistered; Event<IUniverse, UniverseObjectUnRegisteredArguments> OnUniverseObjectUnRegistered { get; }
/// <summary> /// <summary>
/// Event triggered when <see cref="TimeScale"/> is changed on the <see cref="IUniverse"/>. /// Event triggered when <see cref="TimeScale"/> is changed on the <see cref="IUniverse"/>.
/// </summary> /// </summary>
event TimeScaleChangedEventHandler? OnTimeScaleChanged; Event<IUniverse, TimeScaleChangedArguments> OnTimeScaleChanged { get; }
/// <summary> /// <summary>
/// Current time scale the <see cref="IUniverse"/> operates on. /// Current time scale the <see cref="IUniverse"/> operates on.
@ -103,11 +103,8 @@ public interface IUniverse : IEntity, IEnumerable<IUniverseObject>
/// </summary> /// </summary>
void Draw(); void Draw();
delegate void TimeScaleChangedEventHandler(IUniverse sender, float previousTimeScale); readonly record struct TimeScaleChangedArguments(float PreviousTimeScale);
readonly record struct UpdateArguments(UniverseTime EngineTime);
delegate void UpdateEventHandler(IUniverse sender, UniverseTime engineTime); readonly record struct UniverseObjectRegisteredArguments(IUniverseObject UniverseObjectRegistered);
delegate void DrawEventHandler(IUniverse sender); readonly record struct UniverseObjectUnRegisteredArguments(IUniverseObject UniverseObjectUnregistered);
delegate void UniverseObjectRegisteredEventHandler(IUniverse sender, IUniverseObject universeObjectRegistered);
delegate void UniverseObjectUnRegisteredEventHandler(IUniverse sender, IUniverseObject universeObjectUnregistered);
} }

28
Engine.Core/Abstract/IUniverseObject.cs
View File

@ -12,27 +12,27 @@ public interface IUniverseObject : IEntity, IActive, INameable, IHasBehaviourCon
/// <summary> /// <summary>
/// Event triggered when the <see cref="IUniverseObject"/> enters the universe. /// Event triggered when the <see cref="IUniverseObject"/> enters the universe.
/// </summary> /// </summary>
event EnteredUniverseEventHandler? OnEnteredUniverse; Event<IUniverseObject, EnteredUniverseArguments> OnEnteredUniverse { get; }
/// <summary> /// <summary>
/// Event triggered when the <see cref="IUniverseObject"/> exits the universe. /// Event triggered when the <see cref="IUniverseObject"/> exits the universe.
/// </summary> /// </summary>
event ExitedUniverseEventHandler? OnExitedUniverse; Event<IUniverseObject, ExitedUniverseArguments> OnExitedUniverse { get; }
/// <summary> /// <summary>
/// Event triggered when the <see cref="Parent"/> of the <see cref="IUniverseObject"/> changes. The second parameter is the old <see cref="IUniverseObject"/>. /// Event triggered when the <see cref="Parent"/> of the <see cref="IUniverseObject"/> changes. The second parameter is the old <see cref="IUniverseObject"/>.
/// </summary> /// </summary>
event ParentChangedEventHandler? OnParentChanged; Event<IUniverseObject, ParentChangedArguments> OnParentChanged { get; }
/// <summary> /// <summary>
/// Event triggered when a new <see cref="IUniverseObject"/> is added to the <see cref="Children"/>. /// Event triggered when a new <see cref="IUniverseObject"/> is added to the <see cref="Children"/>.
/// </summary> /// </summary>
event ChildrenAddedEventHandler? OnChildrenAdded; Event<IUniverseObject, ChildrenAddedArguments> OnChildrenAdded { get; }
/// <summary> /// <summary>
/// Event triggered when an <see cref="IUniverseObject"/> is removed from the <see cref="Children"/>. /// Event triggered when an <see cref="IUniverseObject"/> is removed from the <see cref="Children"/>.
/// </summary> /// </summary>
event ChildrenRemovedEventHandler? OnChildrenRemoved; Event<IUniverseObject, ChildrenRemovedArguments> OnChildrenRemoved { get; }
/// <summary> /// <summary>
/// Gets the <see cref="IUniverse"/> this <see cref="IUniverseObject"/> is connected to, if any. /// Gets the <see cref="IUniverse"/> this <see cref="IUniverseObject"/> is connected to, if any.
@ -94,38 +94,38 @@ public interface IUniverseObject : IEntity, IActive, INameable, IHasBehaviourCon
void RemoveChild(IUniverseObject universeObject); void RemoveChild(IUniverseObject universeObject);
/// <summary> /// <summary>
/// EventHandler delegate for the event triggered when the <see cref="IUniverseObject"/> enters the universe of a <see cref="IUniverse">. /// Arguments for the event triggered when the <see cref="IUniverseObject"/> enters the universe of a <see cref="IUniverse">.
/// </summary> /// </summary>
/// <param name="sender">The <see cref="IUniverseObject"/> that entered the universe.</param> /// <param name="sender">The <see cref="IUniverseObject"/> that entered the universe.</param>
/// <param name="universe">The <see cref="IUniverse"/> that the <see cref="IUniverseObject"/> has entered it's universe.</param> /// <param name="universe">The <see cref="IUniverse"/> that the <see cref="IUniverseObject"/> has entered it's universe.</param>
delegate void EnteredUniverseEventHandler(IUniverseObject sender, IUniverse universe); readonly record struct EnteredUniverseArguments(IUniverse Universe);
/// <summary> /// <summary>
/// EventHandler delegate for the event triggered when the <see cref="IUniverseObject"/> exits the universe of a <see cref="IUniverse">. /// Arguments for the event triggered when the <see cref="IUniverseObject"/> exits the universe of a <see cref="IUniverse">.
/// </summary> /// </summary>
/// <param name="sender">The <see cref="IUniverseObject"/> that exited the universe.</param> /// <param name="sender">The <see cref="IUniverseObject"/> that exited the universe.</param>
/// <param name="universe">The <see cref="IUniverse"/> that the <see cref="IUniverseObject"/> has exited it's universe.</param> /// <param name="universe">The <see cref="IUniverse"/> that the <see cref="IUniverseObject"/> has exited it's universe.</param>
delegate void ExitedUniverseEventHandler(IUniverseObject sender, IUniverse universe); readonly record struct ExitedUniverseArguments(IUniverse Universe);
/// <summary> /// <summary>
/// Delegate for the event triggered when the <see cref="IUniverseObject"/>'s parent changes. /// Arguments for the event triggered when the <see cref="IUniverseObject"/>'s parent changes.
/// </summary> /// </summary>
/// <param name="sender">The <see cref="IUniverseObject"/> that the parent has changed.</param> /// <param name="sender">The <see cref="IUniverseObject"/> that the parent has changed.</param>
/// <param name="previousParent">The previous <see cref="IUniverseObject"/> the sender was a child of.</param> /// <param name="previousParent">The previous <see cref="IUniverseObject"/> the sender was a child of.</param>
/// <param name="newParent">The new and current <see cref="IUniverseObject"/> the sender is a child of.</param> /// <param name="newParent">The new and current <see cref="IUniverseObject"/> the sender is a child of.</param>
delegate void ParentChangedEventHandler(IUniverseObject sender, IUniverseObject? previousParent, IUniverseObject? newParent); readonly record struct ParentChangedArguments(IUniverseObject? PreviousParent, IUniverseObject? CurrentParent);
/// <summary> /// <summary>
/// Delegate for the event triggered when a new <see cref="IUniverseObject"/> added as a child. /// Arguments for the event triggered when a new <see cref="IUniverseObject"/> added as a child.
/// </summary> /// </summary>
/// <param name="sender">The parent <see cref="IUniverseObject"/> this event is being called from.</param> /// <param name="sender">The parent <see cref="IUniverseObject"/> this event is being called from.</param>
/// <param name="childrenAdded">The <see cref="IUniverseObject"/> that got removed as a children of the sender <see cref="IUniverseObject"/>.</param> /// <param name="childrenAdded">The <see cref="IUniverseObject"/> that got removed as a children of the sender <see cref="IUniverseObject"/>.</param>
delegate void ChildrenAddedEventHandler(IUniverseObject sender, IUniverseObject childrenAdded); readonly record struct ChildrenAddedArguments(IUniverseObject ChildrenAdded);
/// <summary> /// <summary>
/// Delegate for the event triggered when a new <see cref="IUniverseObject"/> removed from being a child. /// Delegate for the event triggered when a new <see cref="IUniverseObject"/> removed from being a child.
/// </summary> /// </summary>
/// <param name="sender">The parent <see cref="IUniverseObject"/> this event is being called from.</param> /// <param name="sender">The parent <see cref="IUniverseObject"/> this event is being called from.</param>
/// <param name="childrenAdded">The <see cref="IUniverseObject"/> that got removed as a children of the sender <see cref="IUniverseObject"/>.</param> /// <param name="childrenAdded">The <see cref="IUniverseObject"/> that got removed as a children of the sender <see cref="IUniverseObject"/>.</param>
delegate void ChildrenRemovedEventHandler(IUniverseObject sender, IUniverseObject childrenRemoved); readonly record struct ChildrenRemovedArguments(IUniverseObject ChildrenRemoved);
} }

94
Engine.Core/ActiveBehaviourCollector.cs
View File

@ -1,15 +1,20 @@
using System.Collections; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Syntriax.Engine.Core; namespace Syntriax.Engine.Core;
public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : class, IBehaviour public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : class, IBehaviour
{ {
public event IAssignable.UnassignEventHandler? OnUnassigned = null; public Event<IBehaviourCollector<T>, IBehaviourCollector<T>.BehaviourCollectedArguments> OnCollected { get; } = new();
public event IHasUniverse.UniverseAssignedEventHandler? OnUniverseAssigned = null; public Event<IBehaviourCollector<T>, IBehaviourCollector<T>.BehaviourRemovedArguments> OnRemoved { get; } = new();
public Event<IHasUniverse> OnUniverseAssigned { get; } = new();
public Event<IAssignable>? OnUnassigned { get; } = new();
public event IBehaviourCollector<T>.CollectedEventHandler? OnCollected = null; private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAdded = null!;
public event IBehaviourCollector<T>.RemovedEventHandler? OnRemoved = null; private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler delegateOnBehaviourRemoved = null!;
private readonly Event<IActive, IActive.ActiveChangedArguments>.EventHandler delegateOnBehaviourStateChanged = null!;
private readonly Event<IUniverse, IUniverse.UniverseObjectRegisteredArguments>.EventHandler delegateOnUniverseObjectRegistered = null!;
private readonly Event<IUniverse, IUniverse.UniverseObjectUnRegisteredArguments>.EventHandler delegateOnUniverseObjectUnregistered = null!;
private readonly List<T> monitoringBehaviours = new(32); private readonly List<T> monitoringBehaviours = new(32);
protected readonly List<T> activeBehaviours = new(32); protected readonly List<T> activeBehaviours = new(32);
@ -17,69 +22,70 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
public IUniverse Universe { get; private set; } = null!; public IUniverse Universe { get; private set; } = null!;
public ActiveBehaviourCollector() { } private void OnUniverseObjectRegistered(IUniverse manager, IUniverse.UniverseObjectRegisteredArguments args)
public ActiveBehaviourCollector(IUniverse universe) => Assign(universe);
private void OnUniverseObjectRegistered(IUniverse manager, IUniverseObject universeObject)
{ {
universeObject.BehaviourController.OnBehaviourAdded += OnBehaviourAdded; IUniverseObject universeObject = args.UniverseObjectRegistered;
universeObject.BehaviourController.OnBehaviourRemoved += OnBehaviourRemoved;
universeObject.BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAdded);
universeObject.BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemoved);
for (int i = 0; i < universeObject.BehaviourController.Count; i++) for (int i = 0; i < universeObject.BehaviourController.Count; i++)
OnBehaviourAdded(universeObject.BehaviourController, universeObject.BehaviourController[i]); OnBehaviourAdded(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
} }
private void OnUniverseObjectUnregistered(IUniverse manager, IUniverseObject universeObject) private void OnUniverseObjectUnregistered(IUniverse manager, IUniverse.UniverseObjectUnRegisteredArguments args)
{ {
universeObject.BehaviourController.OnBehaviourAdded -= OnBehaviourAdded; IUniverseObject universeObject = args.UniverseObjectUnregistered;
universeObject.BehaviourController.OnBehaviourRemoved -= OnBehaviourRemoved;
universeObject.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
universeObject.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
for (int i = 0; i < universeObject.BehaviourController.Count; i++) for (int i = 0; i < universeObject.BehaviourController.Count; i++)
OnBehaviourRemoved(universeObject.BehaviourController, universeObject.BehaviourController[i]); OnBehaviourRemoved(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
} }
protected virtual void OnBehaviourAdd(IBehaviour behaviour) { } protected virtual void OnBehaviourAdd(IBehaviour behaviour) { }
private void OnBehaviourAdded(IBehaviourController controller, IBehaviour behaviour) private void OnBehaviourAdded(IBehaviourController controller, IBehaviourController.BehaviourAddedArguments args)
{ {
if (behaviour is not T tBehaviour) if (args.BehaviourAdded is not T tBehaviour)
return; return;
monitoringBehaviours.Add(tBehaviour); monitoringBehaviours.Add(tBehaviour);
monitoringActiveToBehaviour.Add(tBehaviour, tBehaviour); monitoringActiveToBehaviour.Add(tBehaviour, tBehaviour);
tBehaviour.OnActiveChanged += OnBehaviourStateChanged; tBehaviour.OnActiveChanged.AddListener(delegateOnBehaviourStateChanged);
OnBehaviourStateChanged(tBehaviour, !tBehaviour.IsActive); OnBehaviourStateChanged(tBehaviour, new(!tBehaviour.IsActive));
} }
private void OnBehaviourStateChanged(IActive sender, bool previousState) private void OnBehaviourStateChanged(IActive sender, IActive.ActiveChangedArguments args)
{ {
T behaviour = monitoringActiveToBehaviour[sender]; T behaviour = monitoringActiveToBehaviour[sender];
if (sender.IsActive) if (sender.IsActive)
{ {
activeBehaviours.Add(behaviour); activeBehaviours.Add(behaviour);
OnBehaviourAdd(behaviour); OnBehaviourAdd(behaviour);
OnCollected?.Invoke(this, behaviour); OnCollected?.Invoke(this, new(behaviour));
} }
else if (activeBehaviours.Remove(behaviour)) else if (activeBehaviours.Remove(behaviour))
{ {
OnBehaviourRemove(behaviour); OnBehaviourRemove(behaviour);
OnRemoved?.Invoke(this, behaviour); OnRemoved?.Invoke(this, new(behaviour));
} }
} }
protected virtual void OnBehaviourRemove(IBehaviour behaviour) { } protected virtual void OnBehaviourRemove(IBehaviour behaviour) { }
private void OnBehaviourRemoved(IBehaviourController controller, IBehaviour behaviour) private void OnBehaviourRemoved(IBehaviourController controller, IBehaviourController.BehaviourRemovedArguments args)
{ {
if (behaviour is not T tBehaviour) if (args.BehaviourRemoved is not T tBehaviour)
return; return;
if (!monitoringBehaviours.Remove(tBehaviour) || !monitoringActiveToBehaviour.Remove(tBehaviour)) if (!monitoringBehaviours.Remove(tBehaviour) || !monitoringActiveToBehaviour.Remove(tBehaviour))
return; return;
tBehaviour.OnActiveChanged -= OnBehaviourStateChanged; tBehaviour.OnActiveChanged.RemoveListener(delegateOnBehaviourStateChanged);
if (activeBehaviours.Remove(tBehaviour)) if (activeBehaviours.Remove(tBehaviour))
{ {
OnBehaviourRemove(tBehaviour); OnBehaviourRemove(tBehaviour);
OnRemoved?.Invoke(this, tBehaviour); OnRemoved?.Invoke(this, new(tBehaviour));
} }
} }
@ -89,10 +95,10 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
return false; return false;
foreach (IUniverseObject universeObject in universe.UniverseObjects) foreach (IUniverseObject universeObject in universe.UniverseObjects)
OnUniverseObjectRegistered(universe, universeObject); OnUniverseObjectRegistered(universe, new(universeObject));
universe.OnUniverseObjectRegistered += OnUniverseObjectRegistered; universe.OnUniverseObjectRegistered.AddListener(delegateOnUniverseObjectRegistered);
universe.OnUniverseObjectUnRegistered += OnUniverseObjectUnregistered; universe.OnUniverseObjectUnRegistered.AddListener(delegateOnUniverseObjectUnregistered);
Universe = universe; Universe = universe;
OnUniverseAssigned?.Invoke(this); OnUniverseAssigned?.Invoke(this);
@ -106,10 +112,10 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
return false; return false;
foreach (IUniverseObject universeObject in Universe.UniverseObjects) foreach (IUniverseObject universeObject in Universe.UniverseObjects)
OnUniverseObjectUnregistered(Universe, universeObject); OnUniverseObjectUnregistered(Universe, new(universeObject));
Universe.OnUniverseObjectRegistered -= OnUniverseObjectRegistered; Universe.OnUniverseObjectRegistered.RemoveListener(delegateOnUniverseObjectRegistered);
Universe.OnUniverseObjectUnRegistered -= OnUniverseObjectUnregistered; Universe.OnUniverseObjectUnRegistered.RemoveListener(delegateOnUniverseObjectUnregistered);
Universe = null!; Universe = null!;
OnUnassigned?.Invoke(this); OnUnassigned?.Invoke(this);
@ -117,5 +123,25 @@ public class ActiveBehaviourCollector<T> : IBehaviourCollector<T> where T : clas
} }
public int Count => activeBehaviours.Count; public int Count => activeBehaviours.Count;
public T this[System.Index index] => activeBehaviours[index]; public T this[Index index] => activeBehaviours[index];
public ActiveBehaviourCollector()
{
delegateOnBehaviourAdded = OnBehaviourAdded;
delegateOnBehaviourRemoved = OnBehaviourRemoved;
delegateOnBehaviourStateChanged = OnBehaviourStateChanged;
delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
}
public ActiveBehaviourCollector(IUniverse universe)
{
delegateOnBehaviourAdded = OnBehaviourAdded;
delegateOnBehaviourRemoved = OnBehaviourRemoved;
delegateOnBehaviourStateChanged = OnBehaviourStateChanged;
delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
Assign(universe);
}
} }

14
Engine.Core/BaseEntity.cs
View File

@ -4,13 +4,11 @@ namespace Syntriax.Engine.Core;
public abstract class BaseEntity : IEntity public abstract class BaseEntity : IEntity
{ {
public event IEntity.IdChangedEventHandler? OnIdChanged = null; public Event<IEntity, IEntity.IdChangedArguments> OnIdChanged { get; } = new();
public Event<IInitializable> OnInitialized { get; } = new();
public event IInitializable.InitializedEventHandler? OnInitialized = null; public Event<IInitializable> OnFinalized { get; } = new();
public event IInitializable.FinalizedEventHandler? OnFinalized = null; public Event<IHasStateEnable> OnStateEnableAssigned { get; } = new();
public Event<IAssignable> OnUnassigned { get; } = new();
public event IHasStateEnable.StateEnableAssignedEventHandler? OnStateEnableAssigned = null;
public event IAssignable.UnassignEventHandler? OnUnassigned = null;
private IStateEnable _stateEnable = null!; private IStateEnable _stateEnable = null!;
@ -33,7 +31,7 @@ public abstract class BaseEntity : IEntity
string previousId = _id; string previousId = _id;
_id = value; _id = value;
OnIdChanged?.Invoke(this, previousId); OnIdChanged?.Invoke(this, new(previousId));
} }
} }

28
Engine.Core/Behaviour.cs
View File

@ -7,11 +7,17 @@ public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
protected IUniverse Universe => BehaviourController.UniverseObject.Universe; protected IUniverse Universe => BehaviourController.UniverseObject.Universe;
protected IUniverseObject UniverseObject => BehaviourController.UniverseObject; protected IUniverseObject UniverseObject => BehaviourController.UniverseObject;
private readonly Event<IUniverseObject, IUniverseObject.EnteredUniverseArguments>.EventHandler delegateEnteredUniverse = null!;
private readonly Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments>.EventHandler delegateExitedUniverse = null!;
public Behaviour() public Behaviour()
{ {
OnInitialized += OnInitialize; OnInitialized.AddListener(OnInitialize);
OnFinalized += OnFinalize; OnFinalized.AddListener(OnFinalize);
OnUnassigned += OnUnassign; OnUnassigned.AddListener(OnUnassign);
delegateEnteredUniverse = EnteredUniverse;
delegateExitedUniverse = ExitedUniverse;
} }
protected virtual void OnUnassign() { } protected virtual void OnUnassign() { }
@ -20,25 +26,25 @@ public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
protected virtual void OnInitialize() { } protected virtual void OnInitialize() { }
protected virtual void OnInitialize(IInitializable _) protected virtual void OnInitialize(IInitializable _)
{ {
BehaviourController.UniverseObject.OnEnteredUniverse += EnteredUniverse; BehaviourController.UniverseObject.OnEnteredUniverse.AddListener(delegateEnteredUniverse);
BehaviourController.UniverseObject.OnExitedUniverse += ExitedUniverse; BehaviourController.UniverseObject.OnExitedUniverse.AddListener(delegateExitedUniverse);
OnInitialize(); OnInitialize();
if (UniverseObject.IsInUniverse) if (UniverseObject.IsInUniverse)
EnteredUniverse(UniverseObject, Universe); EnteredUniverse(UniverseObject, new(Universe));
} }
protected virtual void OnFinalize() { } protected virtual void OnFinalize() { }
protected virtual void OnFinalize(IInitializable _) protected virtual void OnFinalize(IInitializable _)
{ {
BehaviourController.UniverseObject.OnEnteredUniverse -= EnteredUniverse; BehaviourController.UniverseObject.OnEnteredUniverse.RemoveListener(delegateEnteredUniverse);
BehaviourController.UniverseObject.OnExitedUniverse -= ExitedUniverse; BehaviourController.UniverseObject.OnExitedUniverse.RemoveListener(delegateExitedUniverse);
OnFinalize(); OnFinalize();
if (UniverseObject.IsInUniverse) if (UniverseObject.IsInUniverse)
ExitedUniverse(UniverseObject, Universe); ExitedUniverse(UniverseObject, new(Universe));
} }
protected virtual void OnFirstActiveFrame() { } protected virtual void OnFirstActiveFrame() { }
@ -133,8 +139,8 @@ public abstract class Behaviour : BehaviourBase, IFirstFrameUpdate,
} }
protected virtual void OnEnteredUniverse(IUniverse universe) { } protected virtual void OnEnteredUniverse(IUniverse universe) { }
protected virtual void EnteredUniverse(IUniverseObject sender, IUniverse universe) => OnEnteredUniverse(universe); protected virtual void EnteredUniverse(IUniverseObject sender, IUniverseObject.EnteredUniverseArguments args) => OnEnteredUniverse(args.Universe);
protected virtual void OnExitedUniverse(IUniverse universe) { } protected virtual void OnExitedUniverse(IUniverse universe) { }
protected virtual void ExitedUniverse(IUniverseObject sender, IUniverse universe) => OnExitedUniverse(universe); protected virtual void ExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments args) => OnExitedUniverse(args.Universe);
} }

4
Engine.Core/Behaviour2D.cs
View File

@ -17,6 +17,6 @@ public abstract class Behaviour2D : Behaviour, IBehaviour2D
} }
protected sealed override void OnUnassign(IAssignable assignable) => base.OnUnassign(assignable); protected sealed override void OnUnassign(IAssignable assignable) => base.OnUnassign(assignable);
protected sealed override void EnteredUniverse(IUniverseObject sender, IUniverse universe) => base.EnteredUniverse(sender, universe); protected sealed override void EnteredUniverse(IUniverseObject sender, IUniverseObject.EnteredUniverseArguments args) => base.EnteredUniverse(sender, args);
protected sealed override void ExitedUniverse(IUniverseObject sender, IUniverse universe) => base.ExitedUniverse(sender, universe); protected sealed override void ExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments args) => base.ExitedUniverse(sender, args);
} }

36
Engine.Core/BehaviourBase.cs
View File

@ -3,9 +3,13 @@ namespace Syntriax.Engine.Core;
[System.Diagnostics.DebuggerDisplay("{GetType().Name, nq}, Priority: {Priority}, Initialized: {Initialized}")] [System.Diagnostics.DebuggerDisplay("{GetType().Name, nq}, Priority: {Priority}, Initialized: {Initialized}")]
public abstract class BehaviourBase : BaseEntity, IBehaviour public abstract class BehaviourBase : BaseEntity, IBehaviour
{ {
public event IHasBehaviourController.BehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned = null; public Event<IBehaviour, IBehaviour.PriorityChangedArguments> OnPriorityChanged { get; } = new();
public event IBehaviour.PriorityChangedEventHandler? OnPriorityChanged = null; public Event<IActive, IActive.ActiveChangedArguments> OnActiveChanged { get; } = new();
public event IActive.ActiveChangedEventHandler? OnActiveChanged = null; public Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; } = new();
private readonly Event<IHasUniverseObject>.EventHandler delegateOnUniverseObjectAssigned = null!;
private readonly Event<IActive, IActive.ActiveChangedArguments>.EventHandler delegateOnUniverseObjectActiveChanged = null!;
private readonly Event<IStateEnable, IStateEnable.EnabledChangedArguments>.EventHandler delegateOnStateEnabledChanged = null!;
private IBehaviourController _behaviourController = null!; private IBehaviourController _behaviourController = null!;
public IBehaviourController BehaviourController => _behaviourController; public IBehaviourController BehaviourController => _behaviourController;
@ -21,7 +25,7 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
int previousPriority = _priority; int previousPriority = _priority;
_priority = value; _priority = value;
OnPriorityChanged?.Invoke(this, previousPriority); OnPriorityChanged?.Invoke(this, new(previousPriority));
} }
} }
@ -36,7 +40,7 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
_behaviourController = behaviourController; _behaviourController = behaviourController;
OnAssign(behaviourController); OnAssign(behaviourController);
behaviourController.OnUniverseObjectAssigned += OnUniverseObjectAssigned; behaviourController.OnUniverseObjectAssigned.AddListener(delegateOnUniverseObjectAssigned);
if (behaviourController.UniverseObject is not null) if (behaviourController.UniverseObject is not null)
OnUniverseObjectAssigned(behaviourController); OnUniverseObjectAssigned(behaviourController);
OnBehaviourControllerAssigned?.Invoke(this); OnBehaviourControllerAssigned?.Invoke(this);
@ -45,7 +49,7 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
private void OnUniverseObjectAssigned(IHasUniverseObject sender) private void OnUniverseObjectAssigned(IHasUniverseObject sender)
{ {
sender.UniverseObject.OnActiveChanged += OnUniverseObjectActiveChanged; sender.UniverseObject.OnActiveChanged.AddListener(delegateOnUniverseObjectActiveChanged);
UpdateActive(); UpdateActive();
} }
@ -53,13 +57,14 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
{ {
base.OnAssign(stateEnable); base.OnAssign(stateEnable);
stateEnable.OnEnabledChanged += OnStateEnabledChanged; stateEnable.OnEnabledChanged.AddListener(delegateOnStateEnabledChanged);
} }
protected override void UnassignInternal() protected override void UnassignInternal()
{ {
StateEnable.OnEnabledChanged -= OnStateEnabledChanged; BehaviourController.UniverseObject.OnActiveChanged.RemoveListener(delegateOnUniverseObjectActiveChanged);
BehaviourController.OnUniverseObjectAssigned -= OnUniverseObjectAssigned; StateEnable.OnEnabledChanged.RemoveListener(delegateOnStateEnabledChanged);
BehaviourController.OnUniverseObjectAssigned.RemoveListener(delegateOnUniverseObjectAssigned);
base.UnassignInternal(); base.UnassignInternal();
_behaviourController = null!; _behaviourController = null!;
} }
@ -70,8 +75,8 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
Debug.Assert.AssertStateEnableAssigned(this); Debug.Assert.AssertStateEnableAssigned(this);
} }
private void OnStateEnabledChanged(IStateEnable sender, bool previousState) => UpdateActive(); private void OnStateEnabledChanged(IStateEnable sender, IStateEnable.EnabledChangedArguments args) => UpdateActive();
private void OnUniverseObjectActiveChanged(IActive sender, bool previousState) => UpdateActive(); private void OnUniverseObjectActiveChanged(IActive sender, IActive.ActiveChangedArguments args) => UpdateActive();
private void UpdateActive() private void UpdateActive()
{ {
@ -79,6 +84,13 @@ public abstract class BehaviourBase : BaseEntity, IBehaviour
_isActive = StateEnable.Enabled && _behaviourController.UniverseObject.IsActive; _isActive = StateEnable.Enabled && _behaviourController.UniverseObject.IsActive;
if (previousActive != IsActive) if (previousActive != IsActive)
OnActiveChanged?.Invoke(this, previousActive); OnActiveChanged?.Invoke(this, new(previousActive));
}
protected BehaviourBase()
{
delegateOnUniverseObjectAssigned = OnUniverseObjectAssigned;
delegateOnUniverseObjectActiveChanged = OnUniverseObjectActiveChanged;
delegateOnStateEnabledChanged = OnStateEnabledChanged;
} }
} }

85
Engine.Core/BehaviourCollector.cs
View File

@ -1,63 +1,68 @@
using System.Collections; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Syntriax.Engine.Core; namespace Syntriax.Engine.Core;
public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
{ {
public event IAssignable.UnassignEventHandler? OnUnassigned = null; public Event<IBehaviourCollector<T>, IBehaviourCollector<T>.BehaviourCollectedArguments> OnCollected { get; } = new();
public event IHasUniverse.UniverseAssignedEventHandler? OnUniverseAssigned = null; public Event<IBehaviourCollector<T>, IBehaviourCollector<T>.BehaviourRemovedArguments> OnRemoved { get; } = new();
public Event<IHasUniverse> OnUniverseAssigned { get; } = new();
public Event<IAssignable>? OnUnassigned { get; } = new();
public event IBehaviourCollector<T>.CollectedEventHandler? OnCollected = null; private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAdded = null!;
public event IBehaviourCollector<T>.RemovedEventHandler? OnRemoved = null; private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler delegateOnBehaviourRemoved = null!;
private readonly Event<IUniverse, IUniverse.UniverseObjectRegisteredArguments>.EventHandler delegateOnUniverseObjectRegistered = null!;
private readonly Event<IUniverse, IUniverse.UniverseObjectUnRegisteredArguments>.EventHandler delegateOnUniverseObjectUnregistered = null!;
protected readonly List<T> behaviours = new(32); protected readonly List<T> behaviours = new(32);
public IUniverse Universe { get; private set; } = null!; public IUniverse Universe { get; private set; } = null!;
public BehaviourCollector() { } private void OnUniverseObjectRegistered(IUniverse manager, IUniverse.UniverseObjectRegisteredArguments args)
public BehaviourCollector(IUniverse universe) => Assign(universe);
private void OnUniverseObjectRegistered(IUniverse manager, IUniverseObject universeObject)
{ {
universeObject.BehaviourController.OnBehaviourAdded += OnBehaviourAdded; IUniverseObject universeObject = args.UniverseObjectRegistered;
universeObject.BehaviourController.OnBehaviourRemoved += OnBehaviourRemoved;
universeObject.BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAdded);
universeObject.BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemoved);
for (int i = 0; i < universeObject.BehaviourController.Count; i++) for (int i = 0; i < universeObject.BehaviourController.Count; i++)
OnBehaviourAdded(universeObject.BehaviourController, universeObject.BehaviourController[i]); OnBehaviourAdded(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
} }
private void OnUniverseObjectUnregistered(IUniverse manager, IUniverseObject universeObject) private void OnUniverseObjectUnregistered(IUniverse manager, IUniverse.UniverseObjectUnRegisteredArguments args)
{ {
universeObject.BehaviourController.OnBehaviourAdded -= OnBehaviourAdded; IUniverseObject universeObject = args.UniverseObjectUnregistered;
universeObject.BehaviourController.OnBehaviourRemoved -= OnBehaviourRemoved;
universeObject.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
universeObject.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
for (int i = 0; i < universeObject.BehaviourController.Count; i++) for (int i = 0; i < universeObject.BehaviourController.Count; i++)
OnBehaviourRemoved(universeObject.BehaviourController, universeObject.BehaviourController[i]); OnBehaviourRemoved(universeObject.BehaviourController, new(universeObject.BehaviourController[i]));
} }
protected virtual void OnBehaviourAdd(IBehaviour behaviour) { } protected virtual void OnBehaviourAdd(IBehaviour behaviour) { }
private void OnBehaviourAdded(IBehaviourController controller, IBehaviour behaviour) private void OnBehaviourAdded(IBehaviourController controller, IBehaviourController.BehaviourAddedArguments args)
{ {
if (behaviour is not T tBehaviour) if (args.BehaviourAdded is not T tBehaviour)
return; return;
behaviours.Add(tBehaviour); behaviours.Add(tBehaviour);
OnBehaviourAdd(behaviour); OnBehaviourAdd(args.BehaviourAdded);
OnCollected?.Invoke(this, tBehaviour); OnCollected?.Invoke(this, new(tBehaviour));
} }
protected virtual void OnBehaviourRemove(IBehaviour behaviour) { } protected virtual void OnBehaviourRemove(IBehaviour behaviour) { }
private void OnBehaviourRemoved(IBehaviourController controller, IBehaviour behaviour) private void OnBehaviourRemoved(IBehaviourController controller, IBehaviourController.BehaviourRemovedArguments args)
{ {
if (behaviour is not T tBehaviour) if (args.BehaviourRemoved is not T tBehaviour)
return; return;
if (!behaviours.Remove(tBehaviour)) if (!behaviours.Remove(tBehaviour))
return; return;
OnBehaviourRemove(behaviour); OnBehaviourRemove(args.BehaviourRemoved);
OnRemoved?.Invoke(this, tBehaviour); OnRemoved?.Invoke(this, new(tBehaviour));
} }
protected virtual void OnAssign(IUniverse universe) { } protected virtual void OnAssign(IUniverse universe) { }
@ -67,10 +72,10 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
return false; return false;
foreach (IUniverseObject universeObject in universe.UniverseObjects) foreach (IUniverseObject universeObject in universe.UniverseObjects)
OnUniverseObjectRegistered(universe, universeObject); OnUniverseObjectRegistered(universe, new(universeObject));
universe.OnUniverseObjectRegistered += OnUniverseObjectRegistered; universe.OnUniverseObjectRegistered.AddListener(delegateOnUniverseObjectRegistered);
universe.OnUniverseObjectUnRegistered += OnUniverseObjectUnregistered; universe.OnUniverseObjectUnRegistered.AddListener(delegateOnUniverseObjectUnregistered);
Universe = universe; Universe = universe;
OnAssign(universe); OnAssign(universe);
@ -85,10 +90,10 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
return false; return false;
foreach (IUniverseObject universeObject in Universe.UniverseObjects) foreach (IUniverseObject universeObject in Universe.UniverseObjects)
OnUniverseObjectUnregistered(Universe, universeObject); OnUniverseObjectUnregistered(Universe, new(universeObject));
Universe.OnUniverseObjectRegistered -= OnUniverseObjectRegistered; Universe.OnUniverseObjectRegistered.RemoveListener(delegateOnUniverseObjectRegistered);
Universe.OnUniverseObjectUnRegistered -= OnUniverseObjectUnregistered; Universe.OnUniverseObjectUnRegistered.RemoveListener(delegateOnUniverseObjectUnregistered);
Universe = null!; Universe = null!;
OnUnassigned?.Invoke(this); OnUnassigned?.Invoke(this);
@ -96,5 +101,23 @@ public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
} }
public int Count => behaviours.Count; public int Count => behaviours.Count;
public T this[System.Index index] => behaviours[index]; public T this[Index index] => behaviours[index];
public BehaviourCollector()
{
delegateOnBehaviourAdded = OnBehaviourAdded;
delegateOnBehaviourRemoved = OnBehaviourRemoved;
delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
}
public BehaviourCollector(IUniverse universe)
{
delegateOnBehaviourAdded = OnBehaviourAdded;
delegateOnBehaviourRemoved = OnBehaviourRemoved;
delegateOnUniverseObjectRegistered = OnUniverseObjectRegistered;
delegateOnUniverseObjectUnregistered = OnUniverseObjectUnregistered;
Assign(universe);
}
} }

20
Engine.Core/BehaviourController.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -8,11 +7,11 @@ namespace Syntriax.Engine.Core;
[System.Diagnostics.DebuggerDisplay("Behaviour Count: {behaviours.Count}")] [System.Diagnostics.DebuggerDisplay("Behaviour Count: {behaviours.Count}")]
public class BehaviourController : BaseEntity, IBehaviourController public class BehaviourController : BaseEntity, IBehaviourController
{ {
public event IBehaviourController.BehaviourAddedEventHandler? OnBehaviourAdded = null; public Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments> OnBehaviourAdded { get; } = new();
public event IBehaviourController.BehaviourRemovedEventHandler? OnBehaviourRemoved = null; public Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments> OnBehaviourRemoved { get; } = new();
public event IHasUniverseObject.UniverseObjectAssignedEventHandler? OnUniverseObjectAssigned = null; public Event<IHasUniverseObject> OnUniverseObjectAssigned { get; } = new();
private readonly IList<IBehaviour> behaviours = new List<IBehaviour>(Constants.BEHAVIOURS_SIZE_INITIAL); private readonly List<IBehaviour> behaviours = new(Constants.BEHAVIOURS_SIZE_INITIAL);
private IUniverseObject _universeObject = null!; private IUniverseObject _universeObject = null!;
@ -28,8 +27,9 @@ public class BehaviourController : BaseEntity, IBehaviourController
if (IsInitialized) if (IsInitialized)
behaviour.Initialize(); behaviour.Initialize();
behaviour.OnPriorityChanged += OnPriorityChange;
OnBehaviourAdded?.Invoke(this, behaviour); behaviour.OnPriorityChanged.AddListener(OnPriorityChange);
OnBehaviourAdded?.Invoke(this, new(behaviour));
return behaviour; return behaviour;
} }
@ -94,10 +94,10 @@ public class BehaviourController : BaseEntity, IBehaviourController
if (!behaviours.Contains(behaviour)) if (!behaviours.Contains(behaviour))
throw new Exception($"{behaviour.GetType().Name} does not exist in {UniverseObject.Name}'s {nameof(IBehaviourController)}."); throw new Exception($"{behaviour.GetType().Name} does not exist in {UniverseObject.Name}'s {nameof(IBehaviourController)}.");
behaviour.OnPriorityChanged -= OnPriorityChange; behaviour.OnPriorityChanged.RemoveListener(OnPriorityChange);
behaviour.Finalize(); behaviour.Finalize();
behaviours.Remove(behaviour); behaviours.Remove(behaviour);
OnBehaviourRemoved?.Invoke(this, behaviour); OnBehaviourRemoved?.Invoke(this, new(behaviour));
} }
protected virtual void OnAssign(IUniverseObject universeObject) { } protected virtual void OnAssign(IUniverseObject universeObject) { }
@ -146,7 +146,7 @@ public class BehaviourController : BaseEntity, IBehaviourController
behaviours.Add(behaviour); behaviours.Add(behaviour);
} }
private void OnPriorityChange(IBehaviour sender, int previousPriority) private void OnPriorityChange(IBehaviour sender, IBehaviour.PriorityChangedArguments args)
{ {
behaviours.Remove(sender); behaviours.Remove(sender);
InsertBehaviourByPriority(sender); InsertBehaviourByPriority(sender);

6
Engine.Core/CoroutineManager.cs
View File

@ -20,15 +20,15 @@ public class CoroutineManager : UniverseObject
protected override void OnEnteringUniverse(IUniverse universe) protected override void OnEnteringUniverse(IUniverse universe)
{ {
universe.OnUpdate += OnUpdate; universe.OnUpdate.AddListener(OnUpdate);
} }
protected override void OnExitingUniverse(IUniverse universe) protected override void OnExitingUniverse(IUniverse universe)
{ {
universe.OnUpdate -= OnUpdate; universe.OnUpdate.RemoveListener(OnUpdate);
} }
private void OnUpdate(IUniverse sender, UniverseTime time) private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments args)
{ {
for (int i = enumerators.Count - 1; i >= 0; i--) for (int i = enumerators.Count - 1; i >= 0; i--)
{ {

46
Engine.Core/Helpers/Event.cs Normal file
View File

@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
namespace Syntriax.Engine.Core;
public class Event<TSender>
{
private readonly List<EventHandler> listeners = new(8);
public void AddListener(EventHandler listener) => listeners.Add(listener);
public void RemoveListener(EventHandler listener) => listeners.Remove(listener);
public void Clear() => listeners.Clear();
public void Invoke(TSender argument)
{
for (int i = 0; i < listeners.Count; i++)
try { listeners[i].Invoke(argument); }
catch (Exception exception)
{
string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({argument})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
}
}
public delegate void EventHandler(TSender sender);
}
public class Event<TSender, TArguments>
{
private readonly List<EventHandler> listeners = new(8);
public void AddListener(EventHandler listener) => listeners.Add(listener);
public void RemoveListener(EventHandler listener) => listeners.Remove(listener);
public void Clear() => listeners.Clear();
public void Invoke(TSender sender, TArguments args)
{
for (int i = 0; i < listeners.Count; i++)
try { listeners[i].Invoke(sender, args); }
catch (Exception exception)
{
string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({string.Join(", ", sender, args)})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
}
}
public delegate void EventHandler(TSender sender, TArguments args);
}

7
Engine.Core/Helpers/Progression/IReadOnlyProgressionTracker.cs
View File

@ -2,12 +2,11 @@ namespace Syntriax.Engine.Core;
public interface IReadOnlyProgressionTracker public interface IReadOnlyProgressionTracker
{ {
event ProgressionUpdatedEventHandler? OnUpdated; Event<IReadOnlyProgressionTracker, ProgressionUpdatedArguments> OnUpdated { get; }
event ProgressionEndedEventHandler? OnEnded; Event<IReadOnlyProgressionTracker> OnEnded { get; }
float Progression { get; } float Progression { get; }
string Status { get; } string Status { get; }
delegate void ProgressionUpdatedEventHandler(IReadOnlyProgressionTracker sender, float previousProgression, string previousStatus); readonly record struct ProgressionUpdatedArguments(float PreviousProgression, string PreviousStatus);
delegate void ProgressionEndedEventHandler(IReadOnlyProgressionTracker sender);
} }

10
Engine.Core/Helpers/Progression/ProgressionTracker.cs
View File

@ -2,8 +2,8 @@ namespace Syntriax.Engine.Core;
public class ProgressionTracker : IProgressionTracker public class ProgressionTracker : IProgressionTracker
{ {
public event IReadOnlyProgressionTracker.ProgressionUpdatedEventHandler? OnUpdated = null; public Event<IReadOnlyProgressionTracker, IReadOnlyProgressionTracker.ProgressionUpdatedArguments> OnUpdated { get; } = new();
public event IReadOnlyProgressionTracker.ProgressionEndedEventHandler? OnEnded = null; public Event<IReadOnlyProgressionTracker> OnEnded { get; } = new();
public float Progression { get; private set; } = 0f; public float Progression { get; private set; } = 0f;
public string Status { get; private set; } = "Default"; public string Status { get; private set; } = "Default";
@ -19,7 +19,7 @@ public class ProgressionTracker : IProgressionTracker
Progression = progression.Clamp(Progression, 1f); Progression = progression.Clamp(Progression, 1f);
Status = status; Status = status;
OnUpdated?.Invoke(this, previousProgression, previousStatus); OnUpdated?.Invoke(this, new(previousProgression, previousStatus));
if (progression >= 1f) if (progression >= 1f)
OnEnded?.Invoke(this); OnEnded?.Invoke(this);
@ -30,7 +30,7 @@ public class ProgressionTracker : IProgressionTracker
Progression = 0f; Progression = 0f;
Status = "Default"; Status = "Default";
OnUpdated = null; OnUpdated.Clear();
OnEnded = null; OnEnded.Clear();
} }
} }

4
Engine.Core/Primitives/Shape2D.cs
View File

@ -18,7 +18,7 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
public static Shape2D Pentagon => CreateNgon(5, Vector2D.Up); public static Shape2D Pentagon => CreateNgon(5, Vector2D.Up);
public static Shape2D Hexagon => CreateNgon(6, Vector2D.Right); public static Shape2D Hexagon => CreateNgon(6, Vector2D.Right);
public event ShapeUpdatedEventHandler? OnShapeUpdated = null; public Event<Shape2D> OnShapeUpdated { get; } = new();
private List<Vector2D> _vertices = vertices; private List<Vector2D> _vertices = vertices;
@ -256,8 +256,6 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
/// <inheritdoc/> /// <inheritdoc/>
IEnumerator IEnumerable.GetEnumerator() => Vertices.GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => Vertices.GetEnumerator();
public delegate void ShapeUpdatedEventHandler(Shape2D shape2D);
} }
/// <summary> /// <summary>

6
Engine.Core/Serialization/EntityRegistry.cs
View File

@ -5,7 +5,7 @@ namespace Syntriax.Engine.Core.Serialization;
public class EntityRegistry public class EntityRegistry
{ {
public event EntityRegisteredEventHandler? OnEntityRegistered = null!; public Event<EntityRegistry, EntityRegisteredArguments> OnEntityRegistered = null!;
private readonly Dictionary<string, Action<IEntity>?> assignCallbacks = []; private readonly Dictionary<string, Action<IEntity>?> assignCallbacks = [];
private readonly Dictionary<string, IEntity> registeredEntities = []; private readonly Dictionary<string, IEntity> registeredEntities = [];
@ -14,7 +14,7 @@ public class EntityRegistry
public void Add(IEntity entity) public void Add(IEntity entity)
{ {
if (registeredEntities.TryAdd(entity.Id, entity)) if (registeredEntities.TryAdd(entity.Id, entity))
OnEntityRegistered?.Invoke(this, entity); OnEntityRegistered?.Invoke(this, new(entity));
} }
public void QueueAssign(string id, Action<IEntity> setMethod) public void QueueAssign(string id, Action<IEntity> setMethod)
@ -35,5 +35,5 @@ public class EntityRegistry
registeredEntities.Clear(); registeredEntities.Clear();
} }
public delegate void EntityRegisteredEventHandler(EntityRegistry sender, IEntity entity); public readonly record struct EntityRegisteredArguments(IEntity Entity);
} }

8
Engine.Core/StateEnable.cs
View File

@ -2,9 +2,9 @@ namespace Syntriax.Engine.Core;
public class StateEnable : IStateEnable public class StateEnable : IStateEnable
{ {
public event IAssignable.UnassignEventHandler? OnUnassigned = null; public Event<IStateEnable, IStateEnable.EnabledChangedArguments> OnEnabledChanged { get; } = new();
public event IHasEntity.EntityAssignedEventHandler? OnEntityAssigned = null; public Event<IHasEntity> OnEntityAssigned { get; } = new();
public event IStateEnable.EnabledChangedEventHandler? OnEnabledChanged = null; public Event<IAssignable>? OnUnassigned { get; } = new();
private bool _enabled = true; private bool _enabled = true;
private IEntity _entity = null!; private IEntity _entity = null!;
@ -21,7 +21,7 @@ public class StateEnable : IStateEnable
bool previousState = _enabled; bool previousState = _enabled;
_enabled = value; _enabled = value;
OnEnabledChanged?.Invoke(this, previousState); OnEnabledChanged?.Invoke(this, new(previousState));
} }
} }

13
Engine.Core/Systems/DrawManager.cs
View File

@ -1,4 +1,3 @@
namespace Syntriax.Engine.Core; namespace Syntriax.Engine.Core;
public class DrawManager : UniverseObject public class DrawManager : UniverseObject
@ -33,9 +32,9 @@ public class DrawManager : UniverseObject
drawEntities.Assign(universe); drawEntities.Assign(universe);
postDrawEntities.Assign(universe); postDrawEntities.Assign(universe);
universe.OnPreDraw += OnPreDraw; universe.OnPreDraw.AddListener(OnPreDraw);
universe.OnDraw += OnDraw; universe.OnDraw.AddListener(OnDraw);
universe.OnPostDraw += OnPostDraw; universe.OnPostDraw.AddListener(OnPostDraw);
} }
protected override void OnExitingUniverse(IUniverse universe) protected override void OnExitingUniverse(IUniverse universe)
@ -44,8 +43,8 @@ public class DrawManager : UniverseObject
drawEntities.Unassign(); drawEntities.Unassign();
postDrawEntities.Unassign(); postDrawEntities.Unassign();
universe.OnPreDraw -= OnPreDraw; universe.OnPreDraw.RemoveListener(OnPreDraw);
universe.OnDraw -= OnDraw; universe.OnDraw.RemoveListener(OnDraw);
universe.OnPostDraw -= OnPostDraw; universe.OnPostDraw.RemoveListener(OnPostDraw);
} }
} }

25
Engine.Core/Systems/UpdateManager.cs
View File

@ -1,4 +1,3 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Syntriax.Engine.Core; namespace Syntriax.Engine.Core;
@ -21,9 +20,9 @@ public class UpdateManager : UniverseObject
updateEntities.Assign(universe); updateEntities.Assign(universe);
postUpdateEntities.Assign(universe); postUpdateEntities.Assign(universe);
universe.OnPreUpdate += OnPreUpdate; universe.OnPreUpdate.AddListener(OnPreUpdate);
universe.OnUpdate += OnUpdate; universe.OnUpdate.AddListener(OnUpdate);
universe.OnPostUpdate += OnPostUpdate; universe.OnPostUpdate.AddListener(OnPostUpdate);
} }
protected override void OnExitingUniverse(IUniverse universe) protected override void OnExitingUniverse(IUniverse universe)
@ -33,12 +32,12 @@ public class UpdateManager : UniverseObject
updateEntities.Unassign(); updateEntities.Unassign();
postUpdateEntities.Unassign(); postUpdateEntities.Unassign();
universe.OnPreUpdate -= OnPreUpdate; universe.OnPreUpdate.RemoveListener(OnPreUpdate);
universe.OnUpdate -= OnUpdate; universe.OnUpdate.RemoveListener(OnUpdate);
universe.OnPostUpdate -= OnPostUpdate; universe.OnPostUpdate.RemoveListener(OnPostUpdate);
} }
private void OnPreUpdate(IUniverse sender, UniverseTime engineTime) private void OnPreUpdate(IUniverse sender, IUniverse.UpdateArguments args)
{ {
for (int i = toCallFirstFrameUpdates.Count - 1; i >= 0; i--) for (int i = toCallFirstFrameUpdates.Count - 1; i >= 0; i--)
{ {
@ -50,25 +49,25 @@ public class UpdateManager : UniverseObject
preUpdateEntities[i].PreUpdate(); preUpdateEntities[i].PreUpdate();
} }
private void OnUpdate(IUniverse sender, UniverseTime engineTime) private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments args)
{ {
for (int i = updateEntities.Count - 1; i >= 0; i--) for (int i = updateEntities.Count - 1; i >= 0; i--)
updateEntities[i].Update(); updateEntities[i].Update();
} }
private void OnPostUpdate(IUniverse sender, UniverseTime engineTime) private void OnPostUpdate(IUniverse sender, IUniverse.UpdateArguments args)
{ {
for (int i = postUpdateEntities.Count - 1; i >= 0; i--) for (int i = postUpdateEntities.Count - 1; i >= 0; i--)
postUpdateEntities[i].PostUpdate(); postUpdateEntities[i].PostUpdate();
} }
private void OnFirstFrameCollected(IBehaviourCollector<IFirstFrameUpdate> sender, IFirstFrameUpdate behaviourCollected) private void OnFirstFrameCollected(IBehaviourCollector<IFirstFrameUpdate> sender, IBehaviourCollector<IFirstFrameUpdate>.BehaviourCollectedArguments args)
{ {
toCallFirstFrameUpdates.Add(behaviourCollected); toCallFirstFrameUpdates.Add(args.BehaviourCollected);
} }
public UpdateManager() public UpdateManager()
{ {
firstFrameUpdates.OnCollected += OnFirstFrameCollected; firstFrameUpdates.OnCollected.AddListener(OnFirstFrameCollected);
} }
} }

74
Engine.Core/Transform2D.cs
View File

@ -5,9 +5,9 @@ namespace Syntriax.Engine.Core;
[System.Diagnostics.DebuggerDisplay("Name: {UniverseObject.Name, nq} Position: {Position.ToString(), nq}, Scale: {Scale.ToString(), nq}, Rotation: {Rotation}")] [System.Diagnostics.DebuggerDisplay("Name: {UniverseObject.Name, nq} Position: {Position.ToString(), nq}, Scale: {Scale.ToString(), nq}, Rotation: {Rotation}")]
public class Transform2D : Behaviour, ITransform2D public class Transform2D : Behaviour, ITransform2D
{ {
public event ITransform2D.PositionChangedEventHandler? OnPositionChanged = null; public Event<ITransform2D, ITransform2D.PositionChangedArguments> OnPositionChanged { get; } = new();
public event ITransform2D.ScaleChangedEventHandler? OnScaleChanged = null; public Event<ITransform2D, ITransform2D.ScaleChangedArguments> OnScaleChanged { get; } = new();
public event ITransform2D.RotationChangedEventHandler? OnRotationChanged = null; public Event<ITransform2D, ITransform2D.RotationChangedArguments> OnRotationChanged { get; } = new();
private Vector2D _position = Vector2D.Zero; private Vector2D _position = Vector2D.Zero;
private Vector2D _scale = Vector2D.One; private Vector2D _scale = Vector2D.One;
@ -31,7 +31,7 @@ public class Transform2D : Behaviour, ITransform2D
_position = value; _position = value;
UpdateLocalPosition(); UpdateLocalPosition();
OnPositionChanged?.Invoke(this, previousPosition); OnPositionChanged?.Invoke(this, new(previousPosition));
} }
} }
@ -47,7 +47,7 @@ public class Transform2D : Behaviour, ITransform2D
_scale = value; _scale = value;
UpdateLocalScale(); UpdateLocalScale();
OnScaleChanged?.Invoke(this, previousScale); OnScaleChanged?.Invoke(this, new(previousScale));
} }
} }
@ -63,7 +63,7 @@ public class Transform2D : Behaviour, ITransform2D
_rotation = value; _rotation = value;
UpdateLocalRotation(); UpdateLocalRotation();
OnRotationChanged?.Invoke(this, previousRotation); OnRotationChanged?.Invoke(this, new(previousRotation));
} }
} }
@ -79,7 +79,7 @@ public class Transform2D : Behaviour, ITransform2D
_localPosition = value; _localPosition = value;
UpdatePosition(); UpdatePosition();
OnPositionChanged?.Invoke(this, previousPosition); OnPositionChanged?.Invoke(this, new(previousPosition));
} }
} }
@ -97,8 +97,8 @@ public class Transform2D : Behaviour, ITransform2D
UpdateScale(); UpdateScale();
UpdatePosition(); UpdatePosition();
OnScaleChanged?.Invoke(this, previousScale); OnScaleChanged?.Invoke(this, new(previousScale));
OnPositionChanged?.Invoke(this, previousPosition); OnPositionChanged?.Invoke(this, new(previousPosition));
} }
} }
@ -114,21 +114,21 @@ public class Transform2D : Behaviour, ITransform2D
_localRotation = value; _localRotation = value;
UpdateRotation(); UpdateRotation();
OnRotationChanged?.Invoke(this, previousRotation); OnRotationChanged?.Invoke(this, new(previousRotation));
} }
} }
private void RecalculatePosition(ITransform2D _, Vector2D previousPosition) private void RecalculatePosition(ITransform2D _, ITransform2D.PositionChangedArguments args)
{ {
if (parentTransform is null) if (parentTransform is null)
return; return;
UpdatePosition(); UpdatePosition();
OnPositionChanged?.Invoke(this, previousPosition); OnPositionChanged?.Invoke(this, args);
} }
private void RecalculateScale(ITransform2D _, Vector2D previousScale) private void RecalculateScale(ITransform2D _, ITransform2D.ScaleChangedArguments args)
{ {
if (parentTransform is null) if (parentTransform is null)
return; return;
@ -138,11 +138,11 @@ public class Transform2D : Behaviour, ITransform2D
UpdateScale(); UpdateScale();
UpdatePosition(); UpdatePosition();
OnScaleChanged?.Invoke(this, previousScale); OnScaleChanged?.Invoke(this, args);
OnPositionChanged?.Invoke(this, previousPosition); OnPositionChanged?.Invoke(this, new(previousPosition));
} }
private void RecalculateRotation(ITransform2D _, float previousRotation) private void RecalculateRotation(ITransform2D _, ITransform2D.RotationChangedArguments args)
{ {
if (parentTransform is null) if (parentTransform is null)
return; return;
@ -152,8 +152,8 @@ public class Transform2D : Behaviour, ITransform2D
UpdateRotation(); UpdateRotation();
UpdatePosition(); UpdatePosition();
OnRotationChanged?.Invoke(this, previousRotation); OnRotationChanged?.Invoke(this, args);
OnPositionChanged?.Invoke(this, previousPosition); OnPositionChanged?.Invoke(this, new(previousPosition));
} }
private void UpdateLocalPosition() private void UpdateLocalPosition()
@ -207,12 +207,12 @@ public class Transform2D : Behaviour, ITransform2D
protected override void InitializeInternal() protected override void InitializeInternal()
{ {
UpdateReferences(UniverseObject.Parent); UpdateReferences(UniverseObject.Parent);
UniverseObject.OnParentChanged += OnParentChanged; UniverseObject.OnParentChanged.AddListener(OnParentChanged);
} }
protected override void FinalizeInternal() protected override void FinalizeInternal()
{ {
UniverseObject.OnParentChanged -= OnParentChanged; UniverseObject.OnParentChanged.RemoveListener(OnParentChanged);
} }
private void UpdateReferences(IUniverseObject? parent) private void UpdateReferences(IUniverseObject? parent)
@ -220,48 +220,48 @@ public class Transform2D : Behaviour, ITransform2D
ITransform2D? previousParent = parentTransform; ITransform2D? previousParent = parentTransform;
if (previousParent is not null) if (previousParent is not null)
{ {
previousParent.OnPositionChanged -= RecalculatePosition; previousParent.OnPositionChanged.RemoveListener(RecalculatePosition);
previousParent.OnScaleChanged -= RecalculateScale; previousParent.OnScaleChanged.RemoveListener(RecalculateScale);
previousParent.OnRotationChanged -= RecalculateRotation; previousParent.OnRotationChanged.RemoveListener(RecalculateRotation);
previousParent.BehaviourController.UniverseObject.OnParentChanged -= OnParentChanged; previousParent.BehaviourController.UniverseObject.OnParentChanged.RemoveListener(OnParentChanged);
previousParent.BehaviourController.OnBehaviourAdded -= LookForTransform2D; previousParent.BehaviourController.OnBehaviourAdded.RemoveListener(LookForTransform2D);
} }
parentTransform = parent?.BehaviourController.GetBehaviour<ITransform2D>(); parentTransform = parent?.BehaviourController.GetBehaviour<ITransform2D>();
if (parentTransform is not null) if (parentTransform is not null)
{ {
parentTransform.OnPositionChanged += RecalculatePosition; parentTransform.OnPositionChanged.AddListener(RecalculatePosition);
parentTransform.OnScaleChanged += RecalculateScale; parentTransform.OnScaleChanged.AddListener(RecalculateScale);
parentTransform.OnRotationChanged += RecalculateRotation; parentTransform.OnRotationChanged.AddListener(RecalculateRotation);
parentTransform.BehaviourController.UniverseObject.OnParentChanged += OnParentChanged; parentTransform.BehaviourController.UniverseObject.OnParentChanged.AddListener(OnParentChanged);
UpdatePosition(); UpdatePosition();
UpdateScale(); UpdateScale();
UpdateRotation(); UpdateRotation();
} }
else if (UniverseObject.Parent is not null) else if (UniverseObject.Parent is not null)
UniverseObject.Parent.BehaviourController.OnBehaviourAdded += LookForTransform2D; UniverseObject.Parent.BehaviourController.OnBehaviourAdded.AddListener(LookForTransform2D);
UpdateLocalPosition(); UpdateLocalPosition();
UpdateLocalScale(); UpdateLocalScale();
UpdateLocalRotation(); UpdateLocalRotation();
OnPositionChanged?.Invoke(this, Position); OnPositionChanged?.Invoke(this, new(Position));
OnScaleChanged?.Invoke(this, Scale); OnScaleChanged?.Invoke(this, new(Scale));
OnRotationChanged?.Invoke(this, Rotation); OnRotationChanged?.Invoke(this, new(Rotation));
} }
private void LookForTransform2D(IBehaviourController sender, IBehaviour behaviourAdded) private void LookForTransform2D(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
{ {
if (behaviourAdded is not ITransform2D transform2D) if (args.BehaviourAdded is not ITransform2D)
return; return;
UpdateReferences(UniverseObject.Parent); UpdateReferences(UniverseObject.Parent);
} }
private void OnParentChanged(IUniverseObject sender, IUniverseObject? previousParent, IUniverseObject? newParent) private void OnParentChanged(IUniverseObject sender, IUniverseObject.ParentChangedArguments args)
{ {
UpdateReferences(newParent); UpdateReferences(args.CurrentParent);
} }
} }

49
Engine.Core/Universe.cs
View File

@ -7,21 +7,28 @@ namespace Syntriax.Engine.Core;
[System.Diagnostics.DebuggerDisplay("UniverseObject Count: {_universeObjects.Count}")] [System.Diagnostics.DebuggerDisplay("UniverseObject Count: {_universeObjects.Count}")]
public class Universe : BaseEntity, IUniverse public class Universe : BaseEntity, IUniverse
{ {
public event IUniverse.UpdateEventHandler? OnPreUpdate = null; public Event<IUniverse, IUniverse.UpdateArguments> OnPreUpdate { get; } = new();
public event IUniverse.UpdateEventHandler? OnUpdate = null; public Event<IUniverse, IUniverse.UpdateArguments> OnUpdate { get; } = new();
public event IUniverse.UpdateEventHandler? OnPostUpdate = null; public Event<IUniverse, IUniverse.UpdateArguments> OnPostUpdate { get; } = new();
public event IUniverse.DrawEventHandler? OnPreDraw = null; public Event<IUniverse> OnPreDraw { get; } = new();
public event IUniverse.DrawEventHandler? OnDraw = null; public Event<IUniverse> OnDraw { get; } = new();
public event IUniverse.DrawEventHandler? OnPostDraw = null; public Event<IUniverse> OnPostDraw { get; } = new();
public Event<IUniverse, IUniverse.UniverseObjectRegisteredArguments> OnUniverseObjectRegistered { get; } = new();
public Event<IUniverse, IUniverse.UniverseObjectUnRegisteredArguments> OnUniverseObjectUnRegistered { get; } = new();
public Event<IUniverse, IUniverse.TimeScaleChangedArguments> OnTimeScaleChanged { get; } = new();
public event IUniverse.UniverseObjectRegisteredEventHandler? OnUniverseObjectRegistered = null; private readonly Event<IInitializable>.EventHandler delegateOnUniverseObjectFinalize = null!;
public event IUniverse.UniverseObjectUnRegisteredEventHandler? OnUniverseObjectUnRegistered = null; private readonly Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments>.EventHandler delegateOnUniverseObjectExitedUniverse = null!;
public event IUniverse.TimeScaleChangedEventHandler? OnTimeScaleChanged = null;
private readonly List<IUniverseObject> _universeObjects = new(Constants.UNIVERSE_OBJECTS_SIZE_INITIAL); private readonly List<IUniverseObject> _universeObjects = new(Constants.UNIVERSE_OBJECTS_SIZE_INITIAL);
private float _timeScale = 1f; private float _timeScale = 1f;
public Universe()
{
delegateOnUniverseObjectFinalize = OnUniverseObjectFinalize;
delegateOnUniverseObjectExitedUniverse = OnUniverseObjectExitedUniverse;
}
public IReadOnlyList<IUniverseObject> UniverseObjects => _universeObjects; public IReadOnlyList<IUniverseObject> UniverseObjects => _universeObjects;
public UniverseTime Time { get; private set; } = new(); public UniverseTime Time { get; private set; } = new();
@ -37,7 +44,7 @@ public class Universe : BaseEntity, IUniverse
float previousTimeScale = _timeScale; float previousTimeScale = _timeScale;
_timeScale = value; _timeScale = value;
OnTimeScaleChanged?.Invoke(this, previousTimeScale); OnTimeScaleChanged?.Invoke(this, new(previousTimeScale));
} }
} }
@ -46,8 +53,8 @@ public class Universe : BaseEntity, IUniverse
if (_universeObjects.Contains(universeObject)) if (_universeObjects.Contains(universeObject))
throw new Exception($"{nameof(IUniverseObject)} named {universeObject.Name} is already registered to the {nameof(Universe)}."); throw new Exception($"{nameof(IUniverseObject)} named {universeObject.Name} is already registered to the {nameof(Universe)}.");
universeObject.OnFinalized += OnUniverseObjectFinalize; universeObject.OnFinalized.AddListener(delegateOnUniverseObjectFinalize);
universeObject.OnExitedUniverse += OnUniverseObjectExitedUniverse; universeObject.OnExitedUniverse.AddListener(delegateOnUniverseObjectExitedUniverse);
if (!universeObject.Initialize()) if (!universeObject.Initialize())
throw new Exception($"{universeObject.Name} can't be initialized"); throw new Exception($"{universeObject.Name} can't be initialized");
@ -60,7 +67,7 @@ public class Universe : BaseEntity, IUniverse
if (!universeObject.EnterUniverse(this)) if (!universeObject.EnterUniverse(this))
throw new Exception($"{universeObject.Name} can't enter the universe"); throw new Exception($"{universeObject.Name} can't enter the universe");
OnUniverseObjectRegistered?.Invoke(this, universeObject); OnUniverseObjectRegistered?.Invoke(this, new(universeObject));
} }
public T InstantiateUniverseObject<T>(params object?[]? args) where T : class, IUniverseObject public T InstantiateUniverseObject<T>(params object?[]? args) where T : class, IUniverseObject
@ -81,8 +88,8 @@ public class Universe : BaseEntity, IUniverse
if (!_universeObjects.Contains(universeObject)) if (!_universeObjects.Contains(universeObject))
throw new Exception($"{nameof(IUniverseObject)} named {universeObject.Name} is not registered to the {nameof(Universe)}."); throw new Exception($"{nameof(IUniverseObject)} named {universeObject.Name} is not registered to the {nameof(Universe)}.");
universeObject.OnFinalized -= OnUniverseObjectFinalize; universeObject.OnFinalized.RemoveListener(delegateOnUniverseObjectFinalize);
universeObject.OnExitedUniverse -= OnUniverseObjectExitedUniverse; universeObject.OnExitedUniverse.RemoveListener(delegateOnUniverseObjectExitedUniverse);
for (int i = universeObject.Children.Count - 1; i >= 0; i--) for (int i = universeObject.Children.Count - 1; i >= 0; i--)
Remove(universeObject.Children[i]); Remove(universeObject.Children[i]);
@ -95,7 +102,7 @@ public class Universe : BaseEntity, IUniverse
if (!universeObject.Finalize()) if (!universeObject.Finalize())
throw new Exception($"{universeObject.Name} can't be finalized"); throw new Exception($"{universeObject.Name} can't be finalized");
OnUniverseObjectUnRegistered?.Invoke(this, universeObject); OnUniverseObjectUnRegistered?.Invoke(this, new(universeObject));
} }
protected override void InitializeInternal() protected override void InitializeInternal()
@ -118,9 +125,9 @@ public class Universe : BaseEntity, IUniverse
UnscaledTime = engineTime; UnscaledTime = engineTime;
Time = new(TimeSpan.FromTicks((long)(Time.TimeSinceStart.Ticks + engineTime.DeltaSpan.Ticks * TimeScale)), TimeSpan.FromTicks((long)(engineTime.DeltaSpan.Ticks * TimeScale))); Time = new(TimeSpan.FromTicks((long)(Time.TimeSinceStart.Ticks + engineTime.DeltaSpan.Ticks * TimeScale)), TimeSpan.FromTicks((long)(engineTime.DeltaSpan.Ticks * TimeScale)));
OnPreUpdate?.Invoke(this, Time); OnPreUpdate?.Invoke(this, new(Time));
OnUpdate?.Invoke(this, Time); OnUpdate?.Invoke(this, new(Time));
OnPostUpdate?.Invoke(this, Time); OnPostUpdate?.Invoke(this, new(Time));
} }
public void Draw() public void Draw()
@ -138,7 +145,7 @@ public class Universe : BaseEntity, IUniverse
Remove(universeObject); Remove(universeObject);
} }
private void OnUniverseObjectExitedUniverse(IUniverseObject sender, IUniverse universe) private void OnUniverseObjectExitedUniverse(IUniverseObject sender, IUniverseObject.ExitedUniverseArguments args)
{ {
if (sender is IUniverseObject universeObject) if (sender is IUniverseObject universeObject)
Remove(universeObject); Remove(universeObject);

43
Engine.Core/UniverseObject.cs
View File

@ -6,14 +6,15 @@ namespace Syntriax.Engine.Core;
[System.Diagnostics.DebuggerDisplay("Name: {Name}, Initialized: {Initialized}")] [System.Diagnostics.DebuggerDisplay("Name: {Name}, Initialized: {Initialized}")]
public class UniverseObject : BaseEntity, IUniverseObject public class UniverseObject : BaseEntity, IUniverseObject
{ {
public event IUniverseObject.EnteredUniverseEventHandler? OnEnteredUniverse = null; public Event<IUniverseObject, IUniverseObject.EnteredUniverseArguments> OnEnteredUniverse { get; } = new();
public event IUniverseObject.ExitedUniverseEventHandler? OnExitedUniverse = null; public Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments> OnExitedUniverse { get; } = new();
public event IUniverseObject.ParentChangedEventHandler? OnParentChanged = null; public Event<IUniverseObject, IUniverseObject.ParentChangedArguments> OnParentChanged { get; } = new();
public event IUniverseObject.ChildrenAddedEventHandler? OnChildrenAdded = null; public Event<IUniverseObject, IUniverseObject.ChildrenAddedArguments> OnChildrenAdded { get; } = new();
public event IUniverseObject.ChildrenRemovedEventHandler? OnChildrenRemoved = null; public Event<IUniverseObject, IUniverseObject.ChildrenRemovedArguments> OnChildrenRemoved { get; } = new();
public event IHasBehaviourController.BehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned = null;
public event INameable.NameChangedEventHandler? OnNameChanged = null; public Event<IActive, IActive.ActiveChangedArguments> OnActiveChanged { get; } = new();
public event IActive.ActiveChangedEventHandler? OnActiveChanged = null; public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; } = new();
public Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; } = new();
private string _name = nameof(UniverseObject); private string _name = nameof(UniverseObject);
private IUniverse _universe = null!; private IUniverse _universe = null!;
@ -37,7 +38,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
string previousName = _name; string previousName = _name;
_name = value; _name = value;
OnNameChanged?.Invoke(this, previousName); OnNameChanged?.Invoke(this, new(previousName));
} }
} }
@ -50,7 +51,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
_universe = universe; _universe = universe;
UpdateActive(); UpdateActive();
OnEnteringUniverse(universe); OnEnteringUniverse(universe);
OnEnteredUniverse?.Invoke(this, universe); OnEnteredUniverse?.Invoke(this, new(universe));
return true; return true;
} }
@ -62,7 +63,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
OnExitingUniverse(universe); OnExitingUniverse(universe);
_universe = null!; _universe = null!;
OnExitedUniverse?.Invoke(this, universe); OnExitedUniverse?.Invoke(this, new(universe));
return true; return true;
} }
@ -78,7 +79,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
if (previousParent is not null) if (previousParent is not null)
{ {
previousParent.RemoveChild(this); previousParent.RemoveChild(this);
previousParent.OnActiveChanged -= OnParentActiveChanged; previousParent.OnActiveChanged.RemoveListener(OnParentActiveChanged);
} }
Parent = parent; Parent = parent;
@ -89,11 +90,11 @@ public class UniverseObject : BaseEntity, IUniverseObject
parent.Universe.Register(this); parent.Universe.Register(this);
parent.AddChild(this); parent.AddChild(this);
parent.OnActiveChanged += OnParentActiveChanged; parent.OnActiveChanged.AddListener(OnParentActiveChanged);
} }
UpdateActive(); UpdateActive();
OnParentChanged?.Invoke(this, previousParent, parent); OnParentChanged?.Invoke(this, new(previousParent, parent));
} }
public void AddChild(IUniverseObject parent) public void AddChild(IUniverseObject parent)
@ -103,7 +104,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
_children.Add(parent); _children.Add(parent);
parent.SetParent(this); parent.SetParent(this);
OnChildrenAdded?.Invoke(this, parent); OnChildrenAdded?.Invoke(this, new(parent));
} }
public void RemoveChild(IUniverseObject child) public void RemoveChild(IUniverseObject child)
@ -112,7 +113,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
return; return;
child.SetParent(null); child.SetParent(null);
OnChildrenRemoved?.Invoke(this, child); OnChildrenRemoved?.Invoke(this, new(child));
} }
protected virtual void OnAssign(IBehaviourController behaviourController) { } protected virtual void OnAssign(IBehaviourController behaviourController) { }
@ -131,11 +132,11 @@ public class UniverseObject : BaseEntity, IUniverseObject
{ {
base.OnAssign(stateEnable); base.OnAssign(stateEnable);
stateEnable.OnEnabledChanged += OnStateEnabledChanged; stateEnable.OnEnabledChanged.AddListener(OnStateEnabledChanged);
} }
private void OnParentActiveChanged(IActive sender, bool previousState) => UpdateActive(); private void OnParentActiveChanged(IActive sender, IActive.ActiveChangedArguments args) => UpdateActive();
private void OnStateEnabledChanged(IStateEnable sender, bool previousState) => UpdateActive(); private void OnStateEnabledChanged(IStateEnable sender, IStateEnable.EnabledChangedArguments args) => UpdateActive();
private void UpdateActive() private void UpdateActive()
{ {
@ -143,13 +144,13 @@ public class UniverseObject : BaseEntity, IUniverseObject
_isActive = StateEnable.Enabled && (Parent?.IsActive ?? true); _isActive = StateEnable.Enabled && (Parent?.IsActive ?? true);
if (previousActive != IsActive) if (previousActive != IsActive)
OnActiveChanged?.Invoke(this, previousActive); OnActiveChanged?.Invoke(this, new(previousActive));
} }
protected override void UnassignInternal() protected override void UnassignInternal()
{ {
base.UnassignInternal(); base.UnassignInternal();
StateEnable.OnEnabledChanged -= OnStateEnabledChanged; StateEnable.OnEnabledChanged.RemoveListener(OnStateEnabledChanged);
} }
protected override void InitializeInternal() protected override void InitializeInternal()

12
Engine.Physics2D/Abstract/ICollider2D.cs
View File

@ -10,17 +10,17 @@ public interface ICollider2D : IBehaviour
/// <summary> /// <summary>
/// Event triggered when a collision is detected. /// Event triggered when a collision is detected.
/// </summary> /// </summary>
event CollisionDetectedEventHandler? OnCollisionDetected; Event<ICollider2D, CollisionDetectionInformation> OnCollisionDetected { get; }
/// <summary> /// <summary>
/// Event triggered when a collision is resolved. /// Event triggered when a collision is resolved.
/// </summary> /// </summary>
event CollisionResolvedEventHandler? OnCollisionResolved; Event<ICollider2D, CollisionDetectionInformation> OnCollisionResolved { get; }
/// <summary> /// <summary>
/// Event triggered when another <see cref="ICollider2D"/> triggers this <see cref="ICollider2D"/>. /// Event triggered when another <see cref="ICollider2D"/> triggers this <see cref="ICollider2D"/>.
/// </summary> /// </summary>
event TriggeredEventHandler? OnTriggered; Event<ICollider2D, ICollider2D> OnTriggered { get; }
/// <inheritdoc cref="ITransform2D" /> /// <inheritdoc cref="ITransform2D" />
ITransform2D Transform { get; } ITransform2D Transform { get; }
@ -44,7 +44,7 @@ public interface ICollider2D : IBehaviour
void Resolve(CollisionDetectionInformation collisionDetectionInformation); void Resolve(CollisionDetectionInformation collisionDetectionInformation);
void Trigger(ICollider2D initiator); void Trigger(ICollider2D initiator);
delegate void CollisionDetectedEventHandler(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation); readonly record struct CollisionDetectedArguments(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
delegate void CollisionResolvedEventHandler(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation); readonly record struct CollisionResolvedArguments(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
delegate void TriggeredEventHandler(ICollider2D sender, ICollider2D initiatorCollider); readonly record struct TriggeredArguments(ICollider2D sender, ICollider2D initiatorCollider);
} }

10
Engine.Physics2D/Abstract/IPhysicsEngine2D.cs
View File

@ -1,3 +1,5 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Physics2D; namespace Syntriax.Engine.Physics2D;
/// <summary> /// <summary>
@ -8,12 +10,12 @@ public interface IPhysicsEngine2D
/// <summary> /// <summary>
/// Event triggered when the <see cref="IPhysicsEngine2D"/> has done a single physics iteration. /// Event triggered when the <see cref="IPhysicsEngine2D"/> has done a single physics iteration.
/// </summary> /// </summary>
event PhysicsIterationEventHandler? OnPhysicsIteration; Event<IPhysicsEngine2D, float> OnPhysicsIteration { get; }
/// <summary> /// <summary>
/// Event triggered when the <see cref="IPhysicsEngine2D"/> has done a full physics step/>. /// Event triggered when the <see cref="IPhysicsEngine2D"/> has done a full physics step/>.
/// </summary> /// </summary>
event PhysicsStepEventHandler? OnPhysicsStep; Event<IPhysicsEngine2D, float> OnPhysicsStep { get; }
/// <summary> /// <summary>
/// The number of iterations the <see cref="IPhysicsEngine2D"/> performs per step. /// The number of iterations the <see cref="IPhysicsEngine2D"/> performs per step.
@ -33,6 +35,6 @@ public interface IPhysicsEngine2D
/// <param name="deltaTime">The time step.</param> /// <param name="deltaTime">The time step.</param>
void StepIndividual(IRigidBody2D rigidBody, float deltaTime); void StepIndividual(IRigidBody2D rigidBody, float deltaTime);
delegate void PhysicsIterationEventHandler(IPhysicsEngine2D sender, float iterationDeltaTime); readonly record struct PhysicsIterationArguments(IPhysicsEngine2D sender, float iterationDeltaTime);
delegate void PhysicsStepEventHandler(IPhysicsEngine2D sender, float stepDeltaTime); readonly record struct PhysicsStepArguments(IPhysicsEngine2D sender, float stepDeltaTime);
} }

61
Engine.Physics2D/Collider2DBehaviourBase.cs
View File

@ -4,13 +4,30 @@ namespace Syntriax.Engine.Physics2D;
public abstract class Collider2DBehaviourBase : Behaviour2D, ICollider2D public abstract class Collider2DBehaviourBase : Behaviour2D, ICollider2D
{ {
public event ICollider2D.CollisionDetectedEventHandler? OnCollisionDetected = null; public Event<ICollider2D, CollisionDetectionInformation> OnCollisionDetected { get; } = new();
public event ICollider2D.CollisionResolvedEventHandler? OnCollisionResolved = null; public Event<ICollider2D, CollisionDetectionInformation> OnCollisionResolved { get; } = new();
public event ICollider2D.TriggeredEventHandler? OnTriggered = null; public Event<ICollider2D, ICollider2D> OnTriggered { get; } = new();
private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAddedToController = null!;
private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler delegateOnBehaviourRemovedFromController = null!;
private readonly Event<ITransform2D, ITransform2D.PositionChangedArguments>.EventHandler delegateSetNeedsRecalculationFromPosition = null!;
private readonly Event<ITransform2D, ITransform2D.RotationChangedArguments>.EventHandler delegateSetNeedsRecalculationFromRotation = null!;
private readonly Event<ITransform2D, ITransform2D.ScaleChangedArguments>.EventHandler delegateSetNeedsRecalculationFromScale = null!;
private readonly Event<IUniverseObject, IUniverseObject.ParentChangedArguments>.EventHandler delegateUpdateRigidBody2D = null!;
protected bool NeedsRecalculation { get; set; } = true; protected bool NeedsRecalculation { get; set; } = true;
protected IRigidBody2D? _rigidBody2D = null; protected IRigidBody2D? _rigidBody2D = null;
protected Collider2DBehaviourBase()
{
delegateOnBehaviourAddedToController = OnBehaviourAddedToController;
delegateOnBehaviourRemovedFromController = OnBehaviourRemovedFromController;
delegateSetNeedsRecalculationFromPosition = SetNeedsRecalculationFromPosition;
delegateSetNeedsRecalculationFromRotation = SetNeedsRecalculationFromRotation;
delegateSetNeedsRecalculationFromScale = SetNeedsRecalculationFromScale;
delegateUpdateRigidBody2D = UpdateRigidBody2D;
}
public IRigidBody2D? RigidBody2D => _rigidBody2D; public IRigidBody2D? RigidBody2D => _rigidBody2D;
public bool IsTrigger { get; set; } = false; public bool IsTrigger { get; set; } = false;
@ -29,44 +46,44 @@ public abstract class Collider2DBehaviourBase : Behaviour2D, ICollider2D
{ {
BehaviourController.TryGetBehaviourInParent(out _rigidBody2D); BehaviourController.TryGetBehaviourInParent(out _rigidBody2D);
BehaviourController.OnBehaviourAdded += OnBehaviourAddedToController; BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAddedToController);
BehaviourController.OnBehaviourRemoved += OnBehaviourRemovedFromController; BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemovedFromController);
Transform.OnPositionChanged += SetNeedsRecalculationFromPosition; Transform.OnPositionChanged.AddListener(delegateSetNeedsRecalculationFromPosition);
Transform.OnRotationChanged += SetNeedsRecalculationFromRotation; Transform.OnRotationChanged.AddListener(delegateSetNeedsRecalculationFromRotation);
Transform.OnScaleChanged += SetNeedsRecalculationFromScale; Transform.OnScaleChanged.AddListener(delegateSetNeedsRecalculationFromScale);
UniverseObject.OnParentChanged += UpdateRigidBody2D; UniverseObject.OnParentChanged.AddListener(delegateUpdateRigidBody2D);
} }
private void UpdateRigidBody2D(IUniverseObject sender, IUniverseObject? previousParent, IUniverseObject? newParent) private void UpdateRigidBody2D(IUniverseObject sender, IUniverseObject.ParentChangedArguments args)
{ {
BehaviourController.TryGetBehaviourInParent(out _rigidBody2D); BehaviourController.TryGetBehaviourInParent(out _rigidBody2D);
} }
private void OnBehaviourAddedToController(IBehaviourController _, IBehaviour behaviour) private void OnBehaviourAddedToController(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
{ {
if (behaviour is IRigidBody2D rigidBody) if (args.BehaviourAdded is IRigidBody2D rigidBody)
_rigidBody2D = rigidBody; _rigidBody2D = rigidBody;
} }
private void OnBehaviourRemovedFromController(IBehaviourController _, IBehaviour behaviour) private void OnBehaviourRemovedFromController(IBehaviourController sender, IBehaviourController.BehaviourRemovedArguments args)
{ {
if (behaviour is IRigidBody2D _) if (args.BehaviourRemoved is IRigidBody2D)
_rigidBody2D = null; _rigidBody2D = null;
} }
private void SetNeedsRecalculationFromScale(ITransform2D sender, Vector2D previousScale) => NeedsRecalculation = true; private void SetNeedsRecalculationFromPosition(ITransform2D sender, ITransform2D.PositionChangedArguments args) => NeedsRecalculation = true;
private void SetNeedsRecalculationFromPosition(ITransform2D sender, Vector2D previousPosition) => NeedsRecalculation = true; private void SetNeedsRecalculationFromScale(ITransform2D sender, ITransform2D.ScaleChangedArguments args) => NeedsRecalculation = true;
private void SetNeedsRecalculationFromRotation(ITransform2D sender, float previousRotation) => NeedsRecalculation = true; private void SetNeedsRecalculationFromRotation(ITransform2D sender, ITransform2D.RotationChangedArguments args) => NeedsRecalculation = true;
protected override void OnFinalize() protected override void OnFinalize()
{ {
BehaviourController.OnBehaviourAdded -= OnBehaviourAddedToController; BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAddedToController);
BehaviourController.OnBehaviourRemoved -= OnBehaviourRemovedFromController; BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemovedFromController);
Transform.OnScaleChanged -= SetNeedsRecalculationFromScale; Transform.OnScaleChanged.RemoveListener(delegateSetNeedsRecalculationFromScale);
Transform.OnPositionChanged -= SetNeedsRecalculationFromPosition; Transform.OnPositionChanged.RemoveListener(delegateSetNeedsRecalculationFromPosition);
Transform.OnRotationChanged -= SetNeedsRecalculationFromRotation; Transform.OnRotationChanged.RemoveListener(delegateSetNeedsRecalculationFromRotation);
} }
public void Detect(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionDetected?.Invoke(this, collisionDetectionInformation); public void Detect(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionDetected?.Invoke(this, collisionDetectionInformation);

21
Engine.Physics2D/PhysicsCoroutineManager.cs
View File

@ -7,6 +7,8 @@ namespace Syntriax.Engine.Physics2D;
public class PhysicsCoroutineManager : UniverseObject public class PhysicsCoroutineManager : UniverseObject
{ {
private readonly Event<IUniverse, IUniverse.UpdateArguments>.EventHandler delegateOnUpdate = null!;
private readonly List<IEnumerator> enumerators = []; private readonly List<IEnumerator> enumerators = [];
private IPhysicsEngine2D? physicsEngine = null; private IPhysicsEngine2D? physicsEngine = null;
@ -25,9 +27,9 @@ public class PhysicsCoroutineManager : UniverseObject
{ {
physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>(); physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>();
if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine) if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine)
foundPhysicsEngine.OnPhysicsStep += OnPhysicsStep; foundPhysicsEngine.OnPhysicsStep.RemoveListener(OnPhysicsStep);
else else
universe.OnUpdate += OnUpdate; universe.OnUpdate.AddListener(OnUpdate);
} }
private void OnPhysicsStep(IPhysicsEngine2D sender, float stepDeltaTime) private void OnPhysicsStep(IPhysicsEngine2D sender, float stepDeltaTime)
@ -45,11 +47,11 @@ public class PhysicsCoroutineManager : UniverseObject
protected override void OnExitingUniverse(IUniverse universe) protected override void OnExitingUniverse(IUniverse universe)
{ {
if (physicsEngine is IPhysicsEngine2D existingPhysicsEngine) if (physicsEngine is IPhysicsEngine2D existingPhysicsEngine)
existingPhysicsEngine.OnPhysicsStep -= OnPhysicsStep; existingPhysicsEngine.OnPhysicsStep.RemoveListener(OnPhysicsStep);
universe.OnUpdate -= OnUpdate; universe.OnUpdate.RemoveListener(OnUpdate);
} }
private void OnUpdate(IUniverse sender, UniverseTime engineTime) private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments args)
{ {
if (Universe is not IUniverse universe) if (Universe is not IUniverse universe)
return; return;
@ -57,8 +59,13 @@ public class PhysicsCoroutineManager : UniverseObject
physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>(); physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>();
if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine) if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine)
{ {
foundPhysicsEngine.OnPhysicsStep += OnPhysicsStep; foundPhysicsEngine.OnPhysicsStep.AddListener(OnPhysicsStep);
universe.OnUpdate -= OnUpdate; universe.OnUpdate.RemoveListener(OnUpdate);
} }
} }
public PhysicsCoroutineManager()
{
delegateOnUpdate = OnUpdate;
}
} }

18
Engine.Physics2D/PhysicsEngine2D.cs
View File

@ -4,8 +4,10 @@ namespace Syntriax.Engine.Physics2D;
public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
{ {
public event IPhysicsEngine2D.PhysicsIterationEventHandler? OnPhysicsIteration = null; public Event<IPhysicsEngine2D, float> OnPhysicsIteration { get; } = new();
public event IPhysicsEngine2D.PhysicsStepEventHandler? OnPhysicsStep = null; public Event<IPhysicsEngine2D, float> OnPhysicsStep { get; } = new();
private readonly Event<IUniverse, IUniverse.UpdateArguments>.EventHandler delegateOnPreUpdate = null!;
private float physicsTicker = 0f; private float physicsTicker = 0f;
private int _iterationPerStep = 1; private int _iterationPerStep = 1;
@ -178,7 +180,7 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
colliderCollector.Assign(universe); colliderCollector.Assign(universe);
rigidBodyCollector.Assign(universe); rigidBodyCollector.Assign(universe);
universe.OnPreUpdate += OnEnginePreUpdate; universe.OnPreUpdate.AddListener(OnEnginePreUpdate);
} }
protected override void OnExitingUniverse(IUniverse universe) protected override void OnExitingUniverse(IUniverse universe)
@ -189,12 +191,12 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
colliderCollector.Unassign(); colliderCollector.Unassign();
rigidBodyCollector.Unassign(); rigidBodyCollector.Unassign();
universe.OnPreUpdate -= OnEnginePreUpdate; universe.OnPreUpdate.RemoveListener(OnEnginePreUpdate);
} }
private void OnEnginePreUpdate(IUniverse sender, UniverseTime engineTime) private void OnEnginePreUpdate(IUniverse sender, IUniverse.UpdateArguments args)
{ {
physicsTicker += engineTime.DeltaTime; physicsTicker += args.EngineTime.DeltaTime;
while (physicsTicker >= IterationPeriod) while (physicsTicker >= IterationPeriod)
{ {
@ -207,11 +209,15 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
{ {
collisionDetector = new CollisionDetector2D(); collisionDetector = new CollisionDetector2D();
collisionResolver = new CollisionResolver2D(); collisionResolver = new CollisionResolver2D();
delegateOnPreUpdate = OnEnginePreUpdate;
} }
public PhysicsEngine2D(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver) public PhysicsEngine2D(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
{ {
this.collisionDetector = collisionDetector; this.collisionDetector = collisionDetector;
this.collisionResolver = collisionResolver; this.collisionResolver = collisionResolver;
delegateOnPreUpdate = OnEnginePreUpdate;
} }
} }

28
Engine.Physics2D/PhysicsEngine2DStandalone.cs
View File

@ -6,8 +6,11 @@ namespace Syntriax.Engine.Physics2D;
public class PhysicsEngine2DStandalone : IPhysicsEngine2D public class PhysicsEngine2DStandalone : IPhysicsEngine2D
{ {
public event IPhysicsEngine2D.PhysicsIterationEventHandler? OnPhysicsIteration = null; public Event<IPhysicsEngine2D, float> OnPhysicsIteration { get; } = new();
public event IPhysicsEngine2D.PhysicsStepEventHandler? OnPhysicsStep = null; public Event<IPhysicsEngine2D, float> OnPhysicsStep { get; } = new();
private readonly Event<IBehaviourController, IBehaviourController.BehaviourAddedArguments>.EventHandler delegateOnBehaviourAdded = null!;
private readonly Event<IBehaviourController, IBehaviourController.BehaviourRemovedArguments>.EventHandler delegateOnBehaviourRemoved = null!;
private readonly List<IRigidBody2D> rigidBodies = new(32); private readonly List<IRigidBody2D> rigidBodies = new(32);
private readonly List<ICollider2D> colliders = new(64); private readonly List<ICollider2D> colliders = new(64);
@ -29,13 +32,16 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
foreach (ICollider2D collider2D in rigidBody.BehaviourController.GetBehaviours<ICollider2D>()) foreach (ICollider2D collider2D in rigidBody.BehaviourController.GetBehaviours<ICollider2D>())
colliders.Add(collider2D); colliders.Add(collider2D);
rigidBody.BehaviourController.OnBehaviourAdded += OnBehaviourAdded; rigidBody.BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAdded);
rigidBody.BehaviourController.OnBehaviourRemoved += OnBehaviourRemoved; rigidBody.BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemoved);
} }
public void RemoveRigidBody(IRigidBody2D rigidBody) public void RemoveRigidBody(IRigidBody2D rigidBody)
{ {
rigidBodies.Remove(rigidBody); rigidBodies.Remove(rigidBody);
rigidBody.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
rigidBody.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
} }
public void Step(float deltaTime) public void Step(float deltaTime)
@ -172,17 +178,17 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
rigidBody.Transform.Rotation += rigidBody.AngularVelocity * intervalDeltaTime; rigidBody.Transform.Rotation += rigidBody.AngularVelocity * intervalDeltaTime;
} }
private void OnBehaviourAdded(IBehaviourController controller, IBehaviour behaviour) private void OnBehaviourAdded(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
{ {
if (behaviour is not ICollider2D collider2D) if (args.BehaviourAdded is not ICollider2D collider2D)
return; return;
colliders.Add(collider2D); colliders.Add(collider2D);
} }
private void OnBehaviourRemoved(IBehaviourController controller, IBehaviour behaviour) private void OnBehaviourRemoved(IBehaviourController sender, IBehaviourController.BehaviourRemovedArguments args)
{ {
if (behaviour is not ICollider2D collider2D) if (args.BehaviourRemoved is not ICollider2D collider2D)
return; return;
colliders.Remove(collider2D); colliders.Remove(collider2D);
@ -192,11 +198,17 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
{ {
collisionDetector = new CollisionDetector2D(); collisionDetector = new CollisionDetector2D();
collisionResolver = new CollisionResolver2D(); collisionResolver = new CollisionResolver2D();
delegateOnBehaviourAdded = OnBehaviourAdded;
delegateOnBehaviourRemoved = OnBehaviourRemoved;
} }
public PhysicsEngine2DStandalone(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver) public PhysicsEngine2DStandalone(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
{ {
this.collisionDetector = collisionDetector; this.collisionDetector = collisionDetector;
this.collisionResolver = collisionResolver; this.collisionResolver = collisionResolver;
delegateOnBehaviourAdded = OnBehaviourAdded;
delegateOnBehaviourRemoved = OnBehaviourRemoved;
} }
} }

14
Engine.Systems/Input/IButtonInputs.cs
View File

@ -4,15 +4,15 @@ namespace Syntriax.Engine.Systems.Input;
public interface IButtonInputs<T> : IHasStateEnable public interface IButtonInputs<T> : IHasStateEnable
{ {
event ButtonCallbackEventHandler? OnAnyButtonPressed; Event<IButtonInputs<T>, ButtonCallbackArguments> OnAnyButtonPressed { get; }
event ButtonCallbackEventHandler? OnAnyButtonReleased; Event<IButtonInputs<T>, ButtonCallbackArguments> OnAnyButtonReleased { get; }
void RegisterOnPress(T button, ButtonCallbackEventHandler callback); void RegisterOnPress(T button, Event<IButtonInputs<T>, ButtonCallbackArguments>.EventHandler callback);
void UnregisterOnPress(T button, ButtonCallbackEventHandler callback); void UnregisterOnPress(T button, Event<IButtonInputs<T>, ButtonCallbackArguments>.EventHandler callback);
void RegisterOnRelease(T button, ButtonCallbackEventHandler callback); void RegisterOnRelease(T button, Event<IButtonInputs<T>, ButtonCallbackArguments>.EventHandler callback);
void UnregisterOnRelease(T button, ButtonCallbackEventHandler callback); void UnregisterOnRelease(T button, Event<IButtonInputs<T>, ButtonCallbackArguments>.EventHandler callback);
bool IsPressed(T button); bool IsPressed(T button);
delegate void ButtonCallbackEventHandler(IButtonInputs<T> buttonInputs, T button); readonly record struct ButtonCallbackArguments(T Button);
} }

15
Engine.Systems/StateMachine/IState.cs
View File

@ -4,10 +4,10 @@ namespace Syntriax.Engine.Systems.StateMachine;
public interface IState : IEntity, INameable public interface IState : IEntity, INameable
{ {
event StateUpdateEventHandler? OnStateUpdate; Event<IState> OnStateUpdate { get; }
event StateTransitionedFromEventHandler? OnStateTransitionedFrom; Event<IState, StateTransitionedFromArguments> OnStateTransitionedFrom { get; }
event StateTransitionedToEventHandler? OnStateTransitionedTo; Event<IState, StateTransitionedToArguments> OnStateTransitionedTo { get; }
event StateTransitionReadyEventHandler? OnStateTransitionReady; Event<IState, StateTransitionReadyArguments> OnStateTransitionReady { get; }
IState? GetNextState(); IState? GetNextState();
@ -15,8 +15,7 @@ public interface IState : IEntity, INameable
void TransitionTo(IState from); void TransitionTo(IState from);
void TransitionFrom(IState to); void TransitionFrom(IState to);
delegate void StateUpdateEventHandler(IState sender); readonly record struct StateTransitionedFromArguments(IState ToState);
delegate void StateTransitionedFromEventHandler(IState sender, IState toState); readonly record struct StateTransitionedToArguments(IState FromState);
delegate void StateTransitionedToEventHandler(IState sender, IState fromState); readonly record struct StateTransitionReadyArguments(IState ToState);
delegate void StateTransitionReadyEventHandler(IState sender, IState toState);
} }

18
Engine.Systems/StateMachine/State.cs
View File

@ -6,11 +6,11 @@ namespace Syntriax.Engine.Systems.StateMachine;
public class State : BaseEntity, IState public class State : BaseEntity, IState
{ {
public event IState.StateUpdateEventHandler? OnStateUpdate = null; public Event<IState> OnStateUpdate { get; } = new();
public event IState.StateTransitionedFromEventHandler? OnStateTransitionedFrom = null; public Event<IState, IState.StateTransitionedFromArguments> OnStateTransitionedFrom { get; } = new();
public event IState.StateTransitionedToEventHandler? OnStateTransitionedTo = null; public Event<IState, IState.StateTransitionedToArguments> OnStateTransitionedTo { get; } = new();
public event IState.StateTransitionReadyEventHandler? OnStateTransitionReady = null; public Event<IState, IState.StateTransitionReadyArguments> OnStateTransitionReady { get; } = new();
public event INameable.NameChangedEventHandler? OnNameChanged = null; public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; } = new();
private readonly List<StateTransition> transitions = []; private readonly List<StateTransition> transitions = [];
private readonly Dictionary<string, StateTransition> possibleTransitions = []; private readonly Dictionary<string, StateTransition> possibleTransitions = [];
@ -28,7 +28,7 @@ public class State : BaseEntity, IState
string previousName = _name; string previousName = _name;
_name = value; _name = value;
OnNameChanged?.Invoke(this, previousName); OnNameChanged?.Invoke(this, new(previousName));
} }
} }
@ -53,12 +53,12 @@ public class State : BaseEntity, IState
public void Update() public void Update()
{ {
if (GetNextState() is IState transitionState) if (GetNextState() is IState transitionState)
OnStateTransitionReady?.Invoke(this, transitionState); OnStateTransitionReady?.Invoke(this, new(transitionState));
OnStateUpdate?.Invoke(this); OnStateUpdate?.Invoke(this);
} }
public void TransitionTo(IState from) => OnStateTransitionedTo?.Invoke(this, from); public void TransitionTo(IState from) => OnStateTransitionedTo?.Invoke(this, new(from));
public void TransitionFrom(IState to) => OnStateTransitionedFrom?.Invoke(this, to); public void TransitionFrom(IState to) => OnStateTransitionedFrom?.Invoke(this, new(to));
public IState? GetNextState() public IState? GetNextState()
{ {

17
Engine.Systems/StateMachine/StateBehaviourBase.cs
View File

@ -4,12 +4,11 @@ namespace Syntriax.Engine.Systems.StateMachine;
public abstract class StateBehaviourBase : Behaviour, IState public abstract class StateBehaviourBase : Behaviour, IState
{ {
public event IState.StateUpdateEventHandler? OnStateUpdate = null; public Event<IState> OnStateUpdate { get; } = new();
public event IState.StateTransitionedFromEventHandler? OnStateTransitionedFrom = null; public Event<IState, IState.StateTransitionedFromArguments> OnStateTransitionedFrom { get; } = new();
public event IState.StateTransitionedToEventHandler? OnStateTransitionedTo = null; public Event<IState, IState.StateTransitionedToArguments> OnStateTransitionedTo { get; } = new();
public event INameable.NameChangedEventHandler? OnNameChanged = null; public Event<IState, IState.StateTransitionReadyArguments> OnStateTransitionReady { get; } = new();
public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; } = new();
public abstract event IState.StateTransitionReadyEventHandler? OnStateTransitionReady;
private string _name = string.Empty; private string _name = string.Empty;
public string Name public string Name
@ -22,7 +21,7 @@ public abstract class StateBehaviourBase : Behaviour, IState
string previousName = _name; string previousName = _name;
_name = value; _name = value;
OnNameChanged?.Invoke(this, previousName); OnNameChanged?.Invoke(this, new(previousName));
} }
} }
@ -37,14 +36,14 @@ public abstract class StateBehaviourBase : Behaviour, IState
public void TransitionTo(IState from) public void TransitionTo(IState from)
{ {
OnTransitionedToState(from); OnTransitionedToState(from);
OnStateTransitionedTo?.Invoke(this, from); OnStateTransitionedTo?.Invoke(this, new(from));
} }
protected virtual void OnTransitionedFromState(IState to) { } protected virtual void OnTransitionedFromState(IState to) { }
public void TransitionFrom(IState to) public void TransitionFrom(IState to)
{ {
OnTransitionedFromState(to); OnTransitionedFromState(to);
OnStateTransitionedFrom?.Invoke(this, to); OnStateTransitionedFrom?.Invoke(this, new(to));
} }
public abstract IState? GetNextState(); public abstract IState? GetNextState();

22
Engine.Systems/StateMachine/StateMachine.cs
View File

@ -5,9 +5,17 @@ namespace Syntriax.Engine.Systems.StateMachine;
public class StateMachine : Behaviour public class StateMachine : Behaviour
{ {
public event StateChangedEventHandler? OnStateChanged = null; public Event<StateMachine, StateChangedArguments> OnStateChanged { get; } = new();
private readonly Event<IState, IState.StateTransitionReadyArguments>.EventHandler delegateOnStateTransitionReady = null!;
private IState _state = new State(); private IState _state = new State();
public StateMachine()
{
delegateOnStateTransitionReady = OnStateTransitionReady;
}
[Serialize] [Serialize]
public IState State public IState State
{ {
@ -18,20 +26,20 @@ public class StateMachine : Behaviour
return; return;
IState previousState = _state; IState previousState = _state;
previousState.OnStateTransitionReady -= OnStateTransitionReady; previousState.OnStateTransitionReady.RemoveListener(delegateOnStateTransitionReady);
_state = value; _state = value;
previousState.TransitionFrom(value); previousState.TransitionFrom(value);
value.TransitionTo(_state); value.TransitionTo(_state);
OnStateChanged?.Invoke(this, previousState, value); OnStateChanged?.Invoke(this, new(value, previousState));
value.OnStateTransitionReady += OnStateTransitionReady; value.OnStateTransitionReady.AddListener(delegateOnStateTransitionReady);
} }
} }
private void OnStateTransitionReady(IState sender, IState toState) private void OnStateTransitionReady(IState sender, IState.StateTransitionReadyArguments args)
{ {
State = toState; State = args.ToState;
while (State.GetNextState() is IState nextState) while (State.GetNextState() is IState nextState)
State = nextState; State = nextState;
} }
@ -47,5 +55,5 @@ public class StateMachine : Behaviour
State.Update(); State.Update();
} }
public delegate void StateChangedEventHandler(StateMachine sender, IState previousState, IState newState); public readonly record struct StateChangedArguments(IState CurrentState, IState PreviousState);
} }

15
Engine.Systems/Time/IReadOnlyStopwatch.cs
View File

@ -1,18 +1,19 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Systems.Time; namespace Syntriax.Engine.Systems.Time;
public interface IReadOnlyStopwatch public interface IReadOnlyStopwatch
{ {
event StopwatchEventHandler? OnStarted; Event<IReadOnlyStopwatch> OnStarted { get; }
event StopwatchDeltaEventHandler? OnDelta; Event<IReadOnlyStopwatch, StopwatchDeltaArguments> OnDelta { get; }
event StopwatchEventHandler? OnStopped; Event<IReadOnlyStopwatch> OnStopped { get; }
double Time { get; } double Time { get; }
TimerState State { get; } TimerState State { get; }
event StopwatchEventHandler? OnPaused; Event<IReadOnlyStopwatch> OnPaused { get; }
event StopwatchEventHandler? OnResumed; Event<IReadOnlyStopwatch> OnResumed { get; }
delegate void StopwatchEventHandler(IReadOnlyStopwatch sender); readonly record struct StopwatchDeltaArguments(double Delta);
delegate void StopwatchDeltaEventHandler(IReadOnlyStopwatch sender, double delta);
} }

6
Engine.Systems/Time/IReadOnlyTicker.cs
View File

@ -1,11 +1,11 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Systems.Time; namespace Syntriax.Engine.Systems.Time;
public interface IReadOnlyTicker : IReadOnlyStopwatch public interface IReadOnlyTicker : IReadOnlyStopwatch
{ {
event TickerTickEventHandler? OnTick; Event<IReadOnlyTicker> OnTick { get; }
int TickCounter { get; } int TickCounter { get; }
double TickPeriod { get; set; } double TickPeriod { get; set; }
delegate void TickerTickEventHandler(IReadOnlyTicker sender);
} }

15
Engine.Systems/Time/IReadOnlyTimer.cs
View File

@ -1,13 +1,15 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Systems.Time; namespace Syntriax.Engine.Systems.Time;
public interface IReadOnlyTimer public interface IReadOnlyTimer
{ {
event TimerEventHandler? OnStarted; Event<IReadOnlyTimer> OnStarted { get; }
event TimerDeltaEventHandler? OnDelta; Event<IReadOnlyTimer, TimerDeltaArguments> OnDelta { get; }
event TimerEventHandler? OnStopped; Event<IReadOnlyTimer> OnStopped { get; }
event TimerEventHandler? OnPaused; Event<IReadOnlyTimer> OnPaused { get; }
event TimerEventHandler? OnResumed; Event<IReadOnlyTimer> OnResumed { get; }
double StartTime { get; } double StartTime { get; }
double Remaining { get; } double Remaining { get; }
@ -16,7 +18,6 @@ public interface IReadOnlyTimer
TimerState State { get; } TimerState State { get; }
delegate void TimerEventHandler(IReadOnlyTimer sender); readonly record struct TimerDeltaArguments(double delta);
delegate void TimerDeltaEventHandler(IReadOnlyTimer sender, double delta);
} }

6
Engine.Systems/Time/ITicker.cs
View File

@ -1,11 +1,11 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Systems.Time; namespace Syntriax.Engine.Systems.Time;
public interface ITicker : IStopwatch public interface ITicker : IStopwatch
{ {
event TickerTickEventHandler? OnTick; Event<ITicker> OnTick { get; }
int TickCounter { get; } int TickCounter { get; }
double Period { get; set; } double Period { get; set; }
delegate void TickerTickEventHandler(ITicker sender);
} }

12
Engine.Systems/Time/StopwatchBehaviour.cs
View File

@ -4,11 +4,11 @@ namespace Syntriax.Engine.Systems.Time;
public class StopwatchBehaviour : Behaviour, IStopwatch public class StopwatchBehaviour : Behaviour, IStopwatch
{ {
public event IReadOnlyStopwatch.StopwatchEventHandler? OnStarted = null; public Event<IReadOnlyStopwatch> OnStarted { get; } = new();
public event IReadOnlyStopwatch.StopwatchDeltaEventHandler? OnDelta = null; public Event<IReadOnlyStopwatch, IReadOnlyStopwatch.StopwatchDeltaArguments> OnDelta { get; } = new();
public event IReadOnlyStopwatch.StopwatchEventHandler? OnStopped = null; public Event<IReadOnlyStopwatch> OnStopped { get; } = new();
public event IReadOnlyStopwatch.StopwatchEventHandler? OnPaused = null; public Event<IReadOnlyStopwatch> OnPaused { get; } = new();
public event IReadOnlyStopwatch.StopwatchEventHandler? OnResumed = null; public Event<IReadOnlyStopwatch> OnResumed { get; } = new();
public double Time { get; protected set; } = 0f; public double Time { get; protected set; } = 0f;
public TimerState State { get; protected set; } = TimerState.Idle; public TimerState State { get; protected set; } = TimerState.Idle;
@ -46,7 +46,7 @@ public class StopwatchBehaviour : Behaviour, IStopwatch
double delta = Universe.Time.DeltaSpan.TotalSeconds; double delta = Universe.Time.DeltaSpan.TotalSeconds;
Time += delta; Time += delta;
OnDelta?.Invoke(this, delta); OnDelta?.Invoke(this, new(delta));
} }
protected override void OnEnteredUniverse(IUniverse universe) protected override void OnEnteredUniverse(IUniverse universe)

2
Engine.Systems/Time/TickerBehaviour.cs
View File

@ -4,7 +4,7 @@ namespace Syntriax.Engine.Systems.Time;
public class TickerBehaviour : StopwatchBehaviour, ITicker public class TickerBehaviour : StopwatchBehaviour, ITicker
{ {
public event ITicker.TickerTickEventHandler? OnTick = null; public Event<ITicker> OnTick { get; } = new();
public double Period { get; set; } = 1f; public double Period { get; set; } = 1f;
public int TickCounter { get; private set; } = 0; public int TickCounter { get; private set; } = 0;

12
Engine.Systems/Time/TimerBehaviour.cs
View File

@ -4,11 +4,11 @@ namespace Syntriax.Engine.Systems.Time;
public class TimerBehaviour : Behaviour, ITimer public class TimerBehaviour : Behaviour, ITimer
{ {
public event IReadOnlyTimer.TimerEventHandler? OnStarted = null; public Event<IReadOnlyTimer> OnStarted { get; } = new();
public event IReadOnlyTimer.TimerDeltaEventHandler? OnDelta = null; public Event<IReadOnlyTimer, IReadOnlyTimer.TimerDeltaArguments> OnDelta { get; } = new();
public event IReadOnlyTimer.TimerEventHandler? OnStopped = null; public Event<IReadOnlyTimer> OnStopped { get; } = new();
public event IReadOnlyTimer.TimerEventHandler? OnPaused = null; public Event<IReadOnlyTimer> OnPaused { get; } = new();
public event IReadOnlyTimer.TimerEventHandler? OnResumed = null; public Event<IReadOnlyTimer> OnResumed { get; } = new();
public TimerState State { get; protected set; } = TimerState.Idle; public TimerState State { get; protected set; } = TimerState.Idle;
public double StartTime { get; protected set; } = 0f; public double StartTime { get; protected set; } = 0f;
@ -61,7 +61,7 @@ public class TimerBehaviour : Behaviour, ITimer
double delta = Universe.Time.DeltaSpan.TotalSeconds; double delta = Universe.Time.DeltaSpan.TotalSeconds;
Remaining -= delta; Remaining -= delta;
OnDelta?.Invoke(this, delta); OnDelta?.Invoke(this, new(delta));
if (Remaining <= .0f) if (Remaining <= .0f)
Stop(); Stop();

21
Engine.Systems/Tween/ITween.cs
View File

@ -1,16 +1,18 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Systems.Tween; namespace Syntriax.Engine.Systems.Tween;
public interface ITween public interface ITween
{ {
event TweenEventHandler? OnStarted; Event<ITween> OnStarted { get; }
event TweenEventHandler? OnPaused; Event<ITween> OnPaused { get; }
event TweenEventHandler? OnResumed; Event<ITween> OnResumed { get; }
event TweenEventHandler? OnCancelled; Event<ITween> OnCancelled { get; }
event TweenEventHandler? OnCompleted; Event<ITween> OnCompleted { get; }
event TweenEventHandler? OnEnded; Event<ITween> OnEnded { get; }
event TweenEventHandler? OnUpdated; Event<ITween> OnUpdated { get; }
event TweenDeltaEventHandler? OnDeltaUpdated; Event<ITween, TweenDeltaArguments> OnDeltaUpdated { get; }
TweenState State { get; set; } TweenState State { get; set; }
@ -19,7 +21,6 @@ public interface ITween
float Progress { get; } float Progress { get; }
float Value { get; } float Value { get; }
delegate void TweenEventHandler(ITween sender); readonly record struct TweenDeltaArguments(float Delta);
delegate void TweenDeltaEventHandler(ITween sender, float delta);
} }

34
Engine.Systems/Tween/Tween.cs
View File

@ -4,14 +4,14 @@ namespace Syntriax.Engine.Systems.Tween;
internal class Tween : ITween internal class Tween : ITween
{ {
public event ITween.TweenEventHandler? OnStarted = null; public Event<ITween> OnStarted { get; } = new();
public event ITween.TweenEventHandler? OnPaused = null; public Event<ITween> OnPaused { get; } = new();
public event ITween.TweenEventHandler? OnResumed = null; public Event<ITween> OnResumed { get; } = new();
public event ITween.TweenEventHandler? OnCancelled = null; public Event<ITween> OnCancelled { get; } = new();
public event ITween.TweenEventHandler? OnCompleted = null; public Event<ITween> OnCompleted { get; } = new();
public event ITween.TweenEventHandler? OnEnded = null; public Event<ITween> OnEnded { get; } = new();
public event ITween.TweenEventHandler? OnUpdated = null; public Event<ITween> OnUpdated { get; } = new();
public event ITween.TweenDeltaEventHandler? OnDeltaUpdated = null; public Event<ITween, ITween.TweenDeltaArguments> OnDeltaUpdated { get; } = new();
private TweenState _state = TweenState.Idle; private TweenState _state = TweenState.Idle;
public TweenState State public TweenState State
@ -60,7 +60,7 @@ internal class Tween : ITween
Progress = Counter / Duration; Progress = Counter / Duration;
OnUpdated?.Invoke(this); OnUpdated?.Invoke(this);
OnDeltaUpdated?.Invoke(this, Easing.Evaluate(Progress) - Easing.Evaluate(previousProgress)); OnDeltaUpdated?.Invoke(this, new(Easing.Evaluate(Progress) - Easing.Evaluate(previousProgress)));
if (_counter >= Duration) if (_counter >= Duration)
State = TweenState.Completed; State = TweenState.Completed;
@ -74,6 +74,22 @@ internal class Tween : ITween
State = TweenState.Idle; State = TweenState.Idle;
} }
internal void Wipe()
{
OnStarted.Clear();
OnPaused.Clear();
OnResumed.Clear();
OnCancelled.Clear();
OnCompleted.Clear();
OnEnded.Clear();
OnUpdated.Clear();
OnDeltaUpdated.Clear();
Easing = EaseLinear.Instance;
Reset();
}
public Tween() { } public Tween() { }
public Tween(float duration) public Tween(float duration)
{ {

34
Engine.Systems/Tween/TweenExtensions.cs
View File

@ -1,7 +1,5 @@
using System; using System;
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Systems.Tween; namespace Syntriax.Engine.Systems.Tween;
public static class TweenExtensions public static class TweenExtensions
@ -11,14 +9,14 @@ public static class TweenExtensions
Tween tweenConcrete = (Tween)tween; Tween tweenConcrete = (Tween)tween;
int counter = count; int counter = count;
tweenConcrete.OnCompleted += _ => tweenConcrete.OnCompleted.AddListener(_ =>
{ {
if (counter-- <= 0) if (counter-- <= 0)
return; return;
tweenConcrete.Reset(); tweenConcrete.Reset();
tweenConcrete.State = TweenState.Playing; tweenConcrete.State = TweenState.Playing;
}; });
return tween; return tween;
} }
@ -26,11 +24,11 @@ public static class TweenExtensions
public static ITween LoopInfinitely(this ITween tween) public static ITween LoopInfinitely(this ITween tween)
{ {
Tween tweenConcrete = (Tween)tween; Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnCompleted += _ => tweenConcrete.OnCompleted.AddListener(_ =>
{ {
tweenConcrete.Reset(); tweenConcrete.Reset();
tweenConcrete.State = TweenState.Playing; tweenConcrete.State = TweenState.Playing;
}; });
return tween; return tween;
} }
@ -45,57 +43,49 @@ public static class TweenExtensions
public static ITween OnStart(this ITween tween, Action callback) public static ITween OnStart(this ITween tween, Action callback)
{ {
Tween tweenConcrete = (Tween)tween; tween.OnStarted.AddListener(_ => callback.Invoke());
tweenConcrete.OnStarted += _ => callback.Invoke();
return tween; return tween;
} }
public static ITween OnPause(this ITween tween, Action callback) public static ITween OnPause(this ITween tween, Action callback)
{ {
Tween tweenConcrete = (Tween)tween; tween.OnPaused.AddListener(_ => callback.Invoke());
tweenConcrete.OnPaused += _ => callback.Invoke();
return tween; return tween;
} }
public static ITween OnResume(this ITween tween, Action callback) public static ITween OnResume(this ITween tween, Action callback)
{ {
Tween tweenConcrete = (Tween)tween; tween.OnResumed.AddListener(_ => callback.Invoke());
tweenConcrete.OnResumed += _ => callback.Invoke();
return tween; return tween;
} }
public static ITween OnCancel(this ITween tween, Action callback) public static ITween OnCancel(this ITween tween, Action callback)
{ {
Tween tweenConcrete = (Tween)tween; tween.OnCancelled.AddListener(_ => callback.Invoke());
tweenConcrete.OnCancelled += _ => callback.Invoke();
return tween; return tween;
} }
public static ITween OnComplete(this ITween tween, Action callback) public static ITween OnComplete(this ITween tween, Action callback)
{ {
Tween tweenConcrete = (Tween)tween; tween.OnCompleted.AddListener(_ => callback.Invoke());
tweenConcrete.OnCompleted += _ => callback.Invoke();
return tween; return tween;
} }
public static ITween OnEnd(this ITween tween, Action callback) public static ITween OnEnd(this ITween tween, Action callback)
{ {
Tween tweenConcrete = (Tween)tween; tween.OnEnded.AddListener(_ => callback.Invoke());
tweenConcrete.OnEnded += _ => callback.Invoke();
return tween; return tween;
} }
public static ITween OnUpdate(this ITween tween, Action callback) public static ITween OnUpdate(this ITween tween, Action callback)
{ {
Tween tweenConcrete = (Tween)tween; tween.OnUpdated.AddListener(_ => callback.Invoke());
tweenConcrete.OnUpdated += _ => callback.Invoke();
return tween; return tween;
} }
public static ITween OnDeltaUpdate(this ITween tween, Action<float> callback) public static ITween OnDeltaUpdate(this ITween tween, Action<float> callback)
{ {
Tween tweenConcrete = (Tween)tween; tween.OnDeltaUpdated.AddListener((_, arguments) => callback.Invoke(arguments.Delta));
tweenConcrete.OnDeltaUpdated += (_, delta) => callback.Invoke(delta);
return tween; return tween;
} }
} }

3
Engine.Systems/Tween/TweenManager.cs
View File

@ -15,7 +15,7 @@ public class TweenManager : UniverseObject, ITweenManager
public ITween StartTween(float duration, ITweenManager.TweenSetCallback? setCallback = null) public ITween StartTween(float duration, ITweenManager.TweenSetCallback? setCallback = null)
{ {
Tween tween = Get(duration); Tween tween = Get(duration);
tween.OnUpdated += tween => setCallback?.Invoke(tween.Value); tween.OnUpdated.AddListener(tween => setCallback?.Invoke(tween.Value));
runningCoroutines.Add(tween, coroutineManager.StartCoroutine(RunTween(tween))); runningCoroutines.Add(tween, coroutineManager.StartCoroutine(RunTween(tween)));
return tween; return tween;
} }
@ -59,6 +59,7 @@ public class TweenManager : UniverseObject, ITweenManager
} }
runningCoroutines.Remove(tween); runningCoroutines.Remove(tween);
Return(tween);
} }
public void CancelTween(ITween tween) public void CancelTween(ITween tween)