Compare commits
63 Commits
988a6f67f2
...
developmen
| Author | SHA1 | Date | |
|---|---|---|---|
| 499f875903 | |||
| b2cfb2a590 | |||
| 1d6b9d2421 | |||
| 882f9e8b29 | |||
| 913af2a4a4 | |||
| 4e9fda3d7c | |||
| 7675f9acac | |||
| 72f86478f2 | |||
| 64e7321f0f | |||
| c355c666e0 | |||
| b9f3227f73 | |||
| c68de39c83 | |||
| ad444decbb | |||
| 297e0eb790 | |||
| efa4da4398 | |||
| e30280f1f8 | |||
| d4437edfbf | |||
| 08f32f96e4 | |||
| 9294df8a19 | |||
| 50a0269798 | |||
| 985f898327 | |||
| 7c9973a5e7 | |||
| af6dde84fd | |||
| e2820670c6 | |||
| 5ce5e4eb0b | |||
| ee58e60ef1 | |||
| 1a8f396766 | |||
| 90e59802c6 | |||
| 097f1897c2 | |||
| 49a6c9665a | |||
| 7c8b7debca | |||
| 55a6fca1fd | |||
| 48daeb2f19 | |||
| edda4b873c | |||
| a050909375 | |||
| 24d9cdeafa | |||
| 7e07cd30db | |||
| e9ba7867ac | |||
| f28307be80 | |||
| 5f019892f1 | |||
| 0bd2b0618d | |||
| 0691d7092c | |||
| 4ed049573a | |||
| 599774ea8b | |||
| b17f880ecf | |||
| 98bc0693dd | |||
| ac2e160abb | |||
| 30a07dd034 | |||
| f180713f4b | |||
| 2d612ea0d4 | |||
| 5a6883a87f | |||
| a6eb67551d | |||
| 981732ff75 | |||
| 4bdd32b808 | |||
| cac69f5f35 | |||
| 1660915678 | |||
| 1d02b0eba2 | |||
| 2ef7fa6577 | |||
| 193b2c5af0 | |||
| a859c0cbff | |||
| fba64c3854 | |||
| a975cbb56b | |||
| 1664a9ccf7 |
@@ -13,7 +13,7 @@ spelling_exclusion_path = SpellingExclusions.dic
|
||||
[*.{cs,csx,vb,vbx}]
|
||||
indent_size = 4
|
||||
insert_final_newline = true
|
||||
charset = utf-8-bom
|
||||
charset = utf-8
|
||||
|
||||
# XML project files
|
||||
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
|
||||
|
||||
@@ -62,7 +62,8 @@ public interface IBehaviourController : IEntity, IHasUniverseObject
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of <see cref="IBehaviour"/>s to get.</typeparam>
|
||||
/// <param name="results">The list to store the <see cref="IBehaviour"/>s.</param>
|
||||
void GetBehaviours<T>(IList<T> results);
|
||||
/// <param name="collectionMethod">Whether to clear the <paramref name="results"/> before collection or append the results to the list.</param>
|
||||
void GetBehaviours<T>(IList<T> results, CollectionMethod collectionMethod = CollectionMethod.Clear);
|
||||
|
||||
/// <summary>
|
||||
/// Removes <see cref="IBehaviour"/>s of the specified type from the <see cref="IBehaviourController"/>.
|
||||
@@ -78,6 +79,8 @@ public interface IBehaviourController : IEntity, IHasUniverseObject
|
||||
/// <param name="behaviour">The <see cref="IBehaviour"/> to remove.</param>
|
||||
void RemoveBehaviour<T>(T behaviour) where T : class, IBehaviour;
|
||||
|
||||
enum CollectionMethod { Clear, Append };
|
||||
|
||||
readonly record struct BehaviourAddedArguments(IBehaviour BehaviourAdded);
|
||||
readonly record struct BehaviourRemovedArguments(IBehaviour BehaviourRemoved);
|
||||
}
|
||||
|
||||
17
Engine.Core/Abstract/ICamera.cs
Normal file
17
Engine.Core/Abstract/ICamera.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
namespace Engine.Core;
|
||||
|
||||
/// <summary>
|
||||
/// Represents a camera with view and projections matrices in the engine.
|
||||
/// </summary>
|
||||
public interface ICamera
|
||||
{
|
||||
/// <summary>
|
||||
/// View <see cref="Matrix4x4"/> of the <see cref="ICamera"/>.
|
||||
/// </summary>
|
||||
Matrix4x4 ViewMatrix { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Projection <see cref="Matrix4x4"/> of the <see cref="ICamera"/>.
|
||||
/// </summary>
|
||||
Matrix4x4 ProjectionMatrix { get; }
|
||||
}
|
||||
@@ -3,7 +3,7 @@ namespace Engine.Core;
|
||||
/// <summary>
|
||||
/// Represents a 2D camera in the engine.
|
||||
/// </summary>
|
||||
public interface ICamera2D : IBehaviour2D
|
||||
public interface ICamera2D : ICamera, IBehaviour2D
|
||||
{
|
||||
/// <summary>
|
||||
/// The zoom level of the camera.
|
||||
|
||||
@@ -3,10 +3,35 @@ namespace Engine.Core;
|
||||
/// <summary>
|
||||
/// Represents a 3D camera in the engine.
|
||||
/// </summary>
|
||||
public interface ICamera3D : IBehaviour3D
|
||||
public interface ICamera3D : ICamera, IBehaviour3D
|
||||
{
|
||||
/// <summary>
|
||||
/// Field of View (FOV) value of the camera
|
||||
/// Event triggered when the near plane of the <see cref="ICamera3D"/> changes.
|
||||
/// </summary>
|
||||
Event<ICamera3D, NearPlaneChangedArguments> OnNearPlaneChanged { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Event triggered when the far plane of the <see cref="ICamera3D"/> changes.
|
||||
/// </summary>
|
||||
Event<ICamera3D, FarPlaneChangedArguments> OnFarPlaneChanged { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Event triggered when the field of view of the <see cref="ICamera3D"/> changes.
|
||||
/// </summary>
|
||||
Event<ICamera3D, FieldOfViewChangedArguments> OnFieldOfViewChanged { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Near plane distance of the camera.
|
||||
/// </summary>
|
||||
float NearPlane { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Far plane distance of the camera.
|
||||
/// </summary>
|
||||
float FarPlane { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Field of View (FOV) value of the camera in degrees.
|
||||
/// </summary>
|
||||
float FieldOfView { get; set; }
|
||||
|
||||
@@ -23,4 +48,8 @@ public interface ICamera3D : IBehaviour3D
|
||||
/// <param name="worldPosition">The position in world coordinates.</param>
|
||||
/// <returns>The position in screen coordinates.</returns>
|
||||
Vector2D WorldToScreenPosition(Vector3D worldPosition);
|
||||
|
||||
readonly record struct NearPlaneChangedArguments(float PreviousNearPlane);
|
||||
readonly record struct FarPlaneChangedArguments(float PreviousFarPlane);
|
||||
readonly record struct FieldOfViewChangedArguments(float PreviousFieldOfView);
|
||||
}
|
||||
|
||||
@@ -3,18 +3,4 @@ namespace Engine.Core;
|
||||
/// <summary>
|
||||
/// Represents a basic entity in the engine.
|
||||
/// </summary>
|
||||
public interface IEntity : IInitializable, IHasStateEnable
|
||||
{
|
||||
/// <summary>
|
||||
/// 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"/>.
|
||||
/// </summary>
|
||||
Event<IEntity, IdChangedArguments> OnIdChanged { get; }
|
||||
|
||||
/// <summary>
|
||||
/// The ID of the <see cref="IEntity"/>.
|
||||
/// </summary>
|
||||
string Id { get; set; }
|
||||
|
||||
readonly record struct IdChangedArguments(string PreviousId);
|
||||
}
|
||||
public interface IEntity : IInitializable, IIdentifiable, IHasStateEnable;
|
||||
|
||||
20
Engine.Core/Abstract/IHasId.cs
Normal file
20
Engine.Core/Abstract/IHasId.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
namespace Engine.Core;
|
||||
|
||||
/// <summary>
|
||||
/// Represents any instance in the engine with an id.
|
||||
/// </summary>
|
||||
public interface IIdentifiable
|
||||
{
|
||||
/// <summary>
|
||||
/// Event triggered when the <see cref="Id"/> of the <see cref="IIdentifiable"/> changes.
|
||||
/// The string action parameter is the previous <see cref="Id"/> of the <see cref="IIdentifiable"/>.
|
||||
/// </summary>
|
||||
Event<IIdentifiable, IdChangedArguments> OnIdChanged { get; }
|
||||
|
||||
/// <summary>
|
||||
/// The ID of the <see cref="IIdentifiable"/>.
|
||||
/// </summary>
|
||||
string Id { get; set; }
|
||||
|
||||
readonly record struct IdChangedArguments(string PreviousId);
|
||||
}
|
||||
@@ -78,9 +78,9 @@ public interface IUniverse : IEntity, IEnumerable<IUniverseObject>
|
||||
UniverseTime UnscaledTime { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets a read-only list of <see cref="IUniverseObject"/>s managed by the <see cref="IUniverse"/>.
|
||||
/// Gets the root <see cref="IUniverseObject"/> of the <see cref="IUniverse"/>.
|
||||
/// </summary>
|
||||
IReadOnlyList<IUniverseObject> UniverseObjects { get; }
|
||||
IUniverseObject Root { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Registers an <see cref="IUniverseObject"/> to the <see cref="IUniverse"/>.
|
||||
|
||||
@@ -4,52 +4,47 @@ namespace Engine.Core;
|
||||
|
||||
public abstract class BaseEntity : IEntity
|
||||
{
|
||||
public Event<IEntity, IEntity.IdChangedArguments> OnIdChanged { get; } = new();
|
||||
public Event<IIdentifiable, IIdentifiable.IdChangedArguments> OnIdChanged { get; } = new();
|
||||
public Event<IInitializable> OnInitialized { get; } = new();
|
||||
public Event<IInitializable> OnFinalized { get; } = new();
|
||||
public Event<IHasStateEnable> OnStateEnableAssigned { get; } = new();
|
||||
public Event<IAssignable> OnUnassigned { get; } = new();
|
||||
|
||||
private IStateEnable _stateEnable = null!;
|
||||
|
||||
private bool _initialized = false;
|
||||
private string _id = string.Empty;
|
||||
|
||||
public virtual IStateEnable StateEnable => _stateEnable;
|
||||
public virtual IStateEnable StateEnable { get; private set; } = null!;
|
||||
|
||||
public string Id
|
||||
{
|
||||
get => _id;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (IsInitialized)
|
||||
throw new($"Can't change {nameof(Id)} of {_id} because it's initialized");
|
||||
throw new($"Can't change {nameof(Id)} of {field} because it's initialized");
|
||||
|
||||
if (value == _id)
|
||||
if (value == field)
|
||||
return;
|
||||
|
||||
string previousId = _id;
|
||||
string previousId = field;
|
||||
|
||||
_id = value;
|
||||
field = value;
|
||||
OnIdChanged?.Invoke(this, new(previousId));
|
||||
}
|
||||
}
|
||||
} = string.Empty;
|
||||
|
||||
public bool IsInitialized
|
||||
{
|
||||
get => _initialized;
|
||||
get;
|
||||
private set
|
||||
{
|
||||
if (value == _initialized)
|
||||
if (value == field)
|
||||
return;
|
||||
|
||||
_initialized = value;
|
||||
field = value;
|
||||
if (value)
|
||||
OnInitialized?.Invoke(this);
|
||||
else
|
||||
OnFinalized?.Invoke(this);
|
||||
}
|
||||
}
|
||||
} = false;
|
||||
|
||||
protected virtual void OnAssign(IStateEnable stateEnable) { }
|
||||
public bool Assign(IStateEnable stateEnable)
|
||||
@@ -57,8 +52,8 @@ public abstract class BaseEntity : IEntity
|
||||
if (IsInitialized)
|
||||
return false;
|
||||
|
||||
_stateEnable = stateEnable;
|
||||
_stateEnable.Assign(this);
|
||||
StateEnable = stateEnable;
|
||||
StateEnable.Assign(this);
|
||||
OnAssign(stateEnable);
|
||||
OnStateEnableAssigned?.Invoke(this);
|
||||
return true;
|
||||
@@ -72,8 +67,8 @@ public abstract class BaseEntity : IEntity
|
||||
|
||||
UnassignInternal();
|
||||
|
||||
_stateEnable = null!;
|
||||
_stateEnable.Unassign();
|
||||
StateEnable = null!;
|
||||
StateEnable.Unassign();
|
||||
OnUnassigned?.Invoke(this);
|
||||
return true;
|
||||
}
|
||||
@@ -84,7 +79,7 @@ public abstract class BaseEntity : IEntity
|
||||
if (IsInitialized)
|
||||
return false;
|
||||
|
||||
_stateEnable ??= Factory.StateEnableFactory.Instantiate(this);
|
||||
StateEnable ??= Factory.StateEnableFactory.Instantiate(this);
|
||||
|
||||
InitializeInternal();
|
||||
|
||||
@@ -104,6 +99,6 @@ public abstract class BaseEntity : IEntity
|
||||
return true;
|
||||
}
|
||||
|
||||
protected BaseEntity() => _id = Guid.NewGuid().ToString("D");
|
||||
protected BaseEntity(string id) => _id = id;
|
||||
protected BaseEntity() => Id = Guid.NewGuid().ToString("D");
|
||||
protected BaseEntity(string id) => Id = id;
|
||||
}
|
||||
|
||||
@@ -14,26 +14,23 @@ public abstract class Behaviour : BaseEntity, IBehaviour
|
||||
public IUniverse Universe => BehaviourController.UniverseObject.Universe;
|
||||
public IUniverseObject UniverseObject => BehaviourController.UniverseObject;
|
||||
|
||||
private IBehaviourController _behaviourController = null!;
|
||||
public IBehaviourController BehaviourController => _behaviourController;
|
||||
public IBehaviourController BehaviourController { get; private set; } = null!;
|
||||
|
||||
private int _priority = 0;
|
||||
public int Priority
|
||||
{
|
||||
get => _priority;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (value == _priority)
|
||||
if (value == field)
|
||||
return;
|
||||
|
||||
int previousPriority = _priority;
|
||||
_priority = value;
|
||||
int previousPriority = field;
|
||||
field = value;
|
||||
OnPriorityChanged?.Invoke(this, new(previousPriority));
|
||||
}
|
||||
}
|
||||
} = 0;
|
||||
|
||||
private bool _isActive = false;
|
||||
public bool IsActive => _isActive;
|
||||
public bool IsActive { get; private set; } = false;
|
||||
|
||||
protected virtual void OnAssign(IBehaviourController behaviourController) { }
|
||||
public bool Assign(IBehaviourController behaviourController)
|
||||
@@ -41,7 +38,7 @@ public abstract class Behaviour : BaseEntity, IBehaviour
|
||||
if (IsInitialized)
|
||||
return false;
|
||||
|
||||
_behaviourController = behaviourController;
|
||||
BehaviourController = behaviourController;
|
||||
OnAssign(behaviourController);
|
||||
behaviourController.OnUniverseObjectAssigned.AddListener(delegateOnUniverseObjectAssigned);
|
||||
behaviourController.StateEnable.OnEnabledChanged.AddListener(delegateOnStateEnabledChanged);
|
||||
@@ -71,7 +68,7 @@ public abstract class Behaviour : BaseEntity, IBehaviour
|
||||
BehaviourController.OnUniverseObjectAssigned.RemoveListener(delegateOnUniverseObjectAssigned);
|
||||
BehaviourController.StateEnable.OnEnabledChanged.RemoveListener(delegateOnStateEnabledChanged);
|
||||
base.UnassignInternal();
|
||||
_behaviourController = null!;
|
||||
BehaviourController = null!;
|
||||
}
|
||||
|
||||
protected override void InitializeInternal()
|
||||
@@ -88,7 +85,7 @@ public abstract class Behaviour : BaseEntity, IBehaviour
|
||||
private void UpdateActive()
|
||||
{
|
||||
bool previousActive = IsActive;
|
||||
_isActive = StateEnable.Enabled && _behaviourController.StateEnable.Enabled && _behaviourController.UniverseObject.IsActive;
|
||||
IsActive = StateEnable.Enabled && BehaviourController.StateEnable.Enabled && BehaviourController.UniverseObject.IsActive;
|
||||
|
||||
if (previousActive != IsActive)
|
||||
OnActiveChanged?.Invoke(this, new(previousActive));
|
||||
|
||||
@@ -12,9 +12,8 @@ public class BehaviourController : BaseEntity, IBehaviourController
|
||||
|
||||
private readonly FastList<IBehaviour> behaviours = new(Constants.BEHAVIOURS_SIZE_INITIAL);
|
||||
|
||||
private IUniverseObject _universeObject = null!;
|
||||
public IUniverseObject UniverseObject { get; private set; } = null!;
|
||||
|
||||
public IUniverseObject UniverseObject => _universeObject;
|
||||
public int Count => behaviours.Count;
|
||||
public IBehaviour this[Index index] => behaviours[index];
|
||||
|
||||
@@ -58,9 +57,11 @@ public class BehaviourController : BaseEntity, IBehaviourController
|
||||
return behaviours;
|
||||
}
|
||||
|
||||
public void GetBehaviours<T>(IList<T> results)
|
||||
public void GetBehaviours<T>(IList<T> results, IBehaviourController.CollectionMethod collectionMethod = IBehaviourController.CollectionMethod.Clear)
|
||||
{
|
||||
results.Clear();
|
||||
if (collectionMethod == IBehaviourController.CollectionMethod.Clear)
|
||||
results.Clear();
|
||||
|
||||
foreach (IBehaviour behaviourItem in behaviours)
|
||||
{
|
||||
if (behaviourItem is not T behaviour)
|
||||
@@ -101,7 +102,7 @@ public class BehaviourController : BaseEntity, IBehaviourController
|
||||
if (UniverseObject is not null && UniverseObject.IsInitialized)
|
||||
return false;
|
||||
|
||||
_universeObject = universeObject;
|
||||
UniverseObject = universeObject;
|
||||
OnAssign(universeObject);
|
||||
OnUniverseObjectAssigned?.Invoke(this);
|
||||
return true;
|
||||
|
||||
@@ -29,7 +29,7 @@ public abstract class ActiveBehaviourCollectorBase<T> : IBehaviourCollector<T> w
|
||||
if (Universe is not null)
|
||||
return false;
|
||||
|
||||
foreach (IUniverseObject universeObject in universe.UniverseObjects)
|
||||
foreach (IUniverseObject universeObject in universe)
|
||||
OnUniverseObjectRegistered(universe, new(universeObject));
|
||||
|
||||
universe.OnUniverseObjectRegistered.AddListener(delegateOnUniverseObjectRegistered);
|
||||
@@ -46,7 +46,7 @@ public abstract class ActiveBehaviourCollectorBase<T> : IBehaviourCollector<T> w
|
||||
if (Universe is null)
|
||||
return false;
|
||||
|
||||
foreach (IUniverseObject universeObject in Universe.UniverseObjects)
|
||||
foreach (IUniverseObject universeObject in Universe)
|
||||
OnUniverseObjectUnregistered(Universe, new(universeObject));
|
||||
|
||||
Universe.OnUniverseObjectRegistered.RemoveListener(delegateOnUniverseObjectRegistered);
|
||||
|
||||
@@ -5,9 +5,8 @@ namespace Engine.Core;
|
||||
|
||||
public class ActiveBehaviourCollectorOrdered<TIndex, TItem> : ActiveBehaviourCollector<TItem> where TItem : class, IBehaviour where TIndex : IComparable
|
||||
{
|
||||
private readonly Event<IBehaviour, IBehaviour.PriorityChangedArguments>.EventHandler delegateOnPriorityChanged = null!;
|
||||
|
||||
private readonly SortedDictionary<TIndex, FastList<TItem>> behaviours = null!;
|
||||
private readonly Dictionary<TItem, TIndex> indexCache = [];
|
||||
|
||||
private readonly Func<TItem, TIndex> getIndexFunc = null!;
|
||||
private readonly IComparer<TIndex> sortBy = null!;
|
||||
@@ -39,11 +38,10 @@ public class ActiveBehaviourCollectorOrdered<TIndex, TItem> : ActiveBehaviourCol
|
||||
|
||||
protected override bool RemoveBehaviour(TItem tBehaviour)
|
||||
{
|
||||
TIndex index = getIndexFunc(tBehaviour);
|
||||
if (!behaviours.TryGetValue(index, out FastList<TItem>? list))
|
||||
if (!indexCache.TryGetValue(tBehaviour, out TIndex? index) || !behaviours.TryGetValue(index, out FastList<TItem>? list))
|
||||
throw new Exceptions.NotFoundException($"Index of '{index}' is not found in the collector");
|
||||
|
||||
if (!list.Remove(tBehaviour))
|
||||
if (!list.Remove(tBehaviour) || !indexCache.Remove(tBehaviour))
|
||||
return false;
|
||||
|
||||
count--;
|
||||
@@ -58,21 +56,11 @@ public class ActiveBehaviourCollectorOrdered<TIndex, TItem> : ActiveBehaviourCol
|
||||
|
||||
count++;
|
||||
list.Add(behaviour);
|
||||
}
|
||||
|
||||
protected override void OnBehaviourAdd(IBehaviour behaviour) => behaviour.OnPriorityChanged.AddListener(delegateOnPriorityChanged);
|
||||
protected override void OnBehaviourRemove(IBehaviour behaviour) => behaviour.OnPriorityChanged.RemoveListener(delegateOnPriorityChanged);
|
||||
|
||||
private void OnPriorityChanged(IBehaviour sender, IBehaviour.PriorityChangedArguments args)
|
||||
{
|
||||
TItem behaviour = (TItem)sender;
|
||||
RemoveBehaviour(behaviour);
|
||||
AddBehaviour(behaviour);
|
||||
indexCache.Add(behaviour, key);
|
||||
}
|
||||
|
||||
public ActiveBehaviourCollectorOrdered(Func<TItem, TIndex> getIndexFunc, Comparison<TIndex> sortBy)
|
||||
{
|
||||
delegateOnPriorityChanged = OnPriorityChanged;
|
||||
this.getIndexFunc = getIndexFunc;
|
||||
this.sortBy = Comparer<TIndex>.Create(sortBy);
|
||||
behaviours = new(this.sortBy);
|
||||
@@ -80,7 +68,6 @@ public class ActiveBehaviourCollectorOrdered<TIndex, TItem> : ActiveBehaviourCol
|
||||
|
||||
public ActiveBehaviourCollectorOrdered(IUniverse universe, Func<TItem, TIndex> getIndexFunc, Comparison<TIndex> sortBy) : base(universe)
|
||||
{
|
||||
delegateOnPriorityChanged = OnPriorityChanged;
|
||||
this.getIndexFunc = getIndexFunc;
|
||||
this.sortBy = Comparer<TIndex>.Create(sortBy);
|
||||
behaviours = new(this.sortBy);
|
||||
@@ -89,14 +76,12 @@ public class ActiveBehaviourCollectorOrdered<TIndex, TItem> : ActiveBehaviourCol
|
||||
public ActiveBehaviourCollectorOrdered(Func<TItem, TIndex> getIndexFunc, IComparer<TIndex> sortBy)
|
||||
{
|
||||
this.getIndexFunc = getIndexFunc;
|
||||
delegateOnPriorityChanged = OnPriorityChanged;
|
||||
this.sortBy = sortBy;
|
||||
behaviours = new(sortBy);
|
||||
}
|
||||
|
||||
public ActiveBehaviourCollectorOrdered(IUniverse universe, Func<TItem, TIndex> getIndexFunc, IComparer<TIndex> sortBy) : base(universe)
|
||||
{
|
||||
delegateOnPriorityChanged = OnPriorityChanged;
|
||||
this.getIndexFunc = getIndexFunc;
|
||||
this.sortBy = sortBy;
|
||||
behaviours = new(sortBy);
|
||||
|
||||
@@ -25,7 +25,7 @@ public abstract class BehaviourCollectorBase<T> : IBehaviourCollector<T> where T
|
||||
if (Universe is not null)
|
||||
return false;
|
||||
|
||||
foreach (IUniverseObject universeObject in universe.UniverseObjects)
|
||||
foreach (IUniverseObject universeObject in universe)
|
||||
OnUniverseObjectRegistered(universe, new(universeObject));
|
||||
|
||||
universe.OnUniverseObjectRegistered.AddListener(delegateOnUniverseObjectRegistered);
|
||||
@@ -43,7 +43,7 @@ public abstract class BehaviourCollectorBase<T> : IBehaviourCollector<T> where T
|
||||
if (Universe is null)
|
||||
return false;
|
||||
|
||||
foreach (IUniverseObject universeObject in Universe.UniverseObjects)
|
||||
foreach (IUniverseObject universeObject in Universe)
|
||||
OnUniverseObjectUnregistered(Universe, new(universeObject));
|
||||
|
||||
Universe.OnUniverseObjectRegistered.RemoveListener(delegateOnUniverseObjectRegistered);
|
||||
|
||||
@@ -5,9 +5,8 @@ namespace Engine.Core;
|
||||
|
||||
public class BehaviourCollectorOrdered<TIndex, TItem> : BehaviourCollectorBase<TItem> where TItem : class where TIndex : IComparable
|
||||
{
|
||||
private readonly Event<IBehaviour, IBehaviour.PriorityChangedArguments>.EventHandler delegateOnPriorityChanged = null!;
|
||||
|
||||
private readonly SortedDictionary<TIndex, FastList<TItem>> behaviours = null!;
|
||||
private readonly Dictionary<TItem, TIndex> indexCache = null!;
|
||||
|
||||
private readonly Func<TItem, TIndex> getIndexFunc = null!;
|
||||
private readonly IComparer<TIndex> sortBy = null!;
|
||||
@@ -39,11 +38,10 @@ public class BehaviourCollectorOrdered<TIndex, TItem> : BehaviourCollectorBase<T
|
||||
|
||||
protected override bool RemoveBehaviour(TItem tBehaviour)
|
||||
{
|
||||
TIndex index = getIndexFunc(tBehaviour);
|
||||
if (!behaviours.TryGetValue(index, out FastList<TItem>? list))
|
||||
if (!indexCache.TryGetValue(tBehaviour, out TIndex? index) || !behaviours.TryGetValue(index, out FastList<TItem>? list))
|
||||
throw new Exceptions.NotFoundException($"Index of '{index}' is not found in the collector");
|
||||
|
||||
if (!list.Remove(tBehaviour))
|
||||
if (!list.Remove(tBehaviour) || !indexCache.Remove(tBehaviour))
|
||||
return false;
|
||||
|
||||
count--;
|
||||
@@ -58,21 +56,11 @@ public class BehaviourCollectorOrdered<TIndex, TItem> : BehaviourCollectorBase<T
|
||||
|
||||
count++;
|
||||
list.Add(behaviour);
|
||||
}
|
||||
|
||||
protected override void OnBehaviourAdd(IBehaviour behaviour) => behaviour.OnPriorityChanged.AddListener(delegateOnPriorityChanged);
|
||||
protected override void OnBehaviourRemove(IBehaviour behaviour) => behaviour.OnPriorityChanged.RemoveListener(delegateOnPriorityChanged);
|
||||
|
||||
private void OnPriorityChanged(IBehaviour sender, IBehaviour.PriorityChangedArguments args)
|
||||
{
|
||||
TItem behaviour = (TItem)sender;
|
||||
RemoveBehaviour(behaviour);
|
||||
AddBehaviour(behaviour);
|
||||
indexCache.Add(behaviour, key);
|
||||
}
|
||||
|
||||
public BehaviourCollectorOrdered(Func<TItem, TIndex> getIndexFunc, Comparison<TIndex> sortBy)
|
||||
{
|
||||
delegateOnPriorityChanged = OnPriorityChanged;
|
||||
this.getIndexFunc = getIndexFunc;
|
||||
this.sortBy = Comparer<TIndex>.Create(sortBy);
|
||||
behaviours = new(this.sortBy);
|
||||
@@ -80,7 +68,6 @@ public class BehaviourCollectorOrdered<TIndex, TItem> : BehaviourCollectorBase<T
|
||||
|
||||
public BehaviourCollectorOrdered(IUniverse universe, Func<TItem, TIndex> getIndexFunc, Comparison<TIndex> sortBy) : base(universe)
|
||||
{
|
||||
delegateOnPriorityChanged = OnPriorityChanged;
|
||||
this.getIndexFunc = getIndexFunc;
|
||||
this.sortBy = Comparer<TIndex>.Create(sortBy);
|
||||
behaviours = new(this.sortBy);
|
||||
@@ -89,14 +76,12 @@ public class BehaviourCollectorOrdered<TIndex, TItem> : BehaviourCollectorBase<T
|
||||
public BehaviourCollectorOrdered(Func<TItem, TIndex> getIndexFunc, IComparer<TIndex> sortBy)
|
||||
{
|
||||
this.getIndexFunc = getIndexFunc;
|
||||
delegateOnPriorityChanged = OnPriorityChanged;
|
||||
this.sortBy = sortBy;
|
||||
behaviours = new(sortBy);
|
||||
}
|
||||
|
||||
public BehaviourCollectorOrdered(IUniverse universe, Func<TItem, TIndex> getIndexFunc, IComparer<TIndex> sortBy) : base(universe)
|
||||
{
|
||||
delegateOnPriorityChanged = OnPriorityChanged;
|
||||
this.getIndexFunc = getIndexFunc;
|
||||
this.sortBy = sortBy;
|
||||
behaviours = new(sortBy);
|
||||
|
||||
@@ -11,7 +11,8 @@ public static class LoggerExtensions
|
||||
logger.Log(body, level, force);
|
||||
}
|
||||
|
||||
public static void LogWarning<T>(this ILogger logger, T caller, string message, bool force = false) => Log(logger, caller, message, ILogger.Level.Info, force);
|
||||
public static void LogWarning<T>(this ILogger logger, T caller, string message, bool force = false)
|
||||
=> Log(logger, caller, message, ILogger.Level.Info, force);
|
||||
|
||||
public static void LogError<T>(this ILogger logger, T caller, string message, bool force = false)
|
||||
{
|
||||
@@ -30,7 +31,11 @@ public static class LoggerExtensions
|
||||
}
|
||||
|
||||
public static void LogTrace<T>(this ILogger logger, T caller, StackTrace? stackTrace = null, bool force = false)
|
||||
=> Log(logger, caller, $"{nameof(StackTrace)}:{Environment.NewLine}{stackTrace ?? new()}", ILogger.Level.Trace, force);
|
||||
|
||||
public static void LogTrace<T>(this ILogger logger, T caller, string message, StackTrace? stackTrace = null, bool force = false)
|
||||
{
|
||||
Log(logger, caller, $"{nameof(StackTrace)}:{Environment.NewLine}{stackTrace ?? new()}", ILogger.Level.Trace, force);
|
||||
Log(logger, caller, message, ILogger.Level.Trace, force);
|
||||
LogTrace(logger, caller, stackTrace, force);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ public class RotatingFileLogger : ILogger
|
||||
private static void RotateLastLogs(string directory, string prefix, int rotateLength)
|
||||
{
|
||||
IOrderedEnumerable<string> logs = System.IO.Directory.GetFiles(directory, $"{prefix}*.log")
|
||||
.OrderBy(File.GetCreationTime);
|
||||
.OrderByDescending(File.GetCreationTime);
|
||||
|
||||
foreach (string file in logs.Skip(rotateLength))
|
||||
try
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>false</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>Engine.Core</RootNamespace>
|
||||
|
||||
@@ -100,18 +100,16 @@ public static class BehaviourControllerExtensions
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of <see cref="IBehaviour"/>s to get.</typeparam>
|
||||
/// <param name="behavioursInParent">The list to store the <see cref="IBehaviour"/>s.</param>
|
||||
public static void GetBehavioursInParent<T>(this IBehaviourController behaviourController, IList<T> behavioursInParent) where T : class
|
||||
/// <param name="collectionMethod">Whether to clear the <paramref name="behavioursInParent"/> before collection or append the results to the list.</param>
|
||||
public static void GetBehavioursInParent<T>(this IBehaviourController behaviourController, IList<T> behavioursInParent, IBehaviourController.CollectionMethod collectionMethod = IBehaviourController.CollectionMethod.Clear) where T : class
|
||||
{
|
||||
IBehaviourController? controller = behaviourController;
|
||||
List<T> cache = [];
|
||||
behavioursInParent.Clear();
|
||||
if (collectionMethod == IBehaviourController.CollectionMethod.Clear)
|
||||
behavioursInParent.Clear();
|
||||
|
||||
IBehaviourController? controller = behaviourController;
|
||||
while (controller is not null)
|
||||
{
|
||||
controller.GetBehaviours(cache);
|
||||
foreach (T behaviour in cache)
|
||||
behavioursInParent.Add(behaviour);
|
||||
|
||||
controller.GetBehaviours(behavioursInParent, IBehaviourController.CollectionMethod.Append);
|
||||
controller = controller.UniverseObject.Parent?.BehaviourController;
|
||||
}
|
||||
}
|
||||
@@ -161,22 +159,20 @@ public static class BehaviourControllerExtensions
|
||||
/// </summary>
|
||||
/// <typeparam name="T">The type of <see cref="IBehaviour"/>s to get.</typeparam>
|
||||
/// <param name="behavioursInChildren">The list to store the <see cref="IBehaviour"/>s.</param>
|
||||
public static void GetBehavioursInChildren<T>(this IBehaviourController behaviourController, IList<T> behavioursInChildren) where T : class
|
||||
/// <param name="collectionMethod">Whether to clear the <paramref name="behavioursInChildren"/> before collection or append the results to the list.</param>
|
||||
public static void GetBehavioursInChildren<T>(this IBehaviourController behaviourController, IList<T> behavioursInChildren, IBehaviourController.CollectionMethod collectionMethod = IBehaviourController.CollectionMethod.Clear) where T : class
|
||||
{
|
||||
List<T> cache = [];
|
||||
behavioursInChildren.Clear();
|
||||
if (collectionMethod == IBehaviourController.CollectionMethod.Clear)
|
||||
behavioursInChildren.Clear();
|
||||
|
||||
TraverseChildrenForBehaviour(behaviourController.UniverseObject, behavioursInChildren, cache);
|
||||
TraverseChildrenForBehaviour(behaviourController.UniverseObject, behavioursInChildren);
|
||||
}
|
||||
|
||||
private static void TraverseChildrenForBehaviour<T>(IUniverseObject universeObject, IList<T> behaviours, IList<T> cache) where T : class
|
||||
private static void TraverseChildrenForBehaviour<T>(IUniverseObject universeObject, IList<T> behaviours) where T : class
|
||||
{
|
||||
universeObject.BehaviourController.GetBehaviours(cache);
|
||||
|
||||
foreach (T behaviour in cache)
|
||||
behaviours.Add(behaviour);
|
||||
universeObject.BehaviourController.GetBehaviours(behaviours, IBehaviourController.CollectionMethod.Append);
|
||||
|
||||
foreach (IUniverseObject child in universeObject.Children)
|
||||
TraverseChildrenForBehaviour(child, behaviours, cache);
|
||||
TraverseChildrenForBehaviour(child, behaviours);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,5 +32,5 @@ public static class UniverseExtensions
|
||||
/// <typeparam name="T">Type to be searched through the <see cref="IUniverse"/>.</typeparam>
|
||||
/// <returns>The specified type if found; otherwise, throws <see cref="NotFoundException"/>.</returns>
|
||||
public static T FindRequired<T>(this IUniverse universe) where T : class
|
||||
=> universe.Find<T>() ?? throw new NotFoundException($"{universe.GetType().FullName}({universe.Id}) does not contain any {nameof(IUniverseObject)} or {nameof(IBehaviour)} of type {typeof(T).FullName}");
|
||||
=> universe.Root.BehaviourController.GetBehaviourInChildren<T>() ?? throw new NotFoundException($"{universe.GetType().FullName}({universe.Id}) does not contain any {nameof(IUniverseObject)} or {nameof(IBehaviour)} of type {typeof(T).FullName}");
|
||||
}
|
||||
|
||||
@@ -16,6 +16,21 @@ public static class UniverseObjectExtensions
|
||||
return universeObject;
|
||||
}
|
||||
|
||||
public static IEnumerator<IUniverseObject> TraverseChildren(this IUniverseObject universeObject)
|
||||
{
|
||||
static IEnumerable<IUniverseObject> Traverse(IUniverseObject obj)
|
||||
{
|
||||
foreach (IUniverseObject child in obj.Children)
|
||||
{
|
||||
yield return child;
|
||||
foreach (IUniverseObject descendant in Traverse(child))
|
||||
yield return descendant;
|
||||
}
|
||||
}
|
||||
|
||||
return Traverse(universeObject).GetEnumerator();
|
||||
}
|
||||
|
||||
#region Universe Object Search
|
||||
/// <summary>
|
||||
/// Gets a <see cref="IUniverseObject"/> of the specified type.
|
||||
|
||||
@@ -56,8 +56,10 @@ public class Event
|
||||
// We use Ascending order because draw calls are running from last to first
|
||||
private static readonly Comparer<ListenerData> SortByAscendingPriority = Comparer<ListenerData>.Create((x, y) => x.Priority.CompareTo(y.Priority));
|
||||
|
||||
private ILogger _logger = ILogger.Shared;
|
||||
public ILogger Logger { get => _logger; set => _logger = value ?? ILogger.Shared; }
|
||||
public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
|
||||
|
||||
private int currentOnceCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
|
||||
private int currentCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
|
||||
|
||||
private readonly List<ListenerData> listeners = null!;
|
||||
private readonly List<ListenerData> onceListeners = null!;
|
||||
@@ -75,6 +77,9 @@ public class Event
|
||||
if (insertIndex < 0)
|
||||
insertIndex = ~insertIndex;
|
||||
|
||||
if (insertIndex < currentCallIndex)
|
||||
currentCallIndex++;
|
||||
|
||||
listeners.Insert(insertIndex, listenerData);
|
||||
}
|
||||
|
||||
@@ -91,6 +96,9 @@ public class Event
|
||||
if (insertIndex < 0)
|
||||
insertIndex = ~insertIndex;
|
||||
|
||||
if (insertIndex < currentOnceCallIndex)
|
||||
currentOnceCallIndex++;
|
||||
|
||||
onceListeners.Insert(insertIndex, listenerData);
|
||||
}
|
||||
|
||||
@@ -104,6 +112,8 @@ public class Event
|
||||
if (listeners[i].Callback == listener)
|
||||
{
|
||||
listeners.RemoveAt(i);
|
||||
if (i < currentCallIndex)
|
||||
currentCallIndex--;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -118,6 +128,8 @@ public class Event
|
||||
if (onceListeners[i].Callback == listener)
|
||||
{
|
||||
onceListeners.RemoveAt(i);
|
||||
if (i < currentOnceCallIndex)
|
||||
currentOnceCallIndex--;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -132,23 +144,23 @@ public class Event
|
||||
/// </summary>
|
||||
public void Invoke()
|
||||
{
|
||||
for (int i = listeners.Count - 1; i >= 0; i--)
|
||||
try { listeners[i].Callback.Invoke(); }
|
||||
for (currentCallIndex = listeners.Count - 1; currentCallIndex >= 0; currentCallIndex--)
|
||||
try { listeners[currentCallIndex].Callback.Invoke(); }
|
||||
catch (Exception exception)
|
||||
{
|
||||
string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}()";
|
||||
EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
|
||||
string methodCallRepresentation = $"{listeners[currentCallIndex].Callback.Method.DeclaringType?.FullName}.{listeners[currentCallIndex].Callback.Method.Name}()";
|
||||
EventHelpers.LogInvocationException(listeners[currentCallIndex].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
|
||||
}
|
||||
|
||||
for (int i = onceListeners.Count - 1; i >= 0; i--)
|
||||
for (currentOnceCallIndex = onceListeners.Count - 1; currentOnceCallIndex >= 0; currentOnceCallIndex--)
|
||||
{
|
||||
try { onceListeners[i].Callback.Invoke(); }
|
||||
try { onceListeners[currentOnceCallIndex].Callback.Invoke(); }
|
||||
catch (Exception exception)
|
||||
{
|
||||
string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}()";
|
||||
EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
|
||||
string methodCallRepresentation = $"{onceListeners[currentOnceCallIndex].Callback.Method.DeclaringType?.FullName}.{onceListeners[currentOnceCallIndex].Callback.Method.Name}()";
|
||||
EventHelpers.LogInvocationException(onceListeners[currentOnceCallIndex].Callback.Target ?? this, Logger, exception, methodCallRepresentation);
|
||||
}
|
||||
onceListeners.RemoveAt(i);
|
||||
onceListeners.RemoveAt(currentOnceCallIndex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -215,8 +227,10 @@ public class Event<TSender> where TSender : class
|
||||
// We use Ascending order because draw calls are running from last to first
|
||||
private static readonly Comparer<ListenerData> SortByAscendingPriority = Comparer<ListenerData>.Create((x, y) => x.Priority.CompareTo(y.Priority));
|
||||
|
||||
private ILogger _logger = ILogger.Shared;
|
||||
public ILogger Logger { get => _logger; set => _logger = value ?? ILogger.Shared; }
|
||||
public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
|
||||
|
||||
private int currentOnceCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
|
||||
private int currentCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
|
||||
|
||||
private readonly List<ListenerData> listeners = null!;
|
||||
private readonly List<ListenerData> onceListeners = null!;
|
||||
@@ -234,6 +248,9 @@ public class Event<TSender> where TSender : class
|
||||
if (insertIndex < 0)
|
||||
insertIndex = ~insertIndex;
|
||||
|
||||
if (insertIndex < currentCallIndex)
|
||||
currentCallIndex++;
|
||||
|
||||
listeners.Insert(insertIndex, listenerData);
|
||||
}
|
||||
|
||||
@@ -250,6 +267,9 @@ public class Event<TSender> where TSender : class
|
||||
if (insertIndex < 0)
|
||||
insertIndex = ~insertIndex;
|
||||
|
||||
if (insertIndex < currentOnceCallIndex)
|
||||
currentOnceCallIndex++;
|
||||
|
||||
onceListeners.Insert(insertIndex, listenerData);
|
||||
}
|
||||
|
||||
@@ -263,6 +283,8 @@ public class Event<TSender> where TSender : class
|
||||
if (listeners[i].Callback == listener)
|
||||
{
|
||||
listeners.RemoveAt(i);
|
||||
if (i < currentCallIndex)
|
||||
currentCallIndex--;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -277,6 +299,8 @@ public class Event<TSender> where TSender : class
|
||||
if (onceListeners[i].Callback == listener)
|
||||
{
|
||||
onceListeners.RemoveAt(i);
|
||||
if (i < currentOnceCallIndex)
|
||||
currentOnceCallIndex--;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -292,23 +316,23 @@ public class Event<TSender> where TSender : class
|
||||
/// <param name="sender">The caller that's triggering this event.</param>
|
||||
public void Invoke(TSender sender)
|
||||
{
|
||||
for (int i = listeners.Count - 1; i >= 0; i--)
|
||||
try { listeners[i].Callback.Invoke(sender); }
|
||||
for (currentCallIndex = listeners.Count - 1; currentCallIndex >= 0; currentCallIndex--)
|
||||
try { listeners[currentCallIndex].Callback.Invoke(sender); }
|
||||
catch (Exception exception)
|
||||
{
|
||||
string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}({sender})";
|
||||
EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
|
||||
string methodCallRepresentation = $"{listeners[currentCallIndex].Callback.Method.DeclaringType?.FullName}.{listeners[currentCallIndex].Callback.Method.Name}({sender})";
|
||||
EventHelpers.LogInvocationException(listeners[currentCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
|
||||
}
|
||||
|
||||
for (int i = onceListeners.Count - 1; i >= 0; i--)
|
||||
for (currentOnceCallIndex = onceListeners.Count - 1; currentOnceCallIndex >= 0; currentOnceCallIndex--)
|
||||
{
|
||||
try { onceListeners[i].Callback.Invoke(sender); }
|
||||
try { onceListeners[currentOnceCallIndex].Callback.Invoke(sender); }
|
||||
catch (Exception exception)
|
||||
{
|
||||
string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}({sender})";
|
||||
EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
|
||||
string methodCallRepresentation = $"{onceListeners[currentOnceCallIndex].Callback.Method.DeclaringType?.FullName}.{onceListeners[currentOnceCallIndex].Callback.Method.Name}({sender})";
|
||||
EventHelpers.LogInvocationException(onceListeners[currentOnceCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
|
||||
}
|
||||
onceListeners.RemoveAt(i);
|
||||
onceListeners.RemoveAt(currentOnceCallIndex);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -382,8 +406,10 @@ public class Event<TSender, TArguments> where TSender : class
|
||||
// We use Ascending order because draw calls are running from last to first
|
||||
private static readonly Comparer<ListenerData> SortByAscendingPriority = Comparer<ListenerData>.Create((x, y) => x.Priority.CompareTo(y.Priority));
|
||||
|
||||
private ILogger _logger = ILogger.Shared;
|
||||
public ILogger Logger { get => _logger; set => _logger = value ?? ILogger.Shared; }
|
||||
public ILogger Logger { get; set => field = value ?? ILogger.Shared; } = ILogger.Shared;
|
||||
|
||||
private int currentOnceCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
|
||||
private int currentCallIndex = -1; // These are for the purpose of if a listener is added/removed during invocation the index is dynamically updated so no missing/duplicate invocations happen.
|
||||
|
||||
private readonly List<ListenerData> listeners = null!;
|
||||
private readonly List<ListenerData> onceListeners = null!;
|
||||
@@ -401,6 +427,9 @@ public class Event<TSender, TArguments> where TSender : class
|
||||
if (insertIndex < 0)
|
||||
insertIndex = ~insertIndex;
|
||||
|
||||
if (insertIndex < currentCallIndex)
|
||||
currentCallIndex++;
|
||||
|
||||
listeners.Insert(insertIndex, listenerData);
|
||||
}
|
||||
|
||||
@@ -417,6 +446,9 @@ public class Event<TSender, TArguments> where TSender : class
|
||||
if (insertIndex < 0)
|
||||
insertIndex = ~insertIndex;
|
||||
|
||||
if (insertIndex < currentOnceCallIndex)
|
||||
currentOnceCallIndex++;
|
||||
|
||||
onceListeners.Insert(insertIndex, listenerData);
|
||||
}
|
||||
|
||||
@@ -430,6 +462,8 @@ public class Event<TSender, TArguments> where TSender : class
|
||||
if (listeners[i].Callback == listener)
|
||||
{
|
||||
listeners.RemoveAt(i);
|
||||
if (i < currentCallIndex)
|
||||
currentCallIndex--;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -444,6 +478,8 @@ public class Event<TSender, TArguments> where TSender : class
|
||||
if (onceListeners[i].Callback == listener)
|
||||
{
|
||||
onceListeners.RemoveAt(i);
|
||||
if (i < currentOnceCallIndex)
|
||||
currentOnceCallIndex--;
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -460,23 +496,23 @@ public class Event<TSender, TArguments> where TSender : class
|
||||
/// <param name="args">The arguments provided for this event.</param>
|
||||
public void Invoke(TSender sender, TArguments args)
|
||||
{
|
||||
for (int i = listeners.Count - 1; i >= 0; i--)
|
||||
try { listeners[i].Callback.Invoke(sender, args); }
|
||||
for (currentCallIndex = listeners.Count - 1; currentCallIndex >= 0; currentCallIndex--)
|
||||
try { listeners[currentCallIndex].Callback.Invoke(sender, args); }
|
||||
catch (Exception exception)
|
||||
{
|
||||
string methodCallRepresentation = $"{listeners[i].Callback.Method.DeclaringType?.FullName}.{listeners[i].Callback.Method.Name}({sender}, {args})";
|
||||
EventHelpers.LogInvocationException(listeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
|
||||
string methodCallRepresentation = $"{listeners[currentCallIndex].Callback.Method.DeclaringType?.FullName}.{listeners[currentCallIndex].Callback.Method.Name}({sender}, {args})";
|
||||
EventHelpers.LogInvocationException(listeners[currentCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
|
||||
}
|
||||
|
||||
for (int i = onceListeners.Count - 1; i >= 0; i--)
|
||||
for (currentOnceCallIndex = onceListeners.Count - 1; currentOnceCallIndex >= 0; currentOnceCallIndex--)
|
||||
{
|
||||
try { onceListeners[i].Callback.Invoke(sender, args); }
|
||||
try { onceListeners[currentOnceCallIndex].Callback.Invoke(sender, args); }
|
||||
catch (Exception exception)
|
||||
{
|
||||
string methodCallRepresentation = $"{onceListeners[i].Callback.Method.DeclaringType?.FullName}.{onceListeners[i].Callback.Method.Name}({sender}, {args})";
|
||||
EventHelpers.LogInvocationException(onceListeners[i].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
|
||||
string methodCallRepresentation = $"{onceListeners[currentOnceCallIndex].Callback.Method.DeclaringType?.FullName}.{onceListeners[currentOnceCallIndex].Callback.Method.Name}({sender}, {args})";
|
||||
EventHelpers.LogInvocationException(onceListeners[currentOnceCallIndex].Callback.Target ?? sender, Logger, exception, methodCallRepresentation);
|
||||
}
|
||||
onceListeners.RemoveAt(i);
|
||||
onceListeners.RemoveAt(currentOnceCallIndex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,8 +16,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
|
||||
private readonly Func<TItem, TIndex> getIndexFunc = null!;
|
||||
private readonly IComparer<TIndex> sortBy = null!;
|
||||
|
||||
private int count = 0;
|
||||
public int Count => count;
|
||||
public int Count { get; private set; } = 0;
|
||||
|
||||
public bool IsReadOnly { get; set; } = false;
|
||||
|
||||
@@ -35,10 +34,10 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
|
||||
private (TIndex TIndex, int i) GetAt(Index index)
|
||||
{
|
||||
int actualIndex = index.IsFromEnd
|
||||
? count - index.Value
|
||||
? Count - index.Value
|
||||
: index.Value;
|
||||
|
||||
if (actualIndex < 0 || actualIndex >= count)
|
||||
if (actualIndex < 0 || actualIndex >= Count)
|
||||
throw new IndexOutOfRangeException();
|
||||
|
||||
int leftIndex = actualIndex;
|
||||
@@ -75,7 +74,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
|
||||
items[key] = list = [];
|
||||
|
||||
list.Add(item);
|
||||
count++;
|
||||
Count++;
|
||||
}
|
||||
|
||||
public void Insert(int index, TItem item)
|
||||
@@ -88,7 +87,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
|
||||
items[tIndex] = list = [];
|
||||
|
||||
list.Insert(index, item);
|
||||
count++;
|
||||
Count++;
|
||||
}
|
||||
|
||||
public bool Remove(TItem item)
|
||||
@@ -103,7 +102,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
|
||||
if (!list.Remove(item))
|
||||
return false;
|
||||
|
||||
count--;
|
||||
Count--;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -114,7 +113,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
|
||||
|
||||
(TIndex tIndex, int i) = GetAt(index);
|
||||
items[tIndex].RemoveAt(i);
|
||||
count--;
|
||||
Count--;
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
@@ -125,7 +124,7 @@ public class FastListOrdered<TIndex, TItem> : IList<TItem>, IReadOnlyList<TItem>
|
||||
foreach ((TIndex index, FastList<TItem> list) in items)
|
||||
list.Clear();
|
||||
|
||||
count = 0;
|
||||
Count = 0;
|
||||
}
|
||||
|
||||
public bool Contains(TItem item)
|
||||
|
||||
@@ -110,6 +110,13 @@ public static class Math
|
||||
/// <returns>The sine of <paramref name="x"/>.</returns>
|
||||
public static float Sin(float x) => MathF.Sin(x);
|
||||
|
||||
/// <summary>
|
||||
/// Returns the tangent of a number.
|
||||
/// </summary>
|
||||
/// <param name="x">The angle, in radians.</param>
|
||||
/// <returns>The tangent of <paramref name="x"/>.</returns>
|
||||
public static float Tan(float x) => MathF.Tan(x);
|
||||
|
||||
/// <summary>
|
||||
/// Returns the arccosine of a number.
|
||||
/// </summary>
|
||||
@@ -124,6 +131,13 @@ public static class Math
|
||||
/// <returns>The arcsine of <paramref name="x"/>.</returns>
|
||||
public static float Asin(float x) => MathF.Asin(x);
|
||||
|
||||
/// <summary>
|
||||
/// Returns the angle whose tangent is the specified number.
|
||||
/// </summary>
|
||||
/// <param name="x">The tangent value.</param>
|
||||
/// <returns>The angle, in radians.</returns>
|
||||
public static float Atan(float x) => MathF.Atan(x);
|
||||
|
||||
/// <summary>
|
||||
/// Returns the angle whose tangent is the quotient of two specified numbers.
|
||||
/// </summary>
|
||||
|
||||
@@ -32,12 +32,18 @@ public static class MathExtensions
|
||||
/// <inheritdoc cref="Math.Sin(float)" />
|
||||
public static float Sin(this float x) => Math.Sin(x);
|
||||
|
||||
/// <inheritdoc cref="Math.Tan(float)" />
|
||||
public static float Tan(this float x) => Math.Tan(x);
|
||||
|
||||
/// <inheritdoc cref="Math.Acos(float)" />
|
||||
public static float Acos(this float x) => Math.Acos(x);
|
||||
|
||||
/// <inheritdoc cref="Math.Asin(float)" />
|
||||
public static float Asin(this float x) => Math.Asin(x);
|
||||
|
||||
/// <inheritdoc cref="Math.Atan(float)" />
|
||||
public static float Atan(this float x) => Math.Atan(x);
|
||||
|
||||
/// <inheritdoc cref="Math.Atan2(float, float)" />
|
||||
public static float Atan2(this float y, float x) => Math.Atan2(y, x);
|
||||
|
||||
|
||||
439
Engine.Core/Primitives/Matrix4x4.cs
Normal file
439
Engine.Core/Primitives/Matrix4x4.cs
Normal file
@@ -0,0 +1,439 @@
|
||||
using System;
|
||||
|
||||
namespace Engine.Core;
|
||||
|
||||
// TODO Comments
|
||||
|
||||
/// <summary>
|
||||
/// Represents a 4D left handed space matrix in a Column Major convention.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Initializes a new instance of the <see cref="Matrix4x4"/> struct with the specified values.
|
||||
/// </remarks>
|
||||
[System.Diagnostics.DebuggerDisplay("{ToString(),nq}")]
|
||||
public readonly struct Matrix4x4(
|
||||
float m11, float m12, float m13, float m14,
|
||||
float m21, float m22, float m23, float m24,
|
||||
float m31, float m32, float m33, float m34,
|
||||
float m41, float m42, float m43, float m44
|
||||
) : IEquatable<Matrix4x4>
|
||||
{
|
||||
public readonly float M11 = m11, M12 = m12, M13 = m13, M14 = m14;
|
||||
public readonly float M21 = m21, M22 = m22, M23 = m23, M24 = m24;
|
||||
public readonly float M31 = m31, M32 = m32, M33 = m33, M34 = m34;
|
||||
public readonly float M41 = m41, M42 = m42, M43 = m43, M44 = m44;
|
||||
|
||||
/// <summary>
|
||||
/// Extracts the position (translation) from the <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
public readonly Vector3D Position => new(M41, M42, M43);
|
||||
|
||||
/// <summary>
|
||||
/// Extracts the scale from the <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
public readonly Vector3D Scale
|
||||
{
|
||||
get
|
||||
{
|
||||
float scaleX = new Vector3D(M11, M12, M13).Length();
|
||||
float scaleY = new Vector3D(M21, M22, M23).Length();
|
||||
float scaleZ = new Vector3D(M31, M32, M33).Length();
|
||||
|
||||
if (Determinant(this) < 0)
|
||||
scaleX *= -1;
|
||||
|
||||
return new(scaleX, scaleY, scaleZ);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Extracts the rotation from the <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
public readonly Quaternion Rotation => Quaternion.FromRotationMatrix4x4(this).Normalized;
|
||||
|
||||
/// <summary>
|
||||
/// Represents the identity <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
public static Matrix4x4 Identity => new(
|
||||
1f, 0f, 0f, 0f,
|
||||
0f, 1f, 0f, 0f,
|
||||
0f, 0f, 1f, 0f,
|
||||
0f, 0f, 0f, 1f
|
||||
);
|
||||
|
||||
/// <summary>
|
||||
/// Represents the inverted version of this <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
public Matrix4x4 Inverse => Invert(this);
|
||||
|
||||
/// <summary>
|
||||
/// Represents the transposed version of this <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
public Matrix4x4 Transposed => Transpose(this);
|
||||
|
||||
public static Matrix4x4 operator *(Matrix4x4 a, Matrix4x4 b) => new(
|
||||
a.M11 * b.M11 + a.M12 * b.M21 + a.M13 * b.M31 + a.M14 * b.M41,
|
||||
a.M11 * b.M12 + a.M12 * b.M22 + a.M13 * b.M32 + a.M14 * b.M42,
|
||||
a.M11 * b.M13 + a.M12 * b.M23 + a.M13 * b.M33 + a.M14 * b.M43,
|
||||
a.M11 * b.M14 + a.M12 * b.M24 + a.M13 * b.M34 + a.M14 * b.M44,
|
||||
|
||||
a.M21 * b.M11 + a.M22 * b.M21 + a.M23 * b.M31 + a.M24 * b.M41,
|
||||
a.M21 * b.M12 + a.M22 * b.M22 + a.M23 * b.M32 + a.M24 * b.M42,
|
||||
a.M21 * b.M13 + a.M22 * b.M23 + a.M23 * b.M33 + a.M24 * b.M43,
|
||||
a.M21 * b.M14 + a.M22 * b.M24 + a.M23 * b.M34 + a.M24 * b.M44,
|
||||
|
||||
a.M31 * b.M11 + a.M32 * b.M21 + a.M33 * b.M31 + a.M34 * b.M41,
|
||||
a.M31 * b.M12 + a.M32 * b.M22 + a.M33 * b.M32 + a.M34 * b.M42,
|
||||
a.M31 * b.M13 + a.M32 * b.M23 + a.M33 * b.M33 + a.M34 * b.M43,
|
||||
a.M31 * b.M14 + a.M32 * b.M24 + a.M33 * b.M34 + a.M34 * b.M44,
|
||||
|
||||
a.M41 * b.M11 + a.M42 * b.M21 + a.M43 * b.M31 + a.M44 * b.M41,
|
||||
a.M41 * b.M12 + a.M42 * b.M22 + a.M43 * b.M32 + a.M44 * b.M42,
|
||||
a.M41 * b.M13 + a.M42 * b.M23 + a.M43 * b.M33 + a.M44 * b.M43,
|
||||
a.M41 * b.M14 + a.M42 * b.M24 + a.M43 * b.M34 + a.M44 * b.M44
|
||||
);
|
||||
|
||||
public static Vector4D operator *(Matrix4x4 m, Vector4D v) => new(
|
||||
m.M11 * v.X + m.M12 * v.Y + m.M13 * v.Z + m.M14 * v.W,
|
||||
m.M21 * v.X + m.M22 * v.Y + m.M23 * v.Z + m.M24 * v.W,
|
||||
m.M31 * v.X + m.M32 * v.Y + m.M33 * v.Z + m.M34 * v.W,
|
||||
m.M41 * v.X + m.M42 * v.Y + m.M43 * v.Z + m.M44 * v.W
|
||||
);
|
||||
|
||||
public static bool operator ==(Matrix4x4 left, Matrix4x4 right) =>
|
||||
left.M11 == right.M11 && left.M12 == right.M12 && left.M13 == right.M13 && left.M14 == right.M14 &&
|
||||
left.M21 == right.M21 && left.M22 == right.M22 && left.M23 == right.M23 && left.M24 == right.M24 &&
|
||||
left.M31 == right.M31 && left.M32 == right.M32 && left.M33 == right.M33 && left.M34 == right.M34 &&
|
||||
left.M41 == right.M41 && left.M42 == right.M42 && left.M43 == right.M43 && left.M44 == right.M44;
|
||||
|
||||
public static bool operator !=(Matrix4x4 left, Matrix4x4 right) =>
|
||||
left.M11 != right.M11 || left.M12 != right.M12 || left.M13 != right.M13 || left.M14 != right.M14 ||
|
||||
left.M21 != right.M21 || left.M22 != right.M22 || left.M23 != right.M23 || left.M24 != right.M24 ||
|
||||
left.M31 != right.M31 || left.M32 != right.M32 || left.M33 != right.M33 || left.M34 != right.M34 ||
|
||||
left.M41 != right.M41 || left.M42 != right.M42 || left.M43 != right.M43 || left.M44 != right.M44;
|
||||
|
||||
public static implicit operator System.Numerics.Matrix4x4(Matrix4x4 m) => new(
|
||||
m.M11, m.M12, m.M13, m.M14,
|
||||
m.M21, m.M22, m.M23, m.M24,
|
||||
m.M31, m.M32, m.M33, m.M34,
|
||||
m.M41, m.M42, m.M43, m.M44
|
||||
);
|
||||
|
||||
public static implicit operator Matrix4x4(System.Numerics.Matrix4x4 m) => new(
|
||||
m.M11, m.M12, m.M13, m.M14,
|
||||
m.M21, m.M22, m.M23, m.M24,
|
||||
m.M31, m.M32, m.M33, m.M34,
|
||||
m.M41, m.M42, m.M43, m.M44
|
||||
);
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the determinant of the <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
/// <param name="m">The <see cref="Matrix4x4"/>.</param>
|
||||
/// <returns>The determinant of the <see cref="Matrix4x4"/>.</returns>
|
||||
public static float Determinant(Matrix4x4 m) => // https://www.euclideanspace.com/maths/algebra/matrix/functions/determinant/fourD/index.htm
|
||||
m.M14 * m.M23 * m.M32 * m.M41 - m.M13 * m.M24 * m.M32 * m.M41 -
|
||||
m.M14 * m.M22 * m.M33 * m.M41 + m.M12 * m.M24 * m.M33 * m.M41 +
|
||||
m.M13 * m.M22 * m.M34 * m.M41 - m.M12 * m.M23 * m.M34 * m.M41 -
|
||||
m.M14 * m.M23 * m.M31 * m.M42 + m.M13 * m.M24 * m.M31 * m.M42 +
|
||||
m.M14 * m.M21 * m.M33 * m.M42 - m.M11 * m.M24 * m.M33 * m.M42 -
|
||||
m.M13 * m.M21 * m.M34 * m.M42 + m.M11 * m.M23 * m.M34 * m.M42 +
|
||||
m.M14 * m.M22 * m.M31 * m.M43 - m.M12 * m.M24 * m.M31 * m.M43 -
|
||||
m.M14 * m.M21 * m.M32 * m.M43 + m.M11 * m.M24 * m.M32 * m.M43 +
|
||||
m.M12 * m.M21 * m.M34 * m.M43 - m.M11 * m.M22 * m.M34 * m.M43 -
|
||||
m.M13 * m.M22 * m.M31 * m.M44 + m.M12 * m.M23 * m.M31 * m.M44 +
|
||||
m.M13 * m.M21 * m.M32 * m.M44 - m.M11 * m.M23 * m.M32 * m.M44 -
|
||||
m.M12 * m.M21 * m.M33 * m.M44 + m.M11 * m.M22 * m.M33 * m.M44;
|
||||
|
||||
/// <summary>
|
||||
/// Inverts the given <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
/// <param name="m">The <see cref="Matrix4x4"/>.</param>
|
||||
/// <returns>The inverted <see cref="Matrix4x4"/> of the given <see cref="Matrix4x4"/>.</returns>
|
||||
public static Matrix4x4 Invert(Matrix4x4 m)
|
||||
{
|
||||
float m1 = m.M11, m2 = m.M12, m3 = m.M13, m4 = m.M14;
|
||||
float m5 = m.M21, m6 = m.M22, m7 = m.M23, m8 = m.M24;
|
||||
float m9 = m.M31, m10 = m.M32, m11 = m.M33, m12 = m.M34;
|
||||
float m13 = m.M41, m14 = m.M42, m15 = m.M43, m16 = m.M44;
|
||||
|
||||
float num = m11 * m16 - m12 * m15;
|
||||
float num2 = m10 * m16 - m12 * m14;
|
||||
float num3 = m10 * m15 - m11 * m14;
|
||||
float num4 = m9 * m16 - m12 * m13;
|
||||
float num5 = m9 * m15 - m11 * m13;
|
||||
float num6 = m9 * m14 - m10 * m13;
|
||||
|
||||
float num7 = m6 * num - m7 * num2 + m8 * num3;
|
||||
float num8 = -(m5 * num - m7 * num4 + m8 * num5);
|
||||
float num9 = m5 * num2 - m6 * num4 + m8 * num6;
|
||||
float num10 = -(m5 * num3 - m6 * num5 + m7 * num6);
|
||||
|
||||
float invDet = 1f / (m1 * num7 + m2 * num8 + m3 * num9 + m4 * num10);
|
||||
|
||||
float r11 = num7 * invDet;
|
||||
float r21 = num8 * invDet;
|
||||
float r31 = num9 * invDet;
|
||||
float r41 = num10 * invDet;
|
||||
|
||||
float r12 = (-(m2 * num - m3 * num2 + m4 * num3)) * invDet;
|
||||
float r22 = (m1 * num - m3 * num4 + m4 * num5) * invDet;
|
||||
float r32 = (-(m1 * num2 - m2 * num4 + m4 * num6)) * invDet;
|
||||
float r42 = (m1 * num3 - m2 * num5 + m3 * num6) * invDet;
|
||||
|
||||
float num12 = m7 * m16 - m8 * m15;
|
||||
float num13 = m6 * m16 - m8 * m14;
|
||||
float num14 = m6 * m15 - m7 * m14;
|
||||
float num15 = m5 * m16 - m8 * m13;
|
||||
float num16 = m5 * m15 - m7 * m13;
|
||||
float num17 = m5 * m14 - m6 * m13;
|
||||
|
||||
float r13 = (m2 * num12 - m3 * num13 + m4 * num14) * invDet;
|
||||
float r23 = (-(m1 * num12 - m3 * num15 + m4 * num16)) * invDet;
|
||||
float r33 = (m1 * num13 - m2 * num15 + m4 * num17) * invDet;
|
||||
float r43 = (-(m1 * num14 - m2 * num16 + m3 * num17)) * invDet;
|
||||
|
||||
float num18 = m7 * m12 - m8 * m11;
|
||||
float num19 = m6 * m12 - m8 * m10;
|
||||
float num20 = m6 * m11 - m7 * m10;
|
||||
float num21 = m5 * m12 - m8 * m9;
|
||||
float num22 = m5 * m11 - m7 * m9;
|
||||
float num23 = m5 * m10 - m6 * m9;
|
||||
|
||||
float r14 = (-(m2 * num18 - m3 * num19 + m4 * num20)) * invDet;
|
||||
float r24 = (m1 * num18 - m3 * num21 + m4 * num22) * invDet;
|
||||
float r34 = (-(m1 * num19 - m2 * num21 + m4 * num23)) * invDet;
|
||||
float r44 = (m1 * num20 - m2 * num22 + m3 * num23) * invDet;
|
||||
|
||||
return new(
|
||||
r11, r12, r13, r14,
|
||||
r21, r22, r23, r24,
|
||||
r31, r32, r33, r34,
|
||||
r41, r42, r43, r44
|
||||
);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Transposes the given <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
/// <param name="m">The <see cref="Matrix4x4"/>.</param>
|
||||
/// <returns>The transposed <see cref="Matrix4x4"/> of the given <see cref="Matrix4x4"/>.</returns>
|
||||
public static Matrix4x4 Transpose(Matrix4x4 m) => new(
|
||||
m.M11, m.M21, m.M31, m.M41,
|
||||
m.M12, m.M22, m.M32, m.M42,
|
||||
m.M13, m.M23, m.M33, m.M43,
|
||||
m.M14, m.M24, m.M34, m.M44
|
||||
);
|
||||
|
||||
public static Matrix4x4 CreateTranslation(Vector3D position) => new(
|
||||
1f, 0f, 0f, position.X,
|
||||
0f, 1f, 0f, position.Y,
|
||||
0f, 0f, 1f, position.Z,
|
||||
0f, 0f, 0f, 1f
|
||||
);
|
||||
|
||||
public static Matrix4x4 CreateScale(float scale) => new(
|
||||
scale, 0f, 0f, 0f,
|
||||
0f, scale, 0f, 0f,
|
||||
0f, 0f, scale, 0f,
|
||||
0f, 0f, 0f, 1f
|
||||
);
|
||||
|
||||
public static Matrix4x4 CreateScale(Vector3D scale) => new(
|
||||
scale.X, 0f, 0f, 0f,
|
||||
0f, scale.Y, 0f, 0f,
|
||||
0f, 0f, scale.Z, 0f,
|
||||
0f, 0f, 0f, 1f
|
||||
);
|
||||
|
||||
public static Matrix4x4 CreateRotationX(float radians)
|
||||
{
|
||||
float c = Math.Cos(radians);
|
||||
float s = Math.Sin(radians);
|
||||
|
||||
return new(
|
||||
1f, 0f, 0f, 0f,
|
||||
0f, c, -s, 0f,
|
||||
0f, s, c, 0f,
|
||||
0f, 0f, 0f, 1f
|
||||
);
|
||||
}
|
||||
|
||||
public static Matrix4x4 CreateRotationY(float radians)
|
||||
{
|
||||
float c = Math.Cos(radians);
|
||||
float s = Math.Sin(radians);
|
||||
|
||||
return new(
|
||||
c, 0f, s, 0f,
|
||||
0f, 1f, 0f, 0f,
|
||||
-s, 0f, c, 0f,
|
||||
0f, 0f, 0f, 1f
|
||||
);
|
||||
}
|
||||
|
||||
public static Matrix4x4 CreateRotationZ(float radians)
|
||||
{
|
||||
float c = Math.Cos(radians);
|
||||
float s = Math.Sin(radians);
|
||||
|
||||
return new(
|
||||
c, -s, 0f, 0f,
|
||||
s, c, 0f, 0f,
|
||||
0f, 0f, 1f, 0f,
|
||||
0f, 0f, 0f, 1f
|
||||
);
|
||||
}
|
||||
|
||||
// TODO Find a better calculation for this
|
||||
public static Matrix4x4 CreateRotation(Quaternion quaternion)
|
||||
{
|
||||
Vector3D angles = quaternion.ToAngles();
|
||||
return Identity * CreateRotationX(angles.X) * CreateRotationY(angles.Y) * CreateRotationZ(angles.Z);
|
||||
}
|
||||
|
||||
public static Matrix4x4 CreateLookMatrix(Vector3D forward, Vector3D up)
|
||||
{
|
||||
Vector3D z = forward.Normalized;
|
||||
Vector3D x = up.Cross(z).Normalized;
|
||||
Vector3D y = z.Cross(x);
|
||||
|
||||
return new(
|
||||
x.X, y.X, z.X, 0f,
|
||||
x.Y, y.Y, z.Y, 0f,
|
||||
x.Z, y.Z, z.Z, 0f,
|
||||
0f, 0f, 0f, 1f
|
||||
);
|
||||
}
|
||||
|
||||
public static Matrix4x4 CreateLookMatrix(Vector3D position, Vector3D target, Vector3D up)
|
||||
{
|
||||
Vector3D f = (target - position).Normalized;
|
||||
Vector3D s = f.Cross(up).Normalized;
|
||||
Vector3D u = s.Cross(f);
|
||||
|
||||
return new(
|
||||
s.X, u.X, -f.X, 0f,
|
||||
s.Y, u.Y, -f.Y, 0f,
|
||||
s.Z, u.Z, -f.Z, 0f,
|
||||
-s.Dot(position), -u.Dot(position), f.Dot(position), 1f
|
||||
);
|
||||
}
|
||||
|
||||
public static Matrix4x4 CreateOrthographicView(float width, float height, float nearPlane = -1f, float farPlane = 1f)
|
||||
{
|
||||
float invDepth = 1f / (farPlane - nearPlane);
|
||||
|
||||
return new(
|
||||
2f / width, 0f, 0f, 0f,
|
||||
0f, -2f / height, 0f, 0f,
|
||||
0f, 0f, 1f * invDepth, 0f,
|
||||
-1f, 1f, -nearPlane * invDepth, 1f
|
||||
);
|
||||
}
|
||||
|
||||
public static Matrix4x4 CreateOrthographicViewCentered(float width, float height, float nearPlane = -1f, float farPlane = 1f)
|
||||
{
|
||||
float invDepth = 1f / (farPlane - nearPlane);
|
||||
|
||||
return new(
|
||||
2f / width, 0f, 0f, 0f,
|
||||
0f, 2f / height, 0f, 0f,
|
||||
0f, 0f, 1f * invDepth, 0f,
|
||||
0f, 0f, -nearPlane * invDepth, 1f
|
||||
);
|
||||
}
|
||||
|
||||
public static Matrix4x4 CreatePerspectiveFieldOfView(float fovRadians, float aspectRatio, float nearPlane, float farPlane)
|
||||
{
|
||||
float yScale = 1f / Math.Tan(fovRadians / 2f);
|
||||
float xScale = yScale / aspectRatio;
|
||||
float zRange = farPlane - nearPlane;
|
||||
|
||||
return new(
|
||||
xScale, 0f, 0f, 0f,
|
||||
0f, yScale, 0f, 0f,
|
||||
0f, 0f, -(farPlane + nearPlane) / zRange, -1f,
|
||||
0f, 0f, -(2f * nearPlane * farPlane) / zRange, 0f
|
||||
);
|
||||
}
|
||||
|
||||
public static Matrix4x4 ToRightHanded(Matrix4x4 m) => new(
|
||||
m.M11, m.M12, m.M13, m.M14,
|
||||
m.M31, m.M32, m.M33, m.M34,
|
||||
m.M21, m.M22, m.M23, m.M24,
|
||||
m.M41, m.M42, m.M43, m.M44
|
||||
);
|
||||
|
||||
public override bool Equals(object? obj) => obj is Matrix4x4 matrix && this == matrix;
|
||||
public bool Equals(Matrix4x4 other) => this == other;
|
||||
|
||||
public override int GetHashCode()
|
||||
{
|
||||
HashCode hashCode = new();
|
||||
hashCode.Add(M11); hashCode.Add(M12); hashCode.Add(M13); hashCode.Add(M14);
|
||||
hashCode.Add(M21); hashCode.Add(M22); hashCode.Add(M23); hashCode.Add(M24);
|
||||
hashCode.Add(M31); hashCode.Add(M32); hashCode.Add(M33); hashCode.Add(M34);
|
||||
hashCode.Add(M41); hashCode.Add(M42); hashCode.Add(M43); hashCode.Add(M44);
|
||||
return hashCode.ToHashCode();
|
||||
}
|
||||
|
||||
public override string ToString() => $"Matrix4x4({M11}, {M12}, {M13}, {M14},{M21}, {M22}, {M23}, {M24},{M31}, {M32}, {M33}, {M34},{M41}, {M42}, {M43}, {M44})";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Provides extension methods for <see cref="Matrix4x4"/> type.
|
||||
/// </summary>
|
||||
public static class Matrix4x4Extensions
|
||||
{
|
||||
/// <inheritdoc cref="Matrix4x4.Determinant(Matrix4x4)" />
|
||||
public static float Determinant(this Matrix4x4 matrix) => Matrix4x4.Determinant(matrix);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.Invert(Matrix4x4)" />
|
||||
public static Matrix4x4 Invert(this Matrix4x4 matrix) => Matrix4x4.Invert(matrix);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.Transpose(Matrix4x4)" />
|
||||
public static Matrix4x4 Transpose(this Matrix4x4 matrix) => Matrix4x4.Transpose(matrix);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateTranslation(Vector3D)" />
|
||||
public static Matrix4x4 ApplyTranslation(this Matrix4x4 matrix, Vector3D translation) => matrix * Matrix4x4.CreateTranslation(translation);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateScale(Vector3D)" />
|
||||
public static Matrix4x4 ApplyScale(this Matrix4x4 matrix, Vector3D scale) => matrix * Matrix4x4.CreateScale(scale);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateScale(float)" />
|
||||
public static Matrix4x4 ApplyScale(this Matrix4x4 matrix, float scale) => matrix * Matrix4x4.CreateScale(scale);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateRotationZ(float)" />
|
||||
public static Matrix4x4 ApplyRotationX(this Matrix4x4 matrix, float radians) => matrix * Matrix4x4.CreateRotationX(radians);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateRotationY(float)" />
|
||||
public static Matrix4x4 ApplyRotationY(this Matrix4x4 matrix, float radians) => matrix * Matrix4x4.CreateRotationY(radians);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateRotationZ(float)" />
|
||||
public static Matrix4x4 ApplyRotationZ(this Matrix4x4 matrix, float radians) => matrix * Matrix4x4.CreateRotationZ(radians);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateRotation(Quater)" />
|
||||
public static Matrix4x4 ApplyRotation(this Matrix4x4 matrix, Quaternion quaternion) => matrix * Matrix4x4.CreateRotation(quaternion);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateLookMatrix( Vector3D, Vector3D)" />
|
||||
public static Matrix4x4 ApplyLookRotationTo(this Matrix4x4 matrix, Vector3D forward, Vector3D up) => matrix * Matrix4x4.CreateLookMatrix(forward, up);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateLookMatrix(Vector3D, Vector3D, Vector3D)" />
|
||||
public static Matrix4x4 CreateLookMatrixTo(this Vector3D from, Vector3D to, Vector3D up) => Matrix4x4.CreateLookMatrix(from, to, up);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreatePerspectiveFieldOfView(float, float, float, float)" />
|
||||
public static Matrix4x4 ApplyPerspectiveFieldOfView(this Matrix4x4 matrix, float fieldOfViewInRadians, float aspectRatio, float nearPlane, float farPlane)
|
||||
=> matrix * Matrix4x4.CreatePerspectiveFieldOfView(fieldOfViewInRadians, aspectRatio, nearPlane, farPlane);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateOrthographicView(float, float, float, float)" />
|
||||
public static Matrix4x4 ApplyOrthographicView(this Matrix4x4 matrix, float width, float height, float nearPlane = -1f, float farPlane = 1f)
|
||||
=> matrix * Matrix4x4.CreateOrthographicView(width, height, nearPlane, farPlane);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.CreateOrthographicViewCentered(float, float, float, float)" />
|
||||
public static Matrix4x4 ApplyOrthographicViewCentered(this Matrix4x4 matrix, float width, float height, float nearPlane = -1f, float farPlane = 1f)
|
||||
=> matrix * Matrix4x4.CreateOrthographicViewCentered(width, height, nearPlane, farPlane);
|
||||
|
||||
/// <inheritdoc cref="Matrix4x4.ToRightHanded(Matrix4x4) />
|
||||
public static Matrix4x4 ToRightHanded(this Matrix4x4 matrix) => Matrix4x4.ToRightHanded(matrix);
|
||||
}
|
||||
@@ -156,6 +156,27 @@ public readonly struct Quaternion(float x, float y, float z, float w) : IEquatab
|
||||
/// <returns>The normalized <see cref="Quaternion"/>.</returns>
|
||||
public static Quaternion Normalize(Quaternion quaternion) => quaternion / Length(quaternion);
|
||||
|
||||
public static Quaternion LookAt(Vector3D origin, Vector3D target, Vector3D up) => LookAt(target - origin, up);
|
||||
public static Quaternion LookAt(Vector3D target, Vector3D up)
|
||||
{
|
||||
Vector3D forward = target.Normalized;
|
||||
|
||||
if (forward.LengthSquared() < 1e-6f)
|
||||
return Identity;
|
||||
|
||||
Vector3D right = up.Cross(forward).Normalized;
|
||||
Vector3D newUp = forward.Cross(right);
|
||||
|
||||
Matrix4x4 rot = new(
|
||||
right.X, right.Y, right.Z, 0f,
|
||||
newUp.X, newUp.Y, newUp.Z, 0f,
|
||||
forward.X, forward.Y, forward.Z, 0f,
|
||||
0f, 0f, 0f, 1f
|
||||
);
|
||||
|
||||
return FromRotationMatrix4x4(rot);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Rotates a <see cref="Quaternion"/> around a axis by the specified angle (in radians).
|
||||
/// </summary>
|
||||
@@ -212,8 +233,8 @@ public readonly struct Quaternion(float x, float y, float z, float w) : IEquatab
|
||||
dot = -dot;
|
||||
}
|
||||
|
||||
if (dot > 0.9995f)
|
||||
return Lerp(from, to, t);
|
||||
if (dot > 0.999999f)
|
||||
return to;
|
||||
|
||||
float angle = Math.Acos(dot);
|
||||
float sinAngle = Math.Sin(angle);
|
||||
@@ -276,12 +297,11 @@ public readonly struct Quaternion(float x, float y, float z, float w) : IEquatab
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the <see cref="System.Numerics.Matrix4x4"/> from given <see cref="Quaternion"/>.
|
||||
/// Calculates the <see cref="Matrix4x4"/> from given <see cref="Quaternion"/>.
|
||||
/// </summary>
|
||||
/// <param name="axis">The axis of the rotation in <see cref="Vector3D"/>.</param>
|
||||
/// <param name="angle">The angle in radians.</param>
|
||||
/// <returns>The rotation <see cref="System.Numerics.Matrix4x4"/> calculated by the given <see cref="Quaternion"/>.</returns>
|
||||
public static System.Numerics.Matrix4x4 ToRotationMatrix4x4(Quaternion quaternion)
|
||||
/// <param name="quaternion">The rotation <see cref="Quaternion"/>.</param>
|
||||
/// <returns>The rotation <see cref="Matrix4x4"/> calculated by the given <see cref="Quaternion"/>.</returns>
|
||||
public static Matrix4x4 ToRotationMatrix4x4(Quaternion quaternion)
|
||||
{
|
||||
float m00 = 1 - 2 * (quaternion.Y * quaternion.Y + quaternion.Z * quaternion.Z);
|
||||
float m01 = 2 * (quaternion.X * quaternion.Y - quaternion.W * quaternion.Z);
|
||||
@@ -311,6 +331,52 @@ public readonly struct Quaternion(float x, float y, float z, float w) : IEquatab
|
||||
);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the <see cref="Quaternion"/> from given <see cref="Matrix4x4"/>.
|
||||
/// </summary>
|
||||
/// <param name="martix">The rotation <see cref="Matrix4x4"/>.</param>
|
||||
/// <returns>The rotation <see cref="Quaternion"/> calculated by the given <see cref="Matrix4x4"/>.</returns>
|
||||
public static Quaternion FromRotationMatrix4x4(Matrix4x4 martix)
|
||||
{
|
||||
float trace = martix.M11 + martix.M22 + martix.M33;
|
||||
float w, x, y, z;
|
||||
|
||||
if (trace > 0)
|
||||
{
|
||||
float s = Math.Sqrt(trace + 1.0f) * 2f;
|
||||
w = .25f * s;
|
||||
x = (martix.M23 - martix.M32) / s;
|
||||
y = (martix.M31 - martix.M13) / s;
|
||||
z = (martix.M12 - martix.M21) / s;
|
||||
}
|
||||
else if ((martix.M11 > martix.M22) && (martix.M11 > martix.M33))
|
||||
{
|
||||
float s = Math.Sqrt(1.0f + martix.M11 - martix.M22 - martix.M33) * 2f;
|
||||
w = (martix.M23 - martix.M32) / s;
|
||||
x = .25f * s;
|
||||
y = (martix.M12 + martix.M21) / s;
|
||||
z = (martix.M31 + martix.M13) / s;
|
||||
}
|
||||
else if (martix.M22 > martix.M33)
|
||||
{
|
||||
float s = Math.Sqrt(1.0f + martix.M22 - martix.M11 - martix.M33) * 2f;
|
||||
w = (martix.M31 - martix.M13) / s;
|
||||
x = (martix.M12 + martix.M21) / s;
|
||||
y = .25f * s;
|
||||
z = (martix.M23 + martix.M32) / s;
|
||||
}
|
||||
else
|
||||
{
|
||||
float s = Math.Sqrt(1.0f + martix.M33 - martix.M11 - martix.M22) * 2f;
|
||||
w = (martix.M12 - martix.M21) / s;
|
||||
x = (martix.M31 + martix.M13) / s;
|
||||
y = (martix.M23 + martix.M32) / s;
|
||||
z = .25f * s;
|
||||
}
|
||||
|
||||
return new(x, y, z, w);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Checks if two <see cref="Quaternion"/>s are approximately equal within a specified epsilon range.
|
||||
/// </summary>
|
||||
@@ -333,13 +399,13 @@ public readonly struct Quaternion(float x, float y, float z, float w) : IEquatab
|
||||
/// Generates a hash code for the <see cref="Quaternion"/>.
|
||||
/// </summary>
|
||||
/// <returns>A hash code for the <see cref="Quaternion"/>.</returns>
|
||||
public override int GetHashCode() => System.HashCode.Combine(W, X, Y, Z);
|
||||
public override int GetHashCode() => System.HashCode.Combine(X, Y, Z, W);
|
||||
|
||||
/// <summary>
|
||||
/// Converts the <see cref="Quaternion"/> to its string representation.
|
||||
/// </summary>
|
||||
/// <returns>A string representation of the <see cref="Quaternion"/>.</returns>
|
||||
public override string ToString() => $"{nameof(Quaternion)}({W}, {X}, {Y}, {Z})";
|
||||
public override string ToString() => $"{nameof(Quaternion)}({X}, {Y}, {Z}, {W})";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -393,7 +459,7 @@ public static class QuaternionExtensions
|
||||
public static float Dot(this Quaternion left, Quaternion right) => Quaternion.Dot(left, right);
|
||||
|
||||
/// <inheritdoc cref="Quaternion.ToRotationMatrix4x4(Quaternion, Quaternion)" />
|
||||
public static System.Numerics.Matrix4x4 ToRotationMatrix4x4(this Quaternion quaternion) => Quaternion.ToRotationMatrix4x4(quaternion);
|
||||
public static Matrix4x4 ToRotationMatrix4x4(this Quaternion quaternion) => Quaternion.ToRotationMatrix4x4(quaternion);
|
||||
|
||||
/// <inheritdoc cref="Quaternion.FromAxisAngle(Vector3D, float)" />
|
||||
public static Quaternion CreateRotation(this Vector3D axis, float angle) => Quaternion.FromAxisAngle(axis, angle);
|
||||
|
||||
@@ -20,7 +20,7 @@ public class Shape2D(List<Vector2D> vertices) : IEnumerable<Vector2D>
|
||||
|
||||
public Event<Shape2D> OnShapeUpdated { get; } = new();
|
||||
|
||||
private List<Vector2D> _vertices = vertices;
|
||||
private readonly List<Vector2D> _vertices = vertices;
|
||||
|
||||
/// <summary>
|
||||
/// Gets the vertices of the <see cref="Shape2D"/>.
|
||||
|
||||
@@ -82,11 +82,19 @@ public readonly struct Vector2D(float x, float y) : IEquatable<Vector2D>
|
||||
public static bool operator ==(Vector2D left, Vector2D right) => left.X == right.X && left.Y == right.Y;
|
||||
public static bool operator !=(Vector2D left, Vector2D right) => left.X != right.X || left.Y != right.Y;
|
||||
|
||||
public static implicit operator System.Numerics.Vector2(Vector2D vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator Vector2D(System.Numerics.Vector2 vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator Vector2D(Vector2DInt vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator Vector2D(Vector3D vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator Vector2D(Vector3DInt vector) => new(vector.X, vector.Y);
|
||||
|
||||
public static implicit operator System.Numerics.Vector2(Vector2D vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator System.Numerics.Vector3(Vector2D vector) => new(vector.X, vector.Y, 0f);
|
||||
public static implicit operator System.Numerics.Vector4(Vector2D vector) => new(vector.X, vector.Y, 0f, 0f);
|
||||
|
||||
public static implicit operator Vector2D(System.Numerics.Vector2 vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator Vector2D(System.Numerics.Vector3 vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator Vector2D(System.Numerics.Vector4 vector) => new(vector.X, vector.Y);
|
||||
|
||||
public static implicit operator Vector2D(Vector3D vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator Vector2D(Vector4D vector) => new(vector.X, vector.Y);
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the length of the <see cref="Vector2D"/>.
|
||||
|
||||
@@ -74,9 +74,12 @@ public readonly struct Vector2DInt(int x, int y) : IEquatable<Vector2DInt>
|
||||
public static bool operator ==(Vector2DInt left, Vector2DInt right) => left.X == right.X && left.Y == right.Y;
|
||||
public static bool operator !=(Vector2DInt left, Vector2DInt right) => left.X != right.X || left.Y != right.Y;
|
||||
|
||||
public static implicit operator Vector2DInt(Vector2D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt());
|
||||
public static implicit operator Vector2DInt(Vector3DInt vector) => new(vector.X, vector.Y);
|
||||
|
||||
public static implicit operator Vector2DInt(Vector2D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt());
|
||||
public static implicit operator Vector2DInt(Vector3D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt());
|
||||
public static implicit operator Vector2DInt(Vector4D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt());
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the length of the <see cref="Vector2DInt"/>.
|
||||
/// </summary>
|
||||
|
||||
@@ -92,11 +92,19 @@ public readonly struct Vector3D(float x, float y, float z) : IEquatable<Vector3D
|
||||
public static bool operator ==(Vector3D left, Vector3D right) => left.X == right.X && left.Y == right.Y && left.Z == right.Z;
|
||||
public static bool operator !=(Vector3D left, Vector3D right) => left.X != right.X || left.Y != right.Y || left.Z != right.Z;
|
||||
|
||||
public static implicit operator System.Numerics.Vector3(Vector3D vector) => new(vector.X, vector.Y, vector.Z);
|
||||
public static implicit operator Vector3D(System.Numerics.Vector3 vector) => new(vector.X, vector.Y, vector.Z);
|
||||
public static implicit operator Vector3D(Vector2DInt vector) => new(vector.X, vector.Y, 0f);
|
||||
public static implicit operator Vector3D(Vector3DInt vector) => new(vector.X, vector.Y, vector.Z);
|
||||
public static implicit operator Vector3D(Vector2D vector) => new(vector.X, vector.Y, 0f);
|
||||
|
||||
public static implicit operator System.Numerics.Vector2(Vector3D vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator System.Numerics.Vector3(Vector3D vector) => new(vector.X, vector.Y, vector.Z);
|
||||
public static implicit operator System.Numerics.Vector4(Vector3D vector) => new(vector.X, vector.Y, vector.Z, 0f);
|
||||
|
||||
public static implicit operator Vector3D(System.Numerics.Vector2 vector) => new(vector.X, vector.Y, 0f);
|
||||
public static implicit operator Vector3D(System.Numerics.Vector3 vector) => new(vector.X, vector.Y, vector.Z);
|
||||
public static implicit operator Vector3D(System.Numerics.Vector4 vector) => new(vector.X, vector.Y, vector.Z);
|
||||
|
||||
public static implicit operator Vector3D(Vector2D vector) => new(vector.X, vector.Y, 0f);
|
||||
public static implicit operator Vector3D(Vector4D vector) => new(vector.X, vector.Y, vector.Z);
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the length of the <see cref="Vector3D"/>.
|
||||
|
||||
@@ -84,9 +84,12 @@ public readonly struct Vector3DInt(int x, int y, int z) : IEquatable<Vector3DInt
|
||||
public static bool operator ==(Vector3DInt left, Vector3DInt right) => left.X == right.X && left.Y == right.Y && left.Z == right.Z;
|
||||
public static bool operator !=(Vector3DInt left, Vector3DInt right) => left.X != right.X || left.Y != right.Y || left.Z != right.Z;
|
||||
|
||||
public static implicit operator Vector3DInt(Vector3D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt(), vector.Z.RoundToInt());
|
||||
public static implicit operator Vector3DInt(Vector2DInt vector) => new(vector.X, vector.Y, 0);
|
||||
|
||||
public static implicit operator Vector3DInt(Vector2D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt(), 0);
|
||||
public static implicit operator Vector3DInt(Vector3D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt(), vector.Z.RoundToInt());
|
||||
public static implicit operator Vector3DInt(Vector4D vector) => new(vector.X.RoundToInt(), vector.Y.RoundToInt(), vector.Z.RoundToInt());
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the length of the <see cref="Vector3DInt"/>.
|
||||
/// </summary>
|
||||
|
||||
@@ -90,9 +90,20 @@ public readonly struct Vector4D(float x, float y, float z, float w) : IEquatable
|
||||
public static bool operator ==(Vector4D left, Vector4D right) => left.X == right.X && left.Y == right.Y && left.Z == right.Z && left.W == right.W;
|
||||
public static bool operator !=(Vector4D left, Vector4D right) => left.X != right.X || left.Y != right.Y || left.Z != right.Z || left.W != right.W;
|
||||
|
||||
public static implicit operator Vector4D(Vector2DInt vector) => new(vector.X, vector.Y, 0f, 0f);
|
||||
public static implicit operator Vector4D(Vector3DInt vector) => new(vector.X, vector.Y, vector.Z, 0f);
|
||||
|
||||
public static implicit operator System.Numerics.Vector2(Vector4D vector) => new(vector.X, vector.Y);
|
||||
public static implicit operator System.Numerics.Vector3(Vector4D vector) => new(vector.X, vector.Y, vector.Z);
|
||||
public static implicit operator System.Numerics.Vector4(Vector4D vector) => new(vector.X, vector.Y, vector.Z, vector.W);
|
||||
|
||||
public static implicit operator Vector4D(System.Numerics.Vector2 vector) => new(vector.X, vector.Y, 0f, 0f);
|
||||
public static implicit operator Vector4D(System.Numerics.Vector3 vector) => new(vector.X, vector.Y, vector.Z, 0f);
|
||||
public static implicit operator Vector4D(System.Numerics.Vector4 vector) => new(vector.X, vector.Y, vector.Z, vector.W);
|
||||
|
||||
public static implicit operator Vector4D(Vector2D vector) => new(vector.X, vector.Y, 0f, 0f);
|
||||
public static implicit operator Vector4D(Vector3D vector) => new(vector.X, vector.Y, vector.Z, 0f);
|
||||
|
||||
/// <summary>
|
||||
/// Calculates the length of the <see cref="Vector4D"/>.
|
||||
/// </summary>
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Engine.Core.Serialization;
|
||||
|
||||
public class EntityRegistry
|
||||
{
|
||||
public Event<EntityRegistry, EntityRegisteredArguments> OnEntityRegistered = null!;
|
||||
|
||||
private readonly Dictionary<string, Action<IEntity>?> assignCallbacks = [];
|
||||
private readonly Dictionary<string, IEntity> registeredEntities = [];
|
||||
public IReadOnlyDictionary<string, IEntity> RegisteredEntities => registeredEntities;
|
||||
|
||||
public void Add(IEntity entity)
|
||||
{
|
||||
if (registeredEntities.TryAdd(entity.Id, entity))
|
||||
OnEntityRegistered?.Invoke(this, new(entity));
|
||||
}
|
||||
|
||||
public void QueueAssign(string id, Action<IEntity> setMethod)
|
||||
{
|
||||
assignCallbacks.TryAdd(id, null);
|
||||
assignCallbacks[id] = assignCallbacks[id] + setMethod;
|
||||
}
|
||||
|
||||
public void AssignAll()
|
||||
{
|
||||
foreach ((string id, Action<IEntity>? action) in assignCallbacks)
|
||||
action?.Invoke(registeredEntities[id]);
|
||||
}
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
assignCallbacks.Clear();
|
||||
registeredEntities.Clear();
|
||||
}
|
||||
|
||||
public readonly record struct EntityRegisteredArguments(IEntity Entity);
|
||||
}
|
||||
39
Engine.Core/Serialization/IdentifiableRegistry.cs
Normal file
39
Engine.Core/Serialization/IdentifiableRegistry.cs
Normal file
@@ -0,0 +1,39 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Engine.Core.Serialization;
|
||||
|
||||
public class IdentifiableRegistry
|
||||
{
|
||||
public Event<IdentifiableRegistry, EntityRegisteredArguments> OnEntityRegistered = null!;
|
||||
|
||||
private readonly Dictionary<string, Action<IIdentifiable>?> assignCallbacks = [];
|
||||
private readonly Dictionary<string, IIdentifiable> registeredEntities = [];
|
||||
public IReadOnlyDictionary<string, IIdentifiable> RegisteredEntities => registeredEntities;
|
||||
|
||||
public void Add(IIdentifiable identifiable)
|
||||
{
|
||||
if (registeredEntities.TryAdd(identifiable.Id, identifiable))
|
||||
OnEntityRegistered?.Invoke(this, new(identifiable));
|
||||
}
|
||||
|
||||
public void QueueAssign(string id, Action<IIdentifiable> setMethod)
|
||||
{
|
||||
assignCallbacks.TryAdd(id, null);
|
||||
assignCallbacks[id] = assignCallbacks[id] + setMethod;
|
||||
}
|
||||
|
||||
public void AssignAll()
|
||||
{
|
||||
foreach ((string id, Action<IIdentifiable>? action) in assignCallbacks)
|
||||
action?.Invoke(registeredEntities[id]);
|
||||
}
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
assignCallbacks.Clear();
|
||||
registeredEntities.Clear();
|
||||
}
|
||||
|
||||
public readonly record struct EntityRegisteredArguments(IIdentifiable Entity);
|
||||
}
|
||||
@@ -43,8 +43,8 @@ public class SerializedClass
|
||||
continue;
|
||||
|
||||
object? value = privatePropertyInfo.GetValue(@class);
|
||||
if (value is IEntity entity)
|
||||
Private.Add(privatePropertyInfo.Name, entity.Id);
|
||||
if (value is IIdentifiable identifiable)
|
||||
Private.Add(privatePropertyInfo.Name, identifiable.Id);
|
||||
else
|
||||
Private.Add(privatePropertyInfo.Name, value);
|
||||
}
|
||||
@@ -61,8 +61,8 @@ public class SerializedClass
|
||||
continue;
|
||||
|
||||
object? value = publicPropertyInfo.GetValue(@class);
|
||||
if (value is IEntity entity)
|
||||
Public.Add(publicPropertyInfo.Name, entity.Id);
|
||||
if (value is IIdentifiable identifiable)
|
||||
Public.Add(publicPropertyInfo.Name, identifiable.Id);
|
||||
else
|
||||
Public.Add(publicPropertyInfo.Name, value);
|
||||
}
|
||||
@@ -76,8 +76,8 @@ public class SerializedClass
|
||||
continue;
|
||||
|
||||
object? value = privateFieldInfo.GetValue(@class);
|
||||
if (value is IEntity entity)
|
||||
Private.Add(privateFieldInfo.Name, entity.Id);
|
||||
if (value is IIdentifiable identifiable)
|
||||
Private.Add(privateFieldInfo.Name, identifiable.Id);
|
||||
else
|
||||
Private.Add(privateFieldInfo.Name, value);
|
||||
}
|
||||
@@ -91,8 +91,8 @@ public class SerializedClass
|
||||
continue;
|
||||
|
||||
object? value = publicFieldInfo.GetValue(@class);
|
||||
if (value is IEntity entity)
|
||||
Public.Add(publicFieldInfo.Name, entity.Id);
|
||||
if (value is IIdentifiable identifiable)
|
||||
Public.Add(publicFieldInfo.Name, identifiable.Id);
|
||||
else
|
||||
Public.Add(publicFieldInfo.Name, value);
|
||||
}
|
||||
@@ -112,36 +112,36 @@ public class SerializedClass
|
||||
return instance;
|
||||
}
|
||||
|
||||
public object CreateInstance(EntityRegistry? entityRegistry)
|
||||
public object CreateInstance(IdentifiableRegistry? identifiableRegistry)
|
||||
{
|
||||
if (entityRegistry is null)
|
||||
if (identifiableRegistry is null)
|
||||
return CreateInstance();
|
||||
|
||||
Type type = TypeFactory.GetType(Type);
|
||||
object instance = TypeFactory.Get(type);
|
||||
|
||||
foreach ((string key, object? value) in Private)
|
||||
AssignVariable(key, type, instance, value, PRIVATE_BINDING_FLAGS, entityRegistry);
|
||||
AssignVariable(key, type, instance, value, PRIVATE_BINDING_FLAGS, identifiableRegistry);
|
||||
|
||||
foreach ((string key, object? value) in Public)
|
||||
AssignVariable(key, type, instance, value, PUBLIC_BINDING_FLAGS, entityRegistry);
|
||||
AssignVariable(key, type, instance, value, PUBLIC_BINDING_FLAGS, identifiableRegistry);
|
||||
|
||||
return instance;
|
||||
}
|
||||
|
||||
private static void AssignVariable(string key, Type type, object instance, object? value, BindingFlags bindingFlags, EntityRegistry entityRegistry)
|
||||
private static void AssignVariable(string key, Type type, object instance, object? value, BindingFlags bindingFlags, IdentifiableRegistry identifiableRegistry)
|
||||
{
|
||||
if (type.GetField(key, bindingFlags) is FieldInfo fieldInfo)
|
||||
{
|
||||
if (typeof(IEntity).IsAssignableFrom(fieldInfo.FieldType))
|
||||
entityRegistry.QueueAssign(value?.ToString() ?? "", (entity) => fieldInfo.SetValue(instance, entity));
|
||||
if (typeof(IIdentifiable).IsAssignableFrom(fieldInfo.FieldType))
|
||||
identifiableRegistry.QueueAssign(value?.ToString() ?? "", (entity) => fieldInfo.SetValue(instance, entity));
|
||||
else
|
||||
fieldInfo.SetValue(instance, value);
|
||||
}
|
||||
else if (type.GetProperty(key, bindingFlags) is PropertyInfo propertyInfo)
|
||||
{
|
||||
if (typeof(IEntity).IsAssignableFrom(propertyInfo.PropertyType))
|
||||
entityRegistry.QueueAssign(value?.ToString() ?? "", (entity) => propertyInfo.SetValue(instance, entity));
|
||||
if (typeof(IIdentifiable).IsAssignableFrom(propertyInfo.PropertyType))
|
||||
identifiableRegistry.QueueAssign(value?.ToString() ?? "", (entity) => propertyInfo.SetValue(instance, entity));
|
||||
else
|
||||
propertyInfo.SetValue(instance, value);
|
||||
}
|
||||
|
||||
@@ -6,32 +6,29 @@ public class StateEnable : IStateEnable
|
||||
public Event<IHasEntity> OnEntityAssigned { get; } = new();
|
||||
public Event<IAssignable>? OnUnassigned { get; } = new();
|
||||
|
||||
private bool _enabled = true;
|
||||
private IEntity _entity = null!;
|
||||
|
||||
public IEntity Entity => _entity;
|
||||
public IEntity Entity { get; private set; } = null!;
|
||||
|
||||
public bool Enabled
|
||||
{
|
||||
get => _enabled;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (value == _enabled)
|
||||
if (value == field)
|
||||
return;
|
||||
|
||||
bool previousState = _enabled;
|
||||
_enabled = value;
|
||||
bool previousState = field;
|
||||
field = value;
|
||||
OnEnabledChanged?.Invoke(this, new(previousState));
|
||||
}
|
||||
}
|
||||
} = true;
|
||||
|
||||
protected virtual void OnAssign(IEntity entity) { }
|
||||
public bool Assign(IEntity entity)
|
||||
{
|
||||
if (_entity is not null && _entity.IsInitialized)
|
||||
if (Entity is not null && Entity.IsInitialized)
|
||||
return false;
|
||||
|
||||
_entity = entity;
|
||||
Entity = entity;
|
||||
OnAssign(entity);
|
||||
OnEntityAssigned?.Invoke(this);
|
||||
return true;
|
||||
@@ -39,10 +36,10 @@ public class StateEnable : IStateEnable
|
||||
|
||||
public bool Unassign()
|
||||
{
|
||||
if (_entity is null)
|
||||
if (Entity is null)
|
||||
return false;
|
||||
|
||||
_entity = null!;
|
||||
Entity = null!;
|
||||
OnUnassigned?.Invoke(this);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -11,64 +11,54 @@ public class UniverseEntranceManager : Internal.BehaviourIndependent
|
||||
private readonly ActiveBehaviourCollectorOrdered<int, IEnterUniverse> enterUniverses = new(GetPriority(), SortByAscendingPriority());
|
||||
private readonly ActiveBehaviourCollectorOrdered<int, IExitUniverse> exitUniverses = new(GetPriority(), SortByAscendingPriority());
|
||||
|
||||
private readonly List<IEnterUniverse> toCallEnterUniverses = new(32);
|
||||
private readonly List<IExitUniverse> toCallExitUniverses = new(32);
|
||||
private bool isInitialCollectionDone = false;
|
||||
private readonly FastListOrdered<int, IEnterUniverse> toCallEnterUniverses = new(GetPriority(), SortByAscendingPriority());
|
||||
|
||||
protected override void OnEnteredUniverse(IUniverse universe)
|
||||
{
|
||||
exitUniverses.Assign(universe);
|
||||
|
||||
// FIXME: the isInitialCollectionDone is for the sole reason of some behaviours
|
||||
// adding more behaviours during entrance calls and the internal workings of
|
||||
// behaviour collector not being able to tell which behaviour was already called
|
||||
// (because it just runs a for loop with the behaviour count, and priority ordering doesn't help as well)
|
||||
// so it sometimes double processes or misses behaviours. A more elegant way of
|
||||
// handling this would be nice but for now it works good enough.
|
||||
//
|
||||
// SIDE NOTE: This same issue has the potential to occur on exitUniverses as well, but I've yet to run
|
||||
// into an instance of it actually happening so... I'm not gonna touch it until the edge case happens.
|
||||
isInitialCollectionDone = false;
|
||||
enterUniverses.Assign(universe);
|
||||
isInitialCollectionDone = true;
|
||||
|
||||
foreach (IUniverseObject universeObject in universe.UniverseObjects)
|
||||
OnUniverseObjectRegistered(universe, new(universeObject));
|
||||
|
||||
universe.OnUniverseObjectRegistered.AddListener(OnUniverseObjectRegistered);
|
||||
universe.OnUniverseObjectUnRegistered.AddListener(OnUniverseObjectUnRegistered);
|
||||
for (int i = toCallEnterUniverses.Count - 1; i >= 0; i--)
|
||||
toCallEnterUniverses[i].EnterUniverse(universe);
|
||||
toCallEnterUniverses.Clear();
|
||||
}
|
||||
|
||||
protected override void OnExitedUniverse(IUniverse universe)
|
||||
{
|
||||
enterUniverses.Unassign();
|
||||
|
||||
foreach (IUniverseObject universeObject in universe.UniverseObjects)
|
||||
OnUniverseObjectUnRegistered(universe, new(universeObject));
|
||||
|
||||
universe.OnUniverseObjectRegistered.RemoveListener(OnUniverseObjectRegistered);
|
||||
universe.OnUniverseObjectUnRegistered.RemoveListener(OnUniverseObjectUnRegistered);
|
||||
}
|
||||
|
||||
private void OnUniverseObjectUnRegistered(IUniverse sender, IUniverse.UniverseObjectUnRegisteredArguments args)
|
||||
{
|
||||
for (int i = toCallExitUniverses.Count - 1; i >= 0; i--)
|
||||
{
|
||||
IExitUniverse exitUniverse = toCallExitUniverses[i];
|
||||
toCallExitUniverses.RemoveAt(i);
|
||||
exitUniverse.ExitUniverse(Universe);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnUniverseObjectRegistered(IUniverse sender, IUniverse.UniverseObjectRegisteredArguments args)
|
||||
{
|
||||
for (int i = toCallEnterUniverses.Count - 1; i >= 0; i--)
|
||||
{
|
||||
IEnterUniverse enterUniverse = toCallEnterUniverses[i];
|
||||
toCallEnterUniverses.RemoveAt(i);
|
||||
enterUniverse.EnterUniverse(Universe);
|
||||
}
|
||||
exitUniverses.Unassign();
|
||||
}
|
||||
|
||||
private void OnEnterUniverseCollected(IBehaviourCollector<IEnterUniverse> sender, IBehaviourCollector<IEnterUniverse>.BehaviourCollectedArguments args)
|
||||
{
|
||||
toCallEnterUniverses.Add(args.BehaviourCollected);
|
||||
if (!isInitialCollectionDone)
|
||||
{
|
||||
toCallEnterUniverses.Add(args.BehaviourCollected);
|
||||
return;
|
||||
}
|
||||
|
||||
args.BehaviourCollected.EnterUniverse(Universe);
|
||||
}
|
||||
|
||||
private void OnExitUniverseCollected(IBehaviourCollector<IExitUniverse> sender, IBehaviourCollector<IExitUniverse>.BehaviourCollectedArguments args)
|
||||
{
|
||||
toCallExitUniverses.Add(args.BehaviourCollected);
|
||||
}
|
||||
private void OnExitUniverseRemoved(IBehaviourCollector<IExitUniverse> sender, IBehaviourCollector<IExitUniverse>.BehaviourRemovedArguments args)
|
||||
=> args.BehaviourRemoved.ExitUniverse(Universe);
|
||||
|
||||
public UniverseEntranceManager()
|
||||
{
|
||||
enterUniverses.OnCollected.AddListener(OnEnterUniverseCollected);
|
||||
exitUniverses.OnCollected.AddListener(OnExitUniverseCollected);
|
||||
exitUniverses.OnRemoved.AddListener(OnExitUniverseRemoved);
|
||||
}
|
||||
}
|
||||
|
||||
10
Engine.Core/Systems/Yields/WaitForSecondsYield.cs
Normal file
10
Engine.Core/Systems/Yields/WaitForSecondsYield.cs
Normal file
@@ -0,0 +1,10 @@
|
||||
using System;
|
||||
|
||||
namespace Engine.Core;
|
||||
|
||||
public class WaitForSecondsYield(float seconds) : ICoroutineYield
|
||||
{
|
||||
private readonly DateTime triggerTime = DateTime.UtcNow.AddSeconds(seconds);
|
||||
|
||||
public bool Yield() => DateTime.UtcNow < triggerTime;
|
||||
}
|
||||
10
Engine.Core/Systems/Yields/WaitUntilYield.cs
Normal file
10
Engine.Core/Systems/Yields/WaitUntilYield.cs
Normal file
@@ -0,0 +1,10 @@
|
||||
using System;
|
||||
|
||||
namespace Engine.Core;
|
||||
|
||||
public class WaitUntilYield(Func<bool> condition) : ICoroutineYield
|
||||
{
|
||||
private readonly Func<bool> condition = condition;
|
||||
|
||||
public bool Yield() => !condition.Invoke();
|
||||
}
|
||||
@@ -2,7 +2,7 @@ using System;
|
||||
|
||||
namespace Engine.Core;
|
||||
|
||||
public class CoroutineYield(Func<bool> condition) : ICoroutineYield
|
||||
public class WaitWhileYield(Func<bool> condition) : ICoroutineYield
|
||||
{
|
||||
private readonly Func<bool> condition = condition;
|
||||
|
||||
@@ -23,7 +23,6 @@ public class Universe : BaseEntity, IUniverse
|
||||
private readonly Event<IUniverseObject, IUniverseObject.ExitedUniverseArguments>.EventHandler delegateOnUniverseObjectExitedUniverse = null!;
|
||||
|
||||
private readonly FastList<IUniverseObject> _universeObjects = new(Constants.UNIVERSE_OBJECTS_SIZE_INITIAL);
|
||||
private float _timeScale = 1f;
|
||||
|
||||
public Universe()
|
||||
{
|
||||
@@ -31,24 +30,24 @@ public class Universe : BaseEntity, IUniverse
|
||||
delegateOnUniverseObjectExitedUniverse = OnUniverseObjectExitedUniverse;
|
||||
}
|
||||
|
||||
public IReadOnlyList<IUniverseObject> UniverseObjects => _universeObjects;
|
||||
public IUniverseObject Root { get; private set; } = Factory.UniverseObjectFactory.Instantiate().SetUniverseObject("Root");
|
||||
|
||||
public UniverseTime Time { get; private set; } = new();
|
||||
public UniverseTime UnscaledTime { get; private set; } = new();
|
||||
public float TimeScale
|
||||
{
|
||||
get => _timeScale;
|
||||
get;
|
||||
set
|
||||
{
|
||||
value = value.Max(0f);
|
||||
if (value == _timeScale)
|
||||
if (value == field)
|
||||
return;
|
||||
|
||||
float previousTimeScale = _timeScale;
|
||||
_timeScale = value;
|
||||
float previousTimeScale = field;
|
||||
field = value;
|
||||
OnTimeScaleChanged?.Invoke(this, new(previousTimeScale));
|
||||
}
|
||||
}
|
||||
} = 1f;
|
||||
|
||||
public void Register(IUniverseObject universeObject)
|
||||
{
|
||||
@@ -63,14 +62,17 @@ public class Universe : BaseEntity, IUniverse
|
||||
if (!universeObject.Initialize())
|
||||
throw new Exception($"{universeObject.Name} can't be initialized");
|
||||
|
||||
for (int i = 0; i < universeObject.Children.Count; i++)
|
||||
Register(universeObject.Children[i]);
|
||||
if (universeObject.Parent == null)
|
||||
universeObject.Parent = Root;
|
||||
|
||||
_universeObjects.Add(universeObject);
|
||||
|
||||
if (!universeObject.EnterUniverse(this))
|
||||
throw new Exception($"{universeObject.Name} can't enter the universe");
|
||||
|
||||
for (int i = 0; i < universeObject.Children.Count; i++)
|
||||
Register(universeObject.Children[i]);
|
||||
|
||||
OnUniverseObjectRegistered?.Invoke(this, new(universeObject));
|
||||
}
|
||||
|
||||
@@ -113,15 +115,15 @@ public class Universe : BaseEntity, IUniverse
|
||||
|
||||
protected override void InitializeInternal()
|
||||
{
|
||||
foreach (IUniverseObject universeObject in UniverseObjects)
|
||||
foreach (IUniverseObject universeObject in _universeObjects)
|
||||
universeObject.Initialize();
|
||||
}
|
||||
|
||||
protected override void FinalizeInternal()
|
||||
{
|
||||
base.FinalizeInternal();
|
||||
for (int i = UniverseObjects.Count - 1; i >= 0; i--)
|
||||
Remove(UniverseObjects[i]);
|
||||
for (int i = _universeObjects.Count - 1; i >= 0; i--)
|
||||
Remove(_universeObjects[i]);
|
||||
}
|
||||
|
||||
public void Update(UniverseTime engineTime)
|
||||
@@ -158,6 +160,6 @@ public class Universe : BaseEntity, IUniverse
|
||||
Remove(universeObject);
|
||||
}
|
||||
|
||||
public IEnumerator<IUniverseObject> GetEnumerator() => _universeObjects.GetEnumerator();
|
||||
IEnumerator IEnumerable.GetEnumerator() => _universeObjects.GetEnumerator();
|
||||
public IEnumerator<IUniverseObject> GetEnumerator() => Root.TraverseChildren();
|
||||
IEnumerator IEnumerable.GetEnumerator() => Root.TraverseChildren();
|
||||
}
|
||||
|
||||
@@ -15,41 +15,37 @@ public class UniverseObject : BaseEntity, IUniverseObject
|
||||
public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; } = new();
|
||||
public Event<IHasBehaviourController> OnBehaviourControllerAssigned { get; } = new();
|
||||
|
||||
private string _name = nameof(UniverseObject);
|
||||
private IUniverse _universe = null!;
|
||||
private IBehaviourController _behaviourController = null!;
|
||||
private bool _isActive = false;
|
||||
private readonly FastList<IUniverseObject> _children = [];
|
||||
private IUniverseObject? _parent = null;
|
||||
|
||||
public IBehaviourController BehaviourController { get; private set; } = null!;
|
||||
public IUniverse Universe { get; private set; } = null!;
|
||||
public bool IsActive { get; private set; } = false;
|
||||
|
||||
public IReadOnlyList<IUniverseObject> Children => _children;
|
||||
public IBehaviourController BehaviourController => _behaviourController;
|
||||
public IUniverse Universe => _universe;
|
||||
public bool IsInUniverse => _universe is not null;
|
||||
public bool IsActive => _isActive;
|
||||
public bool IsInUniverse => Universe is not null;
|
||||
|
||||
public string Name
|
||||
{
|
||||
get => _name;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (value == _name) return;
|
||||
if (value == field) return;
|
||||
|
||||
string previousName = _name;
|
||||
_name = value;
|
||||
string previousName = field;
|
||||
field = value;
|
||||
OnNameChanged?.Invoke(this, new(previousName));
|
||||
}
|
||||
}
|
||||
} = nameof(UniverseObject);
|
||||
|
||||
public IUniverseObject? Parent
|
||||
{
|
||||
get => _parent;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (value == this)
|
||||
throw new Exceptions.AssignFailedException($"{Name} can not parent itself");
|
||||
|
||||
if (_parent == value)
|
||||
if (field == value)
|
||||
return;
|
||||
|
||||
IUniverseObject? previousParent = Parent;
|
||||
@@ -59,7 +55,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
|
||||
previousParent.OnActiveChanged.RemoveListener(OnParentActiveChanged);
|
||||
}
|
||||
|
||||
_parent = value;
|
||||
field = value;
|
||||
|
||||
if (value is not null)
|
||||
{
|
||||
@@ -73,7 +69,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
|
||||
UpdateActive();
|
||||
OnParentChanged?.Invoke(this, new(previousParent, value));
|
||||
}
|
||||
}
|
||||
} = null;
|
||||
|
||||
protected virtual void OnEnteringUniverse(IUniverse universe) { }
|
||||
bool IUniverseObject.EnterUniverse(IUniverse universe)
|
||||
@@ -81,7 +77,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
|
||||
if (IsInUniverse)
|
||||
return false;
|
||||
|
||||
_universe = universe;
|
||||
Universe = universe;
|
||||
UpdateActive();
|
||||
OnEnteringUniverse(universe);
|
||||
OnEnteredUniverse?.Invoke(this, new(universe));
|
||||
@@ -91,11 +87,11 @@ public class UniverseObject : BaseEntity, IUniverseObject
|
||||
protected virtual void OnExitingUniverse(IUniverse universe) { }
|
||||
bool IUniverseObject.ExitUniverse()
|
||||
{
|
||||
if (!IsInUniverse || _universe is not IUniverse universe)
|
||||
if (!IsInUniverse || Universe is not IUniverse universe)
|
||||
return false;
|
||||
|
||||
OnExitingUniverse(universe);
|
||||
_universe = null!;
|
||||
Universe = null!;
|
||||
OnExitedUniverse?.Invoke(this, new(universe));
|
||||
return true;
|
||||
}
|
||||
@@ -125,7 +121,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
|
||||
if (IsInitialized)
|
||||
return false;
|
||||
|
||||
_behaviourController = behaviourController;
|
||||
BehaviourController = behaviourController;
|
||||
OnAssign(behaviourController);
|
||||
OnBehaviourControllerAssigned?.Invoke(this);
|
||||
return true;
|
||||
@@ -145,7 +141,7 @@ public class UniverseObject : BaseEntity, IUniverseObject
|
||||
private void UpdateActive()
|
||||
{
|
||||
bool previousActive = IsActive;
|
||||
_isActive = StateEnable.Enabled && (Parent?.IsActive ?? true);
|
||||
IsActive = StateEnable.Enabled && (Parent?.IsActive ?? true);
|
||||
|
||||
if (previousActive != IsActive)
|
||||
OnActiveChanged?.Invoke(this, new(previousActive));
|
||||
@@ -160,12 +156,12 @@ public class UniverseObject : BaseEntity, IUniverseObject
|
||||
protected override void InitializeInternal()
|
||||
{
|
||||
base.InitializeInternal();
|
||||
_behaviourController ??= Factory.BehaviourControllerFactory.Instantiate(this);
|
||||
_behaviourController.Initialize();
|
||||
BehaviourController ??= Factory.BehaviourControllerFactory.Instantiate(this);
|
||||
BehaviourController.Initialize();
|
||||
}
|
||||
|
||||
public UniverseObject()
|
||||
{
|
||||
_name = GetType().Name;
|
||||
Name = GetType().Name;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>Engine.Systems.Network</RootNamespace>
|
||||
|
||||
@@ -11,6 +11,7 @@ namespace Engine.Systems.Network;
|
||||
public class LiteNetLibClient : LiteNetLibCommunicatorBase, INetworkCommunicatorClient
|
||||
{
|
||||
private readonly NetDataWriter netDataWriter = new();
|
||||
private readonly NetDataWriter netDataWriterEncrypted = new();
|
||||
|
||||
private CancellationTokenSource? cancellationTokenSource = null;
|
||||
|
||||
@@ -42,7 +43,20 @@ public class LiteNetLibClient : LiteNetLibCommunicatorBase, INetworkCommunicator
|
||||
public INetworkCommunicatorClient SendToServer<T>(T packet, PacketDelivery packetDelivery) where T : class, new()
|
||||
{
|
||||
netDataWriter.Reset();
|
||||
netPacketProcessor.Write(netDataWriter, packet);
|
||||
netDataWriterEncrypted.Reset();
|
||||
|
||||
if (packet is INetworkPacketEncrypted)
|
||||
{
|
||||
netPacketProcessor.Write(netDataWriterEncrypted, packet);
|
||||
byte[] encryptedData = cryptor.Encrypt(netDataWriterEncrypted.CopyData());
|
||||
netDataWriter.Put(true);
|
||||
netDataWriter.PutBytesWithLength(encryptedData);
|
||||
}
|
||||
else
|
||||
{
|
||||
netDataWriter.Put(false);
|
||||
netPacketProcessor.Write(netDataWriter, packet);
|
||||
}
|
||||
|
||||
switch (packetDelivery)
|
||||
{
|
||||
@@ -78,8 +92,9 @@ public class LiteNetLibClient : LiteNetLibCommunicatorBase, INetworkCommunicator
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
Manager.PollEvents();
|
||||
Thread.Sleep(1);
|
||||
try { Manager.PollEvents(); }
|
||||
catch (Exception e) { logger?.LogException(this, e, force: true); }
|
||||
}
|
||||
}, cancellationToken);
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ namespace Engine.Systems.Network;
|
||||
public abstract class LiteNetLibCommunicatorBase : Behaviour, IEnterUniverse, IExitUniverse, INetworkCommunicator
|
||||
{
|
||||
protected readonly NetPacketProcessor netPacketProcessor = new();
|
||||
protected readonly PacketCryptor cryptor = new("At4ywW9PGoWH3g==", "NmpMFTvd3pvUbA=="); // TODO implement public key exchange
|
||||
|
||||
private readonly Dictionary<Type, Event<IConnection, object>> listeners = [];
|
||||
private readonly Dictionary<string, IConnection> _connections = [];
|
||||
@@ -54,7 +55,20 @@ public abstract class LiteNetLibCommunicatorBase : Behaviour, IEnterUniverse, IE
|
||||
|
||||
private void NetworkReceiveEvent(NetPeer peer, NetPacketReader reader, byte channel, DeliveryMethod deliveryMethod)
|
||||
{
|
||||
try { netPacketProcessor.ReadAllPackets(reader, peer); }
|
||||
try
|
||||
{
|
||||
bool isEncrypted = reader.GetBool();
|
||||
if (isEncrypted) // TODO performance improvements
|
||||
{
|
||||
byte[] encryptedData = reader.GetBytesWithLength();
|
||||
byte[] decryptedData = cryptor.Decrypt(encryptedData);
|
||||
NetDataReader innerReader = new(decryptedData);
|
||||
netPacketProcessor.ReadAllPackets(innerReader, peer);
|
||||
return;
|
||||
}
|
||||
|
||||
netPacketProcessor.ReadAllPackets(reader, peer);
|
||||
}
|
||||
catch (Exception exception) { logger?.LogException(this, exception, force: true); }
|
||||
}
|
||||
|
||||
@@ -164,6 +178,7 @@ public abstract class LiteNetLibCommunicatorBase : Behaviour, IEnterUniverse, IE
|
||||
netPacketProcessor.RegisterNestedType(Vector3DNetPacker.Write, Vector3DNetPacker.Read);
|
||||
netPacketProcessor.RegisterNestedType(Vector3DIntNetPacker.Write, Vector3DIntNetPacker.Read);
|
||||
netPacketProcessor.RegisterNestedType(Vector4DNetPacker.Write, Vector4DNetPacker.Read);
|
||||
netPacketProcessor.RegisterNestedType(Matrix4x4NetPacker.Write, Matrix4x4NetPacker.Read);
|
||||
}
|
||||
|
||||
public INetworkCommunicator SubscribeToPackets<T>(Event<IConnection, T>.EventHandler callback)
|
||||
|
||||
@@ -6,13 +6,14 @@ using Engine.Core.Debug;
|
||||
|
||||
namespace Engine.Systems.Network;
|
||||
|
||||
public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicatorServer
|
||||
public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicatorServer, IPostUpdate
|
||||
{
|
||||
public string Password { get; private set; } = string.Empty;
|
||||
public int MaxConnectionCount { get; private set; } = 2;
|
||||
public int Port { get; private set; } = 8888;
|
||||
|
||||
private readonly NetDataWriter netDataWriter = new();
|
||||
private readonly NetDataWriter netDataWriterEncrypted = new();
|
||||
|
||||
public LiteNetLibServer() : this(8888, 2) { }
|
||||
public LiteNetLibServer(int port, int maxConnectionCount) : base()
|
||||
@@ -52,12 +53,11 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
|
||||
|
||||
public INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery) where T : class, new()
|
||||
{
|
||||
netDataWriter.Reset();
|
||||
netPacketProcessor.Write(netDataWriter, packet);
|
||||
|
||||
if (Manager.ConnectedPeerList.FirstOrDefault(p => p.Id.CompareTo(connection.Id) == 0) is not NetPeer netPeer)
|
||||
if (Manager.ConnectedPeerList.FirstOrDefault(p => p.Id.ToString().CompareTo(connection.Id) == 0) is not NetPeer netPeer)
|
||||
throw new($"Peer {connection} couldn't be found.");
|
||||
|
||||
WritePacket(packet);
|
||||
|
||||
switch (packetDelivery)
|
||||
{
|
||||
case PacketDelivery.ReliableInOrder: netPeer.Send(netDataWriter, DeliveryMethod.ReliableOrdered); break;
|
||||
@@ -72,8 +72,7 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
|
||||
|
||||
public INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery) where T : class, new()
|
||||
{
|
||||
netDataWriter.Reset();
|
||||
netPacketProcessor.Write(netDataWriter, packet);
|
||||
WritePacket(packet);
|
||||
|
||||
switch (packetDelivery)
|
||||
{
|
||||
@@ -86,17 +85,27 @@ public class LiteNetLibServer : LiteNetLibCommunicatorBase, INetworkCommunicator
|
||||
return this;
|
||||
}
|
||||
|
||||
private void PollEvents(IUniverse sender, IUniverse.UpdateArguments args) => Manager.PollEvents();
|
||||
|
||||
public override void EnterUniverse(IUniverse universe)
|
||||
private void WritePacket<T>(T packet) where T : class, new()
|
||||
{
|
||||
base.EnterUniverse(universe);
|
||||
universe.OnPostUpdate.AddListener(PollEvents);
|
||||
netDataWriter.Reset();
|
||||
netDataWriterEncrypted.Reset();
|
||||
|
||||
if (packet is INetworkPacketEncrypted)
|
||||
{
|
||||
netPacketProcessor.Write(netDataWriterEncrypted, packet);
|
||||
byte[] encryptedData = cryptor.Encrypt(netDataWriterEncrypted.CopyData());
|
||||
netDataWriter.Put(true);
|
||||
netDataWriter.PutBytesWithLength(encryptedData);
|
||||
}
|
||||
else
|
||||
{
|
||||
netDataWriter.Put(false);
|
||||
netPacketProcessor.Write(netDataWriter, packet);
|
||||
}
|
||||
}
|
||||
|
||||
public override void ExitUniverse(IUniverse universe)
|
||||
public void PostUpdate()
|
||||
{
|
||||
base.ExitUniverse(universe);
|
||||
universe.OnPostUpdate.RemoveListener(PollEvents);
|
||||
Manager.PollEvents();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
using LiteNetLib.Utils;
|
||||
|
||||
using Engine.Core;
|
||||
|
||||
namespace Engine.Systems.Network.Packers;
|
||||
|
||||
internal static class Matrix4x4NetPacker
|
||||
{
|
||||
internal static void Write(NetDataWriter writer, Matrix4x4 data)
|
||||
{
|
||||
writer.Put(data.M11);
|
||||
writer.Put(data.M12);
|
||||
writer.Put(data.M13);
|
||||
writer.Put(data.M14);
|
||||
|
||||
writer.Put(data.M21);
|
||||
writer.Put(data.M22);
|
||||
writer.Put(data.M23);
|
||||
writer.Put(data.M24);
|
||||
|
||||
writer.Put(data.M31);
|
||||
writer.Put(data.M32);
|
||||
writer.Put(data.M33);
|
||||
writer.Put(data.M34);
|
||||
|
||||
writer.Put(data.M41);
|
||||
writer.Put(data.M42);
|
||||
writer.Put(data.M43);
|
||||
writer.Put(data.M44);
|
||||
}
|
||||
|
||||
internal static Matrix4x4 Read(NetDataReader reader)
|
||||
{
|
||||
float m11 = reader.GetFloat();
|
||||
float m12 = reader.GetFloat();
|
||||
float m13 = reader.GetFloat();
|
||||
float m14 = reader.GetFloat();
|
||||
|
||||
float m21 = reader.GetFloat();
|
||||
float m22 = reader.GetFloat();
|
||||
float m23 = reader.GetFloat();
|
||||
float m24 = reader.GetFloat();
|
||||
|
||||
float m31 = reader.GetFloat();
|
||||
float m32 = reader.GetFloat();
|
||||
float m33 = reader.GetFloat();
|
||||
float m34 = reader.GetFloat();
|
||||
|
||||
float m41 = reader.GetFloat();
|
||||
float m42 = reader.GetFloat();
|
||||
float m43 = reader.GetFloat();
|
||||
float m44 = reader.GetFloat();
|
||||
|
||||
return new Matrix4x4(
|
||||
m11, m12, m13, m14,
|
||||
m21, m22, m23, m24,
|
||||
m31, m32, m33, m34,
|
||||
m41, m42, m43, m44
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
|
||||
namespace Engine.Systems.Network;
|
||||
|
||||
public class PacketCryptor // TODO performance improvements
|
||||
{
|
||||
private readonly Aes aes = null!;
|
||||
|
||||
private readonly ICryptoTransform encrpytor = null!;
|
||||
private readonly ICryptoTransform decryptor = null!;
|
||||
|
||||
public byte[] Encrypt(byte[] data) => encrpytor.TransformFinalBlock(data, 0, data.Length);
|
||||
public byte[] Decrypt(byte[] data) => decryptor.TransformFinalBlock(data, 0, data.Length);
|
||||
|
||||
public PacketCryptor(string key, string initializationVector)
|
||||
{
|
||||
aes = Aes.Create();
|
||||
|
||||
aes.Key = Encoding.UTF8.GetBytes(key);
|
||||
aes.IV = Encoding.UTF8.GetBytes(initializationVector);
|
||||
|
||||
encrpytor = aes.CreateEncryptor();
|
||||
decryptor = aes.CreateDecryptor();
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
using Microsoft.Xna.Framework;
|
||||
|
||||
using Engine.Core;
|
||||
|
||||
namespace Engine.Integration.MonoGame;
|
||||
|
||||
public interface ITriangleBatch
|
||||
{
|
||||
void Begin(Matrix? view = null, Matrix? projection = null);
|
||||
void Draw(Triangle triangle, ColorRGBA colorRGBA);
|
||||
void End();
|
||||
}
|
||||
@@ -5,101 +5,118 @@ using Engine.Core;
|
||||
|
||||
namespace Engine.Integration.MonoGame;
|
||||
|
||||
public class MonoGameCamera2D : Behaviour, ICamera2D, IFirstFrameUpdate, IPreDraw
|
||||
public class MonoGameCamera2D : Behaviour, ICamera2D, IFirstFrameUpdate, ILastFrameUpdate, IPreDraw
|
||||
{
|
||||
public Event<MonoGameCamera2D> OnMatrixTransformChanged { get; } = new();
|
||||
public Event<MonoGameCamera2D> OnViewMatrixChanged { get; } = new();
|
||||
public Event<MonoGameCamera2D> OnProjectionMatrixChanged { get; } = new();
|
||||
public Event<MonoGameCamera2D> OnViewportChanged { get; } = new();
|
||||
public Event<MonoGameCamera2D> OnZoomChanged { get; } = new();
|
||||
|
||||
private Matrix _matrixTransform = Matrix.Identity;
|
||||
|
||||
private Viewport _viewport = default;
|
||||
private float _zoom = 1f;
|
||||
|
||||
public GraphicsDeviceManager Graphics { get; private set; } = null!;
|
||||
public ITransform2D Transform { get; private set; } = null!;
|
||||
|
||||
public Matrix MatrixTransform
|
||||
public Matrix4x4 ProjectionMatrix
|
||||
{
|
||||
get => _matrixTransform;
|
||||
set
|
||||
get;
|
||||
private set
|
||||
{
|
||||
if (_matrixTransform == value)
|
||||
if (field == value)
|
||||
return;
|
||||
|
||||
_matrixTransform = value;
|
||||
OnMatrixTransformChanged.Invoke(this);
|
||||
field = value;
|
||||
OnProjectionMatrixChanged.Invoke(this);
|
||||
}
|
||||
}
|
||||
} = Matrix4x4.Identity;
|
||||
|
||||
public Vector2D Position
|
||||
public Matrix4x4 ViewMatrix
|
||||
{
|
||||
get => Transform.Position;
|
||||
set => Transform.Position = value;
|
||||
}
|
||||
get;
|
||||
private set
|
||||
{
|
||||
if (field == value)
|
||||
return;
|
||||
|
||||
field = value;
|
||||
OnViewMatrixChanged.Invoke(this);
|
||||
}
|
||||
} = Matrix4x4.Identity;
|
||||
|
||||
public Viewport Viewport
|
||||
{
|
||||
get => _viewport;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (_viewport.Equals(value))
|
||||
if (field.Equals(value))
|
||||
return;
|
||||
|
||||
_viewport = value;
|
||||
field = value;
|
||||
OnViewportChanged.Invoke(this);
|
||||
}
|
||||
}
|
||||
} = default;
|
||||
|
||||
public float Zoom
|
||||
{
|
||||
get => _zoom;
|
||||
get;
|
||||
set
|
||||
{
|
||||
float newValue = Engine.Core.Math.Max(0.1f, value);
|
||||
float newValue = Math.Max(0.1f, value);
|
||||
|
||||
if (_zoom == newValue)
|
||||
if (field == newValue)
|
||||
return;
|
||||
|
||||
_zoom = newValue;
|
||||
field = newValue;
|
||||
OnZoomChanged.Invoke(this);
|
||||
}
|
||||
}
|
||||
|
||||
public float Rotation
|
||||
{
|
||||
get => Transform.Rotation;
|
||||
set => Transform.Rotation = value;
|
||||
}
|
||||
} = 1f;
|
||||
|
||||
// TODO This causes delay since OnPreDraw calls assuming this is called in in Update
|
||||
public Vector2D ScreenToWorldPosition(Vector2D screenPosition)
|
||||
{
|
||||
Vector2D worldPosition = Vector2.Transform(screenPosition.ToVector2(), Matrix.Invert(MatrixTransform)).ToVector2D();
|
||||
return worldPosition.Scale(EngineConverterExtensions.screenScale);
|
||||
}
|
||||
public Vector2D WorldToScreenPosition(Vector2D worldPosition)
|
||||
{
|
||||
Vector2D screenPosition = Vector2.Transform(worldPosition.ToVector2(), MatrixTransform).ToVector2D();
|
||||
return screenPosition.Scale(EngineConverterExtensions.screenScale);
|
||||
float x = 2f * screenPosition.X / Viewport.Width - 1f;
|
||||
float y = 1f - 2f * screenPosition.Y / Viewport.Height;
|
||||
Vector4D normalizedCoordinates = new(x, y, 0f, 1f);
|
||||
|
||||
Matrix4x4 invertedViewProjectionMatrix = (ProjectionMatrix * ViewMatrix).Inverse;
|
||||
|
||||
Vector4D worldPosition = invertedViewProjectionMatrix * normalizedCoordinates;
|
||||
|
||||
if (worldPosition.W != 0f)
|
||||
worldPosition /= worldPosition.W;
|
||||
|
||||
return new(worldPosition.X, worldPosition.Y);
|
||||
}
|
||||
|
||||
public Vector2D WorldToScreenPosition(Vector2D worldPosition)
|
||||
{
|
||||
Vector4D worldPosition4D = new(worldPosition.X, worldPosition.Y, 0f, 1f);
|
||||
|
||||
Matrix4x4 viewProjection = ProjectionMatrix * ViewMatrix;
|
||||
Vector4D clip = viewProjection * worldPosition4D;
|
||||
|
||||
if (clip.W != 0f)
|
||||
clip /= clip.W;
|
||||
|
||||
float screenX = (clip.X + 1f) * .5f * Viewport.Width;
|
||||
float screenY = (1f - clip.Y) * .5f * Viewport.Height;
|
||||
|
||||
return new(screenX, screenY);
|
||||
}
|
||||
|
||||
public void LastActiveFrame() => Transform = null!;
|
||||
public void FirstActiveFrame()
|
||||
{
|
||||
Graphics = BehaviourController.UniverseObject.Universe.FindRequiredBehaviour<MonoGameWindowContainer>().Window.Graphics;
|
||||
Viewport = Graphics.GraphicsDevice.Viewport;
|
||||
Transform = BehaviourController.GetRequiredBehaviour<ITransform2D>();
|
||||
}
|
||||
|
||||
public void PreDraw()
|
||||
{
|
||||
MatrixTransform =
|
||||
Matrix.CreateTranslation(new Vector3(-Position.X, Position.Y, 0f)) *
|
||||
Matrix.CreateRotationZ(Rotation * Engine.Core.Math.DegreeToRadian) *
|
||||
Matrix.CreateScale(Transform.Scale.X.Max(Transform.Scale.Y)) *
|
||||
Matrix.CreateScale(Zoom) *
|
||||
Matrix.CreateTranslation(new Vector3(_viewport.Width * .5f, _viewport.Height * .5f, 0f));
|
||||
ProjectionMatrix = Matrix4x4.CreateOrthographicViewCentered(Viewport.Width, Viewport.Height);
|
||||
ViewMatrix = Matrix4x4.Identity
|
||||
.ApplyScale(Transform.Scale.X.Max(Transform.Scale.Y))
|
||||
.ApplyScale(Zoom)
|
||||
.ApplyRotationZ(-Transform.Rotation * Math.DegreeToRadian)
|
||||
.ApplyTranslation(new Vector3D(-Transform.Position.X, -Transform.Position.Y, 0f));
|
||||
}
|
||||
|
||||
protected sealed override void InitializeInternal() => Transform = BehaviourController.GetRequiredBehaviour<ITransform2D>();
|
||||
protected sealed override void FinalizeInternal() => Transform = null!;
|
||||
}
|
||||
|
||||
@@ -5,127 +5,179 @@ using Engine.Core;
|
||||
|
||||
namespace Engine.Integration.MonoGame;
|
||||
|
||||
public class MonoGameCamera3D : Behaviour, ICamera3D, IFirstFrameUpdate, IPreDraw
|
||||
public class MonoGameCamera3D : Behaviour, ICamera3D, IFirstFrameUpdate, ILastFrameUpdate, IPreDraw
|
||||
{
|
||||
public Event<MonoGameCamera3D, ViewChangedArguments> OnViewChanged { get; } = new();
|
||||
public Event<MonoGameCamera3D, ProjectionChangedArguments> OnProjectionChanged { get; } = new();
|
||||
public Event<MonoGameCamera3D, ViewportChangedArguments> OnViewportChanged { get; } = new();
|
||||
public Event<MonoGameCamera3D, FieldOfViewChangedArguments> OnFieldOfViewChanged { get; } = new();
|
||||
|
||||
private Matrix _view = Matrix.Identity;
|
||||
private Matrix _projection = Matrix.Identity;
|
||||
private Viewport _viewport = default;
|
||||
private float _fieldOfView = 1f;
|
||||
public Event<ICamera3D, ICamera3D.NearPlaneChangedArguments> OnNearPlaneChanged { get; } = new();
|
||||
public Event<ICamera3D, ICamera3D.FarPlaneChangedArguments> OnFarPlaneChanged { get; } = new();
|
||||
public Event<ICamera3D, ICamera3D.FieldOfViewChangedArguments> OnFieldOfViewChanged { get; } = new();
|
||||
|
||||
private float fieldOfView = Math.DegreeToRadian * 70f;
|
||||
private bool isRecalculationNeeded = true;
|
||||
|
||||
public GraphicsDeviceManager Graphics { get; private set; } = null!;
|
||||
public ITransform3D Transform { get; private set; } = null!;
|
||||
|
||||
public Matrix View
|
||||
public Matrix4x4 ViewMatrix
|
||||
{
|
||||
get => _view;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (_view == value)
|
||||
if (field == value)
|
||||
return;
|
||||
|
||||
Matrix previousView = _view;
|
||||
_view = value;
|
||||
Matrix4x4 previousView = field;
|
||||
field = value;
|
||||
OnViewChanged.Invoke(this, new(previousView));
|
||||
}
|
||||
}
|
||||
public Matrix Projection
|
||||
} = Matrix4x4.Identity;
|
||||
|
||||
public Matrix4x4 ProjectionMatrix
|
||||
{
|
||||
get => _projection;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (_projection == value)
|
||||
if (field == value)
|
||||
return;
|
||||
|
||||
Matrix previousProjection = _projection;
|
||||
_projection = value;
|
||||
Matrix4x4 previousProjection = field;
|
||||
field = value;
|
||||
OnProjectionChanged.Invoke(this, new(previousProjection));
|
||||
}
|
||||
}
|
||||
|
||||
public Vector3D Position
|
||||
{
|
||||
get => Transform.Position;
|
||||
set => Transform.Position = value;
|
||||
}
|
||||
} = Matrix4x4.Identity;
|
||||
|
||||
public Viewport Viewport
|
||||
{
|
||||
get => _viewport;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (_viewport.Equals(value))
|
||||
if (field.Equals(value))
|
||||
return;
|
||||
|
||||
Viewport previousViewport = _viewport;
|
||||
_viewport = value;
|
||||
Viewport previousViewport = field;
|
||||
field = value;
|
||||
SetForRecalculation();
|
||||
OnViewportChanged.Invoke(this, new(previousViewport));
|
||||
}
|
||||
}
|
||||
|
||||
public float FieldOfView
|
||||
public float NearPlane
|
||||
{
|
||||
get => _fieldOfView;
|
||||
get;
|
||||
set
|
||||
{
|
||||
float newValue = Math.Max(0.1f, value);
|
||||
float previousNearPlane = field;
|
||||
field = value.Max(0.0001f);
|
||||
SetForRecalculation();
|
||||
OnNearPlaneChanged.Invoke(this, new(previousNearPlane));
|
||||
}
|
||||
} = 0.01f;
|
||||
|
||||
if (_fieldOfView == newValue)
|
||||
public float FarPlane
|
||||
{
|
||||
get;
|
||||
set
|
||||
{
|
||||
float previousFarPlane = field;
|
||||
field = value.Max(NearPlane);
|
||||
SetForRecalculation();
|
||||
OnFarPlaneChanged.Invoke(this, new(previousFarPlane));
|
||||
}
|
||||
} = 100f;
|
||||
|
||||
public float FieldOfView
|
||||
{
|
||||
get => fieldOfView * Math.RadianToDegree;
|
||||
set
|
||||
{
|
||||
value = value.Max(0.1f) * Math.DegreeToRadian;
|
||||
|
||||
if (fieldOfView == value)
|
||||
return;
|
||||
|
||||
float previousFieldOfView = _fieldOfView;
|
||||
_fieldOfView = newValue;
|
||||
float previousFieldOfView = fieldOfView;
|
||||
fieldOfView = value;
|
||||
SetForRecalculation();
|
||||
OnFieldOfViewChanged.Invoke(this, new(previousFieldOfView));
|
||||
}
|
||||
}
|
||||
|
||||
public Engine.Core.Quaternion Rotation
|
||||
{
|
||||
get => Transform.Rotation;
|
||||
set => Transform.Rotation = value;
|
||||
}
|
||||
|
||||
// TODO This causes delay since OnPreDraw calls assuming this is called in in Update
|
||||
public Ray3D ScreenToWorldRay(Vector2D screenPosition)
|
||||
{
|
||||
Vector3 nearPoint = new(screenPosition.X, screenPosition.Y, 0f);
|
||||
Vector3 farPoint = new(screenPosition.X, screenPosition.Y, 1f);
|
||||
|
||||
Vector3 worldNear = Viewport.Unproject(nearPoint, _projection, _view, Matrix.Identity);
|
||||
Vector3 worldFar = Viewport.Unproject(farPoint, _projection, _view, Matrix.Identity);
|
||||
Matrix projection = ProjectionMatrix.ToXnaMatrix();
|
||||
Matrix view = ViewMatrix.ToXnaMatrix();
|
||||
|
||||
Vector3 worldNear = Viewport.Unproject(nearPoint, projection, view, Matrix.Identity);
|
||||
Vector3 worldFar = Viewport.Unproject(farPoint, projection, view, Matrix.Identity);
|
||||
|
||||
Vector3 direction = Vector3.Normalize(worldFar - worldNear);
|
||||
return new(worldNear.ToVector3D(), direction.ToVector3D());
|
||||
}
|
||||
|
||||
public Vector2D WorldToScreenPosition(Vector3D worldPosition) => Viewport.Project(worldPosition.ToVector3(), _projection, _view, Matrix.Identity).ToVector3D();
|
||||
public Vector2D WorldToScreenPosition(Vector3D worldPosition) => Viewport.Project(worldPosition.ToVector3(), ProjectionMatrix.ToXnaMatrix(), ViewMatrix.ToXnaMatrix(), Matrix.Identity).ToVector3D();
|
||||
|
||||
public void LastActiveFrame() => Transform.OnTransformUpdated.RemoveListener(SetDirtyOnTransformUpdate);
|
||||
public void FirstActiveFrame()
|
||||
{
|
||||
Transform = BehaviourController.GetRequiredBehaviour<ITransform3D>();
|
||||
Graphics = BehaviourController.UniverseObject.Universe.FindRequiredBehaviour<MonoGameWindowContainer>().Window.Graphics;
|
||||
Viewport = Graphics.GraphicsDevice.Viewport;
|
||||
|
||||
Transform.OnTransformUpdated.AddListener(SetDirtyOnTransformUpdate);
|
||||
}
|
||||
|
||||
private void SetDirtyOnTransformUpdate(ITransform3D sender) => SetForRecalculation();
|
||||
private void SetForRecalculation() => isRecalculationNeeded = true;
|
||||
|
||||
public void PreDraw()
|
||||
{
|
||||
Vector3 cameraPosition = Position.ToVector3();
|
||||
View = Matrix.CreateLookAt(
|
||||
cameraPosition,
|
||||
Transform.Forward.ToVector3() + cameraPosition,
|
||||
Transform.Up.ToVector3()
|
||||
);
|
||||
Projection = Matrix.CreatePerspectiveFieldOfView(MathHelper.PiOver4, Viewport.AspectRatio, 0.1f, 100f);
|
||||
if (!isRecalculationNeeded)
|
||||
return;
|
||||
|
||||
CalculateView();
|
||||
CalculateProjection();
|
||||
isRecalculationNeeded = false;
|
||||
}
|
||||
|
||||
protected sealed override void InitializeInternal() => Transform = BehaviourController.GetRequiredBehaviour<ITransform3D>();
|
||||
protected sealed override void FinalizeInternal() => Transform = null!;
|
||||
private void CalculateView()
|
||||
{
|
||||
Vector3 forward = Vector3.Normalize(Transform.Forward.ToVector3());
|
||||
Vector3 up = Vector3.Normalize(Transform.Up.ToVector3());
|
||||
Vector3 right = Vector3.Normalize(Transform.Right.ToVector3());
|
||||
Vector3 position = Transform.Position.ToVector3();
|
||||
|
||||
public readonly record struct ViewChangedArguments(Matrix PreviousView);
|
||||
public readonly record struct ProjectionChangedArguments(Matrix PreviousProjection);
|
||||
ViewMatrix = new Matrix4x4(
|
||||
right.X, up.X, forward.X, 0,
|
||||
right.Y, up.Y, forward.Y, 0,
|
||||
right.Z, up.Z, forward.Z, 0,
|
||||
-Vector3.Dot(right, position),
|
||||
-Vector3.Dot(up, position),
|
||||
-Vector3.Dot(forward, position),
|
||||
1
|
||||
);
|
||||
}
|
||||
|
||||
private void CalculateProjection()
|
||||
{
|
||||
float yScale = 1f / (float)Math.Tan(fieldOfView / 2f);
|
||||
float xScale = yScale / Viewport.AspectRatio;
|
||||
|
||||
ProjectionMatrix = new Matrix4x4(
|
||||
xScale, 0, 0, 0,
|
||||
0, yScale, 0, 0,
|
||||
0, 0, FarPlane / (FarPlane - NearPlane), 1,
|
||||
0, 0, -NearPlane * FarPlane / (FarPlane - NearPlane), 0
|
||||
);
|
||||
}
|
||||
|
||||
public readonly record struct ViewChangedArguments(Matrix4x4 PreviousView);
|
||||
public readonly record struct ProjectionChangedArguments(Matrix4x4 PreviousProjection);
|
||||
public readonly record struct ViewportChangedArguments(Viewport PreviousViewport);
|
||||
public readonly record struct FieldOfViewChangedArguments(float PreviousFieldOfView);
|
||||
}
|
||||
|
||||
@@ -15,49 +15,49 @@ public class SpriteBatchWrapper(GraphicsDevice graphicsDevice) : ISpriteBatch
|
||||
=> spriteBatch.Begin(sortMode, blendState, samplerState, depthStencilState, rasterizerState, effect, transformMatrix);
|
||||
|
||||
public void Draw(Texture2D texture, Vector2D position, AABB2D? sourceAABB, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth)
|
||||
=> spriteBatch.Draw(texture, position.ToDisplayVector2(), sourceAABB?.ToRectangle(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth);
|
||||
=> spriteBatch.Draw(texture, position.ToVector2(), sourceAABB?.ToRectangle(), color, rotation, origin.ToVector2(), scale.ToVector2(), effects, layerDepth);
|
||||
|
||||
public void Draw(Texture2D texture, Vector2D position, AABB2D? sourceAABB, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth)
|
||||
=> spriteBatch.Draw(texture, position.ToDisplayVector2(), sourceAABB?.ToRectangle(), color, rotation, origin.ToDisplayVector2(), scale, effects, layerDepth);
|
||||
=> spriteBatch.Draw(texture, position.ToVector2(), sourceAABB?.ToRectangle(), color, rotation, origin.ToVector2(), scale, effects, layerDepth);
|
||||
|
||||
public void Draw(Texture2D texture, AABB2D destinationAABB, AABB2D? sourceAABB, Color color, float rotation, Vector2D origin, SpriteEffects effects, float layerDepth)
|
||||
=> spriteBatch.Draw(texture, destinationAABB.ToRectangle(), sourceAABB?.ToRectangle(), color, rotation, origin.ToDisplayVector2(), effects, layerDepth);
|
||||
=> spriteBatch.Draw(texture, destinationAABB.ToRectangle(), sourceAABB?.ToRectangle(), color, rotation, origin.ToVector2(), effects, layerDepth);
|
||||
|
||||
public void Draw(Texture2D texture, Vector2D position, AABB2D? sourceAABB, Color color)
|
||||
=> spriteBatch.Draw(texture, position.ToDisplayVector2(), sourceAABB?.ToRectangle(), color);
|
||||
=> spriteBatch.Draw(texture, position.ToVector2(), sourceAABB?.ToRectangle(), color);
|
||||
|
||||
public void Draw(Texture2D texture, AABB2D destinationAABB, AABB2D? sourceAABB, Color color)
|
||||
=> spriteBatch.Draw(texture, destinationAABB.ToRectangle(), sourceAABB?.ToRectangle(), color);
|
||||
|
||||
public void Draw(Texture2D texture, Vector2D position, Color color)
|
||||
=> spriteBatch.Draw(texture, position.ToDisplayVector2(), color);
|
||||
=> spriteBatch.Draw(texture, position.ToVector2(), color);
|
||||
|
||||
public void Draw(Texture2D texture, AABB2D destinationAABB, Color color)
|
||||
=> spriteBatch.Draw(texture, destinationAABB.ToRectangle(), color);
|
||||
|
||||
public void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color)
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color);
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color);
|
||||
|
||||
public void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth)
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale, effects, layerDepth);
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale, effects, layerDepth);
|
||||
|
||||
public void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth)
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth);
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale.ToVector2(), effects, layerDepth);
|
||||
|
||||
public void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth, bool rtl)
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth, rtl);
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale.ToVector2(), effects, layerDepth, rtl);
|
||||
|
||||
public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color)
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color);
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color);
|
||||
|
||||
public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth)
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale, effects, layerDepth);
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale, effects, layerDepth);
|
||||
|
||||
public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth)
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth);
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale.ToVector2(), effects, layerDepth);
|
||||
|
||||
public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth, bool rtl)
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), color, rotation, origin.ToDisplayVector2(), scale.ToDisplayVector2(), effects, layerDepth, rtl);
|
||||
=> spriteBatch.DrawString(spriteFont, text, position.ToVector2(), color, rotation, origin.ToVector2(), scale.ToVector2(), effects, layerDepth, rtl);
|
||||
|
||||
public void End()
|
||||
=> spriteBatch.End();
|
||||
|
||||
@@ -26,7 +26,7 @@ public class SpriteBatcher : Behaviour, IFirstFrameUpdate, IDraw
|
||||
|
||||
public void Draw()
|
||||
{
|
||||
spriteBatch.Begin(transformMatrix: camera2D.MatrixTransform);
|
||||
spriteBatch.Begin(transformMatrix: camera2D.ViewMatrix.ToXnaMatrix());
|
||||
for (int i = 0; i < drawableSprites.Count; i++)
|
||||
drawableSprites[i].Draw(spriteBatch);
|
||||
spriteBatch.End();
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Microsoft.Xna.Framework;
|
||||
|
||||
using Engine.Core;
|
||||
|
||||
namespace Engine.Integration.MonoGame;
|
||||
|
||||
public class TriangleBatcher : Behaviour, ITriangleBatch, IFirstFrameUpdate, IDraw
|
||||
{
|
||||
private static Comparer<int> SortByAscendingPriority() => Comparer<int>.Create((x, y) => x.CompareTo(y));
|
||||
private static System.Func<IBehaviour, int> GetPriority() => (b) => b.Priority;
|
||||
|
||||
private TriangleBatch triangleBatch = null!;
|
||||
private MonoGameCamera2D camera2D = null!;
|
||||
|
||||
private readonly ActiveBehaviourCollectorOrdered<int, IDrawableTriangle> drawableShapes = new(GetPriority(), SortByAscendingPriority());
|
||||
|
||||
public void FirstActiveFrame()
|
||||
{
|
||||
MonoGameWindowContainer windowContainer = BehaviourController.UniverseObject.Universe.FindRequiredBehaviour<MonoGameWindowContainer>();
|
||||
camera2D = BehaviourController.UniverseObject.Universe.FindRequiredBehaviour<MonoGameCamera2D>();
|
||||
|
||||
triangleBatch = new(windowContainer.Window.GraphicsDevice);
|
||||
drawableShapes.Unassign();
|
||||
drawableShapes.Assign(BehaviourController.UniverseObject.Universe);
|
||||
}
|
||||
|
||||
public void Draw()
|
||||
{
|
||||
triangleBatch.Begin(camera2D.MatrixTransform);
|
||||
for (int i = 0; i < drawableShapes.Count; i++)
|
||||
drawableShapes[i].Draw(triangleBatch);
|
||||
triangleBatch.End();
|
||||
}
|
||||
|
||||
public void Begin(Matrix? view = null, Matrix? projection = null) => triangleBatch.Begin(view, projection);
|
||||
public void Draw(Triangle triangle, ColorRGBA colorRGBA) => triangleBatch.Draw(triangle, colorRGBA);
|
||||
public void End() => triangleBatch.End();
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>Engine.Integration.MonoGame</RootNamespace>
|
||||
|
||||
@@ -9,8 +9,6 @@ namespace Engine.Integration.MonoGame;
|
||||
|
||||
public static class EngineConverterExtensions
|
||||
{
|
||||
public readonly static Vector2D screenScale = Vector2D.Down + Vector2D.Right;
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static UniverseTime ToEngineTime(this GameTime gameTime) => new(gameTime.TotalGameTime, gameTime.ElapsedGameTime);
|
||||
|
||||
@@ -41,15 +39,25 @@ public static class EngineConverterExtensions
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Vector3 ToVector3(this Vector3D vector) => new(vector.X, vector.Y, vector.Z);
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Matrix ToXnaMatrix(this Matrix4x4 m) => new(
|
||||
m.M11, m.M12, m.M13, m.M14,
|
||||
m.M21, m.M22, m.M23, m.M24,
|
||||
m.M31, m.M32, m.M33, m.M34,
|
||||
m.M41, m.M42, m.M43, m.M44
|
||||
);
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Matrix4x4 FromXnaMatrix(this Matrix m) => new(
|
||||
m.M11, m.M12, m.M13, m.M14,
|
||||
m.M21, m.M22, m.M23, m.M24,
|
||||
m.M31, m.M32, m.M33, m.M34,
|
||||
m.M41, m.M42, m.M43, m.M44
|
||||
);
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Microsoft.Xna.Framework.Quaternion ToXnaQuaternion(this Core.Quaternion quaternion) => new(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W);
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Vector2 ToDisplayVector2(this Vector2D vector) => vector.Scale(screenScale).ToVector2();
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Vector2D ApplyDisplayScale(this Vector2D vector) => vector.Scale(screenScale);
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Rectangle ToDisplayRectangle(this Rectangle rectangle, DisplayMode displayMode) => new()
|
||||
{
|
||||
@@ -62,8 +70,8 @@ public static class EngineConverterExtensions
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Rectangle ToRectangle(this AABB2D aabb) => new()
|
||||
{
|
||||
X = (int)(aabb.LowerBoundary.X * screenScale.X),
|
||||
Y = (int)(aabb.LowerBoundary.Y * screenScale.Y),
|
||||
X = (int)aabb.LowerBoundary.X,
|
||||
Y = (int)aabb.LowerBoundary.Y,
|
||||
Width = (int)(aabb.UpperBoundary.X - aabb.LowerBoundary.X),
|
||||
Height = (int)(aabb.UpperBoundary.Y - aabb.LowerBoundary.Y)
|
||||
};
|
||||
|
||||
@@ -2,22 +2,29 @@ using Microsoft.Xna.Framework;
|
||||
using Microsoft.Xna.Framework.Graphics;
|
||||
|
||||
using Engine.Core;
|
||||
using Engine.Systems.Graphics;
|
||||
|
||||
namespace Engine.Integration.MonoGame;
|
||||
|
||||
public class TriangleBatch : ITriangleBatch
|
||||
public class MonoGameTriangleBatch : Behaviour, ITriangleBatch, IFirstFrameUpdate
|
||||
{
|
||||
private readonly GraphicsDevice graphicsDevice;
|
||||
private GraphicsDevice graphicsDevice = null!;
|
||||
private VertexBuffer vertexBuffer = default!;
|
||||
private readonly VertexPositionColor[] vertices = new VertexPositionColor[1024];
|
||||
|
||||
private int verticesIndex = 0;
|
||||
private Matrix _view;
|
||||
private Matrix _projection;
|
||||
private readonly BasicEffect basicEffect;
|
||||
private Matrix view = Matrix.Identity;
|
||||
private Matrix projection = Matrix.Identity;
|
||||
|
||||
private BasicEffect basicEffect = null!;
|
||||
private readonly RasterizerState rasterizerState = new() { CullMode = CullMode.None };
|
||||
|
||||
public TriangleBatch(GraphicsDevice graphicsDevice)
|
||||
private ICamera camera = null!;
|
||||
|
||||
public void FirstActiveFrame()
|
||||
{
|
||||
camera = Universe.FindRequiredBehaviour<ICamera>();
|
||||
GraphicsDevice graphicsDevice = Universe.FindRequiredBehaviour<MonoGameWindowContainer>().Window.GraphicsDevice;
|
||||
this.graphicsDevice = graphicsDevice;
|
||||
basicEffect = new(graphicsDevice);
|
||||
basicEffect.VertexColorEnabled = true;
|
||||
@@ -29,9 +36,9 @@ public class TriangleBatch : ITriangleBatch
|
||||
if (verticesIndex + 3 >= vertices.Length)
|
||||
Flush();
|
||||
|
||||
Vector2 A = triangle.A.ToDisplayVector2();
|
||||
Vector2 B = triangle.B.ToDisplayVector2();
|
||||
Vector2 C = triangle.C.ToDisplayVector2();
|
||||
Vector2 A = triangle.A.ToVector2();
|
||||
Vector2 B = triangle.B.ToVector2();
|
||||
Vector2 C = triangle.C.ToVector2();
|
||||
Color color = colorRGBA.ToColor();
|
||||
|
||||
vertices[verticesIndex++] = new(new(A.X, A.Y, 0f), color);
|
||||
@@ -39,20 +46,10 @@ public class TriangleBatch : ITriangleBatch
|
||||
vertices[verticesIndex++] = new(new(C.X, C.Y, 0f), color);
|
||||
}
|
||||
|
||||
public void Begin(Matrix? view = null, Matrix? projection = null)
|
||||
public void Begin(Matrix4x4? view = null, Matrix4x4? projection = null)
|
||||
{
|
||||
if (view != null)
|
||||
_view = view.Value;
|
||||
else
|
||||
_view = Matrix.Identity;
|
||||
|
||||
if (projection != null)
|
||||
_projection = projection.Value;
|
||||
else
|
||||
{
|
||||
Viewport viewport = graphicsDevice.Viewport;
|
||||
_projection = Matrix.CreateOrthographicOffCenter(viewport.X, viewport.Width, viewport.Height, viewport.Y, 0, 1);
|
||||
}
|
||||
this.view = (view ?? camera.ViewMatrix).Transposed.ToXnaMatrix();
|
||||
this.projection = (projection ?? camera.ProjectionMatrix).Transposed.ToXnaMatrix();
|
||||
}
|
||||
|
||||
public void End() => Flush();
|
||||
@@ -63,8 +60,8 @@ public class TriangleBatch : ITriangleBatch
|
||||
return;
|
||||
|
||||
graphicsDevice.RasterizerState = rasterizerState;
|
||||
basicEffect.Projection = _projection;
|
||||
basicEffect.View = _view;
|
||||
basicEffect.Projection = projection;
|
||||
basicEffect.View = view;
|
||||
vertexBuffer.SetData(vertices);
|
||||
|
||||
graphicsDevice.SetVertexBuffer(vertexBuffer);
|
||||
@@ -1,4 +1,4 @@
|
||||
using Microsoft.Xna.Framework;
|
||||
using Microsoft.Xna.Framework;
|
||||
using Microsoft.Xna.Framework.Graphics;
|
||||
|
||||
using Engine.Core;
|
||||
@@ -19,10 +19,12 @@ public class MonoGameWindow : Game
|
||||
IsMouseVisible = true;
|
||||
Universe = universe ?? new Universe();
|
||||
|
||||
Universe.InstantiateUniverseObject().SetUniverseObject("Window Container")
|
||||
IUniverseObject monogameParent = Universe.InstantiateUniverseObject().SetUniverseObject("MonoGame");
|
||||
|
||||
Universe.InstantiateUniverseObject().SetUniverseObject("Window Container", monogameParent)
|
||||
.BehaviourController.AddBehaviour<MonoGameWindowContainer>(this);
|
||||
|
||||
Universe.InstantiateUniverseObject().SetUniverseObject("Content Loader")
|
||||
Universe.InstantiateUniverseObject().SetUniverseObject("Content Loader", monogameParent)
|
||||
.BehaviourController.AddBehaviour<LoadContentManager>();
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,6 @@ namespace Engine.Serializers.Yaml;
|
||||
public interface IEngineTypeYamlConverter : IYamlTypeConverter
|
||||
{
|
||||
YamlSerializer Serializer { get; set; }
|
||||
EntityRegistry EntityRegistry { get; set; }
|
||||
IdentifiableRegistry IdentifiableRegistry { get; set; }
|
||||
IProgressionTracker ProgressionTracker { get; set; }
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ public class BehaviourControllerConverter : EngineTypeYamlSerializerBase<IBehavi
|
||||
throw new();
|
||||
SerializedClass instanceSerializedClass = (SerializedClass)rootDeserializer(typeof(SerializedClass))!;
|
||||
ProgressionTracker.Set(isTrackingController ? .5f : ProgressionTracker.Progression, $"Creating {instanceSerializedClass.Type}");
|
||||
behaviourController = (IBehaviourController)instanceSerializedClass.CreateInstance(EntityRegistry);
|
||||
behaviourController = (IBehaviourController)instanceSerializedClass.CreateInstance(IdentifiableRegistry);
|
||||
|
||||
string value = parser.Consume<Scalar>().Value;
|
||||
if (value.CompareTo(nameof(IBehaviourController.StateEnable)) != 0)
|
||||
@@ -80,7 +80,7 @@ public class BehaviourControllerConverter : EngineTypeYamlSerializerBase<IBehavi
|
||||
serializer(behaviourController.StateEnable);
|
||||
|
||||
emitter.Emit(new Scalar(BEHAVIOURS_SCALAR_NAME));
|
||||
serializer(behaviourController.GetBehaviours<IBehaviour>().Where(b => !b.GetType().HasAttribute<IgnoreSerializationAttribute>()));
|
||||
serializer(behaviourController.GetBehaviours<IBehaviour>().Where(b => !b.GetType().HasAttribute<IgnoreSerializationAttribute>()).Reverse());
|
||||
|
||||
ProgressionTracker.Set(isTrackingController ? 1f : ProgressionTracker.Progression, $"Serialized behaviour controller");
|
||||
emitter.Emit(new MappingEnd());
|
||||
|
||||
@@ -36,7 +36,7 @@ public class BehaviourConverter : EngineTypeYamlSerializerBase<IBehaviour>
|
||||
throw new();
|
||||
SerializedClass instanceSerializedClass = (SerializedClass)rootDeserializer(typeof(SerializedClass))!;
|
||||
ProgressionTracker.Set(isTrackingController ? .5f : ProgressionTracker.Progression, $"Creating {instanceSerializedClass.Type}");
|
||||
behaviour = (IBehaviour)instanceSerializedClass.CreateInstance(EntityRegistry);
|
||||
behaviour = (IBehaviour)instanceSerializedClass.CreateInstance(IdentifiableRegistry);
|
||||
|
||||
if (parser.Consume<Scalar>().Value.CompareTo(nameof(IBehaviour.StateEnable)) != 0)
|
||||
throw new();
|
||||
|
||||
@@ -12,7 +12,7 @@ public abstract class EngineTypeYamlSerializerBase<T> : IEngineTypeYamlConverter
|
||||
{
|
||||
protected const string SERIALIZED_SCALAR_NAME = "Properties";
|
||||
|
||||
public EntityRegistry EntityRegistry { get; set; } = null!;
|
||||
public IdentifiableRegistry IdentifiableRegistry { get; set; } = null!;
|
||||
public YamlSerializer Serializer { get; set; } = null!;
|
||||
public IProgressionTracker ProgressionTracker { get; set; } = null!;
|
||||
|
||||
@@ -24,7 +24,7 @@ public abstract class EngineTypeYamlSerializerBase<T> : IEngineTypeYamlConverter
|
||||
T? result = Read(parser, type, rootDeserializer);
|
||||
|
||||
if (result is IEntity entity)
|
||||
EntityRegistry.Add(entity);
|
||||
IdentifiableRegistry.Add(entity);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -20,8 +20,8 @@ public class SerializedClassConverter : EngineTypeYamlSerializerBase<SerializedC
|
||||
ProgressionTracker.Set(isTrackingController ? .1f : ProgressionTracker.Progression, $"Reading class");
|
||||
|
||||
SerializedClass serializedClass = new();
|
||||
Dictionary<string, TypeContainer> publicDictionary = [];
|
||||
Dictionary<string, TypeContainer> privateDictionary = [];
|
||||
Dictionary<string, object> publicDictionary = [];
|
||||
Dictionary<string, object> privateDictionary = [];
|
||||
|
||||
parser.Consume<MappingStart>();
|
||||
|
||||
@@ -32,16 +32,24 @@ public class SerializedClassConverter : EngineTypeYamlSerializerBase<SerializedC
|
||||
switch (key)
|
||||
{
|
||||
case nameof(SerializedClass.Type): serializedClass.Type = parser.Consume<Scalar>().Value; break;
|
||||
case nameof(SerializedClass.Public): publicDictionary = (Dictionary<string, TypeContainer>)rootDeserializer(typeof(Dictionary<string, TypeContainer>))!; break;
|
||||
case nameof(SerializedClass.Private): privateDictionary = (Dictionary<string, TypeContainer>)rootDeserializer(typeof(Dictionary<string, TypeContainer>))!; break;
|
||||
case nameof(SerializedClass.Public): publicDictionary = (Dictionary<string, object>)rootDeserializer(typeof(Dictionary<string, object>))!; break;
|
||||
case nameof(SerializedClass.Private): privateDictionary = (Dictionary<string, object>)rootDeserializer(typeof(Dictionary<string, object>))!; break;
|
||||
}
|
||||
}
|
||||
|
||||
foreach ((string key, TypeContainer typeContainer) in publicDictionary)
|
||||
serializedClass.Public.Add(key, Serializer.InternalDeserialize(typeContainer.Value!.ToString()!, TypeFactory.GetType(typeContainer.Type)));
|
||||
Type classType = TypeFactory.GetType(serializedClass.Type);
|
||||
|
||||
foreach ((string key, TypeContainer typeContainer) in privateDictionary)
|
||||
serializedClass.Private.Add(key, Serializer.InternalDeserialize(typeContainer.Value!.ToString()!, TypeFactory.GetType(typeContainer.Type)));
|
||||
foreach ((string key, object @object) in publicDictionary)
|
||||
if (@object is TypeContainer typeContainer)
|
||||
serializedClass.Public.Add(key, Serializer.InternalDeserialize(typeContainer.Value!.ToString()!, TypeFactory.GetType(typeContainer.Type)));
|
||||
else
|
||||
serializedClass.Public.Add(key, Serializer.InternalDeserialize(@object.ToString()!, (classType.GetProperty(key, System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance)?.PropertyType ?? classType.GetField(key, System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance)?.FieldType)!));
|
||||
|
||||
foreach ((string key, object @object) in privateDictionary)
|
||||
if (@object is TypeContainer typeContainer)
|
||||
serializedClass.Private.Add(key, Serializer.InternalDeserialize(typeContainer.Value!.ToString()!, TypeFactory.GetType(typeContainer.Type)));
|
||||
else
|
||||
serializedClass.Private.Add(key, Serializer.InternalDeserialize(@object.ToString()!, (classType.GetProperty(key, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Default)?.PropertyType ?? classType.GetField(key, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Default)?.FieldType)!));
|
||||
|
||||
ProgressionTracker.Set(isTrackingController ? 1f : ProgressionTracker.Progression, $"Read {serializedClass.Type}");
|
||||
return serializedClass;
|
||||
@@ -54,14 +62,20 @@ public class SerializedClassConverter : EngineTypeYamlSerializerBase<SerializedC
|
||||
bool isTrackingController = ProgressionTracker.Progression.ApproximatelyEquals(0f);
|
||||
ProgressionTracker.Set(isTrackingController ? .25f : ProgressionTracker.Progression, $"Serializing {serializedClass.Type}");
|
||||
|
||||
Dictionary<string, TypeContainer> publics = [];
|
||||
Dictionary<string, TypeContainer> privates = [];
|
||||
Dictionary<string, object> publics = [];
|
||||
Dictionary<string, object> privates = [];
|
||||
|
||||
foreach ((string key, object? @object) in serializedClass.Public.Where(v => !v.GetType().HasAttribute<IgnoreSerializationAttribute>()))
|
||||
publics.Add(key, new TypeContainer(@object));
|
||||
if (@object?.GetType().IsClass == false)
|
||||
publics.Add(key, @object!);
|
||||
else
|
||||
publics.Add(key, new TypeContainer(@object));
|
||||
|
||||
foreach ((string key, object? @object) in serializedClass.Private.Where(v => !v.GetType().HasAttribute<IgnoreSerializationAttribute>()))
|
||||
privates.Add(key, new TypeContainer(@object));
|
||||
if (@object?.GetType().IsClass == false)
|
||||
privates.Add(key, @object!);
|
||||
else
|
||||
privates.Add(key, new TypeContainer(@object));
|
||||
|
||||
emitter.Emit(new MappingStart());
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ public class StateEnableConverter : EngineTypeYamlSerializerBase<IStateEnable>
|
||||
if (parser.Consume<Scalar>().Value.CompareTo(SERIALIZED_SCALAR_NAME) != 0)
|
||||
throw new();
|
||||
SerializedClass instanceSerializedClass = (SerializedClass)rootDeserializer(typeof(SerializedClass))!;
|
||||
stateEnable = (IStateEnable)instanceSerializedClass.CreateInstance(EntityRegistry);
|
||||
stateEnable = (IStateEnable)instanceSerializedClass.CreateInstance(IdentifiableRegistry);
|
||||
|
||||
parser.Consume<MappingEnd>();
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
|
||||
|
||||
IUniverse universe;
|
||||
IStateEnable stateEnable;
|
||||
List<IUniverseObject> universeObjects;
|
||||
IUniverseObject rootUniverseObject;
|
||||
|
||||
parser.Consume<MappingStart>();
|
||||
|
||||
@@ -34,16 +34,16 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
|
||||
throw new();
|
||||
SerializedClass instanceSerializedClass = (SerializedClass)rootDeserializer(typeof(SerializedClass))!;
|
||||
ProgressionTracker.Set(isTrackingController ? .2f : ProgressionTracker.Progression, $"Creating {instanceSerializedClass.Type}");
|
||||
universe = (IUniverse)instanceSerializedClass.CreateInstance(EntityRegistry);
|
||||
universe = (IUniverse)instanceSerializedClass.CreateInstance(IdentifiableRegistry);
|
||||
|
||||
if (parser.Consume<Scalar>().Value.CompareTo(nameof(IUniverse.StateEnable)) != 0)
|
||||
throw new();
|
||||
stateEnable = (IStateEnable)rootDeserializer(typeof(IStateEnable))!;
|
||||
|
||||
ProgressionTracker.Set(isTrackingController ? .5f : ProgressionTracker.Progression, $"Reading universe objects");
|
||||
if (parser.Consume<Scalar>().Value.CompareTo(nameof(IUniverse.UniverseObjects)) != 0)
|
||||
if (parser.Consume<Scalar>().Value.CompareTo(nameof(IUniverse.Root)) != 0)
|
||||
throw new();
|
||||
universeObjects = (List<IUniverseObject>)rootDeserializer(typeof(List<IUniverseObject>))!;
|
||||
rootUniverseObject = (IUniverseObject)rootDeserializer(typeof(IUniverseObject))!;
|
||||
|
||||
parser.Consume<MappingEnd>();
|
||||
|
||||
@@ -52,13 +52,12 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
|
||||
stateEnable.Assign(universe);
|
||||
universe.Assign(stateEnable);
|
||||
|
||||
ProgressionTracker.Set(isTrackingController ? .9f : ProgressionTracker.Progression, "Registering universe objects");
|
||||
for (int i = 0; i < universeObjects.Count; i++)
|
||||
ProgressionTracker.Set(isTrackingController ? .9f : ProgressionTracker.Progression, "Registering root universe object");
|
||||
for (int i = rootUniverseObject.Children.Count - 1; i >= 0; i--)
|
||||
{
|
||||
IUniverseObject uo = universeObjects[i];
|
||||
ProgressionTracker.Set(isTrackingController ? .9f + .1f * ((float)i / universeObjects.Count) : ProgressionTracker.Progression, $"Registering {uo.Name}");
|
||||
|
||||
universe.Register(uo);
|
||||
IUniverseObject uo = rootUniverseObject.Children[i];
|
||||
ProgressionTracker.Set(isTrackingController ? .9f + .1f * ((float)i / rootUniverseObject.Children.Count) : ProgressionTracker.Progression, $"Registering {uo.Name}");
|
||||
universe.Root.AddChild(uo);
|
||||
}
|
||||
|
||||
ProgressionTracker.Set(isTrackingController ? 1f : ProgressionTracker.Progression, $"Created {instanceSerializedClass.Type}");
|
||||
@@ -72,7 +71,7 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
|
||||
bool isTrackingController = ProgressionTracker.Progression.ApproximatelyEquals(0f);
|
||||
ProgressionTracker.Set(isTrackingController ? .25f : ProgressionTracker.Progression, $"Serializing universe");
|
||||
|
||||
IEnumerable<IUniverseObject> rootUniverseObjects = universe.UniverseObjects.Where(uo => uo.Parent is null);
|
||||
IUniverseObject rootUniverseObject = universe.Root;
|
||||
|
||||
emitter.Emit(new MappingStart());
|
||||
|
||||
@@ -85,8 +84,8 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
|
||||
emitter.Emit(new Scalar(nameof(IUniverse.StateEnable)));
|
||||
serializer(universe.StateEnable);
|
||||
|
||||
emitter.Emit(new Scalar(nameof(IUniverse.UniverseObjects)));
|
||||
serializer(rootUniverseObjects);
|
||||
emitter.Emit(new Scalar(nameof(IUniverse.Root)));
|
||||
serializer(rootUniverseObject);
|
||||
|
||||
ProgressionTracker.Set(isTrackingController ? 1f : ProgressionTracker.Progression, $"Serialized universe");
|
||||
emitter.Emit(new MappingEnd());
|
||||
|
||||
@@ -40,7 +40,7 @@ public class UniverseObjectSerializer : EngineTypeYamlSerializerBase<IUniverseOb
|
||||
throw new();
|
||||
SerializedClass instanceSerializedClass = (SerializedClass)rootDeserializer(typeof(SerializedClass))!;
|
||||
ProgressionTracker.Set(isTrackingController ? .3f : ProgressionTracker.Progression, $"Creating {instanceSerializedClass.Type}");
|
||||
universeObject = (IUniverseObject)instanceSerializedClass.CreateInstance(EntityRegistry);
|
||||
universeObject = (IUniverseObject)instanceSerializedClass.CreateInstance(IdentifiableRegistry);
|
||||
|
||||
if (parser.Consume<Scalar>().Value.CompareTo(nameof(IUniverseObject.StateEnable)) != 0)
|
||||
throw new();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>Engine.Integration.Yaml</RootNamespace>
|
||||
|
||||
@@ -17,14 +17,14 @@ public class YamlSerializer : Core.Serialization.ISerializer
|
||||
private readonly YamlDotNet.Serialization.ISerializer serializer = null!;
|
||||
private readonly YamlDotNet.Serialization.IDeserializer deserializer = null!;
|
||||
|
||||
private readonly EntityRegistry entityRegistry = null!;
|
||||
private readonly IdentifiableRegistry identifiableRegistry = null!;
|
||||
private readonly IProgressionTracker progressionTracker = null!;
|
||||
|
||||
private readonly System.Threading.Lock Lock = new();
|
||||
|
||||
public YamlSerializer()
|
||||
{
|
||||
entityRegistry = new();
|
||||
identifiableRegistry = new();
|
||||
progressionTracker = new ProgressionTracker();
|
||||
|
||||
SerializerBuilder serializerBuilder = new SerializerBuilder()
|
||||
@@ -37,7 +37,7 @@ public class YamlSerializer : Core.Serialization.ISerializer
|
||||
foreach (IEngineTypeYamlConverter typeConverter in GetEngineYamlTypeConverters())
|
||||
{
|
||||
typeConverter.Serializer = this;
|
||||
typeConverter.EntityRegistry = entityRegistry;
|
||||
typeConverter.IdentifiableRegistry = identifiableRegistry;
|
||||
typeConverter.ProgressionTracker = progressionTracker;
|
||||
|
||||
deserializerBuilder = deserializerBuilder.WithTypeConverter(typeConverter);
|
||||
@@ -66,9 +66,9 @@ public class YamlSerializer : Core.Serialization.ISerializer
|
||||
{
|
||||
lock (Lock)
|
||||
{
|
||||
entityRegistry.Reset();
|
||||
identifiableRegistry.Reset();
|
||||
object result = deserializer.Deserialize(configuration)!;
|
||||
entityRegistry.AssignAll();
|
||||
identifiableRegistry.AssignAll();
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -77,9 +77,9 @@ public class YamlSerializer : Core.Serialization.ISerializer
|
||||
{
|
||||
lock (Lock)
|
||||
{
|
||||
entityRegistry.Reset();
|
||||
identifiableRegistry.Reset();
|
||||
object result = deserializer.Deserialize(configuration, type)!;
|
||||
entityRegistry.AssignAll();
|
||||
identifiableRegistry.AssignAll();
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -88,9 +88,9 @@ public class YamlSerializer : Core.Serialization.ISerializer
|
||||
{
|
||||
lock (Lock)
|
||||
{
|
||||
entityRegistry.Reset();
|
||||
identifiableRegistry.Reset();
|
||||
T result = deserializer.Deserialize<T>(configuration);
|
||||
entityRegistry.AssignAll();
|
||||
identifiableRegistry.AssignAll();
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,19 +16,8 @@ public abstract class Collider2DBase : Behaviour2D, ICollider2D
|
||||
private readonly Event<IUniverseObject, IUniverseObject.ParentChangedArguments>.EventHandler delegateUpdateRigidBody2D = null!;
|
||||
|
||||
protected bool NeedsRecalculation { get; set; } = true;
|
||||
protected IRigidBody2D? _rigidBody2D = null;
|
||||
|
||||
protected Collider2DBase()
|
||||
{
|
||||
delegateOnBehaviourAddedToController = OnBehaviourAddedToController;
|
||||
delegateOnBehaviourRemovedFromController = OnBehaviourRemovedFromController;
|
||||
delegateSetNeedsRecalculationFromPosition = SetNeedsRecalculationFromPosition;
|
||||
delegateSetNeedsRecalculationFromRotation = SetNeedsRecalculationFromRotation;
|
||||
delegateSetNeedsRecalculationFromScale = SetNeedsRecalculationFromScale;
|
||||
delegateUpdateRigidBody2D = UpdateRigidBody2D;
|
||||
}
|
||||
|
||||
public IRigidBody2D? RigidBody2D => _rigidBody2D;
|
||||
public IRigidBody2D? RigidBody2D { get; protected set; } = null;
|
||||
public bool IsTrigger { get; set; } = false;
|
||||
|
||||
public void Recalculate()
|
||||
@@ -46,7 +35,8 @@ public abstract class Collider2DBase : Behaviour2D, ICollider2D
|
||||
{
|
||||
base.OnInitialize();
|
||||
|
||||
BehaviourController.TryGetBehaviourInParent(out _rigidBody2D);
|
||||
BehaviourController.TryGetBehaviourInParent(out IRigidBody2D? foundRigidBody2D);
|
||||
RigidBody2D = foundRigidBody2D;
|
||||
|
||||
BehaviourController.OnBehaviourAdded.AddListener(delegateOnBehaviourAddedToController);
|
||||
BehaviourController.OnBehaviourRemoved.AddListener(delegateOnBehaviourRemovedFromController);
|
||||
@@ -59,19 +49,20 @@ public abstract class Collider2DBase : Behaviour2D, ICollider2D
|
||||
|
||||
private void UpdateRigidBody2D(IUniverseObject sender, IUniverseObject.ParentChangedArguments args)
|
||||
{
|
||||
BehaviourController.TryGetBehaviourInParent(out _rigidBody2D);
|
||||
BehaviourController.TryGetBehaviourInParent(out IRigidBody2D? foundRigidBody2D);
|
||||
RigidBody2D = foundRigidBody2D;
|
||||
}
|
||||
|
||||
private void OnBehaviourAddedToController(IBehaviourController sender, IBehaviourController.BehaviourAddedArguments args)
|
||||
{
|
||||
if (args.BehaviourAdded is IRigidBody2D rigidBody)
|
||||
_rigidBody2D = rigidBody;
|
||||
RigidBody2D = rigidBody;
|
||||
}
|
||||
|
||||
private void OnBehaviourRemovedFromController(IBehaviourController sender, IBehaviourController.BehaviourRemovedArguments args)
|
||||
{
|
||||
if (args.BehaviourRemoved is IRigidBody2D)
|
||||
_rigidBody2D = null;
|
||||
RigidBody2D = null;
|
||||
}
|
||||
|
||||
private void SetNeedsRecalculationFromPosition(ITransform2D sender, ITransform2D.PositionChangedArguments args) => NeedsRecalculation = true;
|
||||
@@ -93,4 +84,14 @@ public abstract class Collider2DBase : Behaviour2D, ICollider2D
|
||||
public void Detect(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionDetected?.Invoke(this, collisionDetectionInformation);
|
||||
public void Resolve(CollisionDetectionInformation collisionDetectionInformation) => OnCollisionResolved?.Invoke(this, collisionDetectionInformation);
|
||||
public void Trigger(ICollider2D initiator) => OnTriggered?.Invoke(this, initiator);
|
||||
|
||||
protected Collider2DBase()
|
||||
{
|
||||
delegateOnBehaviourAddedToController = OnBehaviourAddedToController;
|
||||
delegateOnBehaviourRemovedFromController = OnBehaviourRemovedFromController;
|
||||
delegateSetNeedsRecalculationFromPosition = SetNeedsRecalculationFromPosition;
|
||||
delegateSetNeedsRecalculationFromRotation = SetNeedsRecalculationFromRotation;
|
||||
delegateSetNeedsRecalculationFromScale = SetNeedsRecalculationFromScale;
|
||||
delegateUpdateRigidBody2D = UpdateRigidBody2D;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,20 +4,18 @@ namespace Engine.Physics2D;
|
||||
|
||||
public class Collider2DCircle : Collider2DBase, ICircleCollider2D
|
||||
{
|
||||
private Circle _circleLocal = Circle.UnitCircle;
|
||||
|
||||
public Circle CircleWorld { get; protected set; } = Circle.UnitCircle;
|
||||
public Circle CircleLocal
|
||||
{
|
||||
get => _circleLocal;
|
||||
get;
|
||||
set
|
||||
{
|
||||
_circleLocal = value;
|
||||
field = value;
|
||||
NeedsRecalculation = true;
|
||||
}
|
||||
}
|
||||
} = Circle.UnitCircle;
|
||||
|
||||
public override void CalculateCollider() => CircleWorld = Transform.Transform(_circleLocal);
|
||||
public override void CalculateCollider() => CircleWorld = Transform.Transform(CircleLocal);
|
||||
|
||||
public Collider2DCircle() { }
|
||||
public Collider2DCircle(Circle circle) => CircleLocal = circle;
|
||||
|
||||
@@ -4,25 +4,19 @@ namespace Engine.Physics2D;
|
||||
|
||||
public class Collider2DShape : Collider2DBase, IShapeCollider2D
|
||||
{
|
||||
public Shape2D ShapeWorld { get => _shapeWorld; protected set => _shapeWorld = value; }
|
||||
public Shape2D ShapeWorld { get; protected set; } = Shape2D.Square;
|
||||
public Shape2D ShapeLocal
|
||||
{
|
||||
get => _shapeLocal;
|
||||
get;
|
||||
set
|
||||
{
|
||||
_shapeLocal = value;
|
||||
field = value;
|
||||
NeedsRecalculation = true;
|
||||
}
|
||||
}
|
||||
} = Shape2D.Square;
|
||||
|
||||
private Shape2D _shapeWorld = Shape2D.Square;
|
||||
private Shape2D _shapeLocal = Shape2D.Square;
|
||||
|
||||
public override void CalculateCollider() => ShapeLocal.Transform(Transform, _shapeWorld);
|
||||
public override void CalculateCollider() => ShapeLocal.Transform(Transform, ShapeWorld);
|
||||
|
||||
public Collider2DShape() { }
|
||||
public Collider2DShape(Shape2D shape)
|
||||
{
|
||||
ShapeLocal = shape;
|
||||
}
|
||||
public Collider2DShape(Shape2D shape) { ShapeLocal = shape; }
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>Engine.Physics2D</RootNamespace>
|
||||
|
||||
@@ -10,8 +10,6 @@ public class PhysicsEngine2D : Behaviour, IEnterUniverse, IExitUniverse, IPreUpd
|
||||
public Event<IPhysicsEngine2D, float> OnPhysicsStep { get; } = new();
|
||||
|
||||
private float physicsTicker = 0f;
|
||||
private int _iterationPerStep = 1;
|
||||
private float _iterationPeriod = 1f / 60f;
|
||||
|
||||
protected readonly ICollisionDetector2D collisionDetector = null!;
|
||||
protected readonly ICollisionResolver2D collisionResolver = null!;
|
||||
@@ -32,8 +30,8 @@ public class PhysicsEngine2D : Behaviour, IEnterUniverse, IExitUniverse, IPreUpd
|
||||
private readonly ListPool<IPhysicsIteration> physicsIterationPool = new();
|
||||
private readonly ListPool<IPostPhysicsUpdate> postPhysicsUpdatePool = new();
|
||||
|
||||
public int IterationPerStep { get => _iterationPerStep; set => _iterationPerStep = value < 1 ? 1 : value; }
|
||||
public float IterationPeriod { get => _iterationPeriod; set => _iterationPeriod = value.Max(0.0001f); }
|
||||
public int IterationPerStep { get; set => field = value < 1 ? 1 : value; } = 1;
|
||||
public float IterationPeriod { get; set => field = value.Max(0.0001f); } = 1f / 60f;
|
||||
|
||||
public RaycastResult? Raycast(Ray2D ray, float length = float.MaxValue)
|
||||
{
|
||||
|
||||
@@ -14,9 +14,6 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
|
||||
|
||||
private readonly List<IRigidBody2D> rigidBodies = new(32);
|
||||
private readonly List<ICollider2D> colliders = new(64);
|
||||
|
||||
private int _iterationCount = 1;
|
||||
|
||||
private readonly ICollisionDetector2D collisionDetector = null!;
|
||||
private readonly ICollisionResolver2D collisionResolver = null!;
|
||||
private readonly IRaycastResolver2D raycastResolver = null!;
|
||||
@@ -27,7 +24,7 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
|
||||
private readonly ListPool<IPhysicsIteration> physicsIterationPool = new();
|
||||
private readonly ListPool<IPostPhysicsUpdate> postPhysicsUpdatePool = new();
|
||||
|
||||
public int IterationPerStep { get => _iterationCount; set => _iterationCount = value < 1 ? 1 : value; }
|
||||
public int IterationPerStep { get; set => field = value.Max(1); } = 1;
|
||||
|
||||
public void AddRigidBody(IRigidBody2D rigidBody)
|
||||
{
|
||||
|
||||
@@ -5,7 +5,6 @@ namespace Engine.Physics2D;
|
||||
public class RigidBody2D : Behaviour2D, IRigidBody2D
|
||||
{
|
||||
private const float LOWEST_ALLOWED_MASS = 0.00001f;
|
||||
private float _mass = 1f;
|
||||
|
||||
public IPhysicsMaterial2D Material { get; set; } = new PhysicsMaterial2DDefault();
|
||||
|
||||
@@ -13,5 +12,5 @@ public class RigidBody2D : Behaviour2D, IRigidBody2D
|
||||
public float AngularVelocity { get; set; } = 0f;
|
||||
public bool IsStatic { get; set; } = false;
|
||||
|
||||
public float Mass { get => _mass; set => _mass = Core.Math.Max(value, LOWEST_ALLOWED_MASS); }
|
||||
public float Mass { get; set => field = Math.Max(value, LOWEST_ALLOWED_MASS); } = 1f;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>Engine.Systems</RootNamespace>
|
||||
|
||||
@@ -2,9 +2,9 @@ using System.Collections.Generic;
|
||||
|
||||
using Engine.Core;
|
||||
|
||||
namespace Engine.Integration.MonoGame;
|
||||
namespace Engine.Systems.Graphics;
|
||||
|
||||
public class DrawableShape : Behaviour2D, IDrawableTriangle, IPreDraw
|
||||
public class DrawableShape2D : Behaviour2D, IDrawableTriangle, IPreDraw
|
||||
{
|
||||
private readonly Shape2D shape = new([]);
|
||||
private readonly List<Triangle> worldTriangles = [];
|
||||
@@ -23,7 +23,7 @@ public class DrawableShape : Behaviour2D, IDrawableTriangle, IPreDraw
|
||||
|
||||
protected void UpdateWorldShape() => shape.Transform(Transform, worldShape);
|
||||
|
||||
public DrawableShape() => shape = Shape2D.Triangle;
|
||||
public DrawableShape(Shape2D shape) => this.shape = shape;
|
||||
public DrawableShape(Shape2D shape, ColorRGB color) { this.shape = shape; this.color = color; }
|
||||
public DrawableShape2D() => shape = Shape2D.Triangle;
|
||||
public DrawableShape2D(Shape2D shape) => this.shape = shape;
|
||||
public DrawableShape2D(Shape2D shape, ColorRGB color) { this.shape = shape; this.color = color; }
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
using Engine.Core;
|
||||
|
||||
namespace Engine.Integration.MonoGame;
|
||||
namespace Engine.Systems.Graphics;
|
||||
|
||||
public interface IDrawableTriangle : IBehaviour
|
||||
{
|
||||
10
Engine.Systems/Graphics/ITriangleBatch.cs
Normal file
10
Engine.Systems/Graphics/ITriangleBatch.cs
Normal file
@@ -0,0 +1,10 @@
|
||||
using Engine.Core;
|
||||
|
||||
namespace Engine.Systems.Graphics;
|
||||
|
||||
public interface ITriangleBatch
|
||||
{
|
||||
void Begin(Matrix4x4? view = null, Matrix4x4? projection = null);
|
||||
void Draw(Triangle triangle, ColorRGBA colorRGBA);
|
||||
void End();
|
||||
}
|
||||
38
Engine.Systems/Graphics/TriangleBatcher.cs
Normal file
38
Engine.Systems/Graphics/TriangleBatcher.cs
Normal file
@@ -0,0 +1,38 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Engine.Core;
|
||||
|
||||
namespace Engine.Systems.Graphics;
|
||||
|
||||
public class TriangleBatcher : Behaviour, IFirstFrameUpdate, ILastFrameUpdate, IDraw
|
||||
{
|
||||
private static Comparer<int> SortByAscendingPriority() => Comparer<int>.Create((x, y) => x.CompareTo(y));
|
||||
private static System.Func<IBehaviour, int> GetPriority() => (b) => b.Priority;
|
||||
|
||||
private readonly BehaviourCollector<ITriangleBatch> triangleBatches = new();
|
||||
private readonly ActiveBehaviourCollectorOrdered<int, IDrawableTriangle> drawableShapes = new(GetPriority(), SortByAscendingPriority());
|
||||
|
||||
public void FirstActiveFrame()
|
||||
{
|
||||
drawableShapes.Assign(Universe);
|
||||
triangleBatches.Assign(Universe);
|
||||
}
|
||||
|
||||
public void Draw()
|
||||
{
|
||||
for (int i = 0; i < triangleBatches.Count; i++)
|
||||
{
|
||||
ITriangleBatch triangleBatch = triangleBatches[i];
|
||||
triangleBatch.Begin();
|
||||
for (int j = 0; j < drawableShapes.Count; j++)
|
||||
drawableShapes[j].Draw(triangleBatch);
|
||||
triangleBatch.End();
|
||||
}
|
||||
}
|
||||
|
||||
public void LastActiveFrame()
|
||||
{
|
||||
triangleBatches.Unassign();
|
||||
drawableShapes.Unassign();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
namespace Engine.Systems.Network;
|
||||
|
||||
public interface INetworkPacketEncrypted : INetworkPacket;
|
||||
@@ -0,0 +1,6 @@
|
||||
namespace Engine.Systems.Network;
|
||||
|
||||
public interface IPacketListenerClientEntity<T> : INetworkEntity where T : IEntityNetworkPacket
|
||||
{
|
||||
void OnEntityClientPacketArrived(IConnection sender, T packet);
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
namespace Engine.Systems.Network;
|
||||
|
||||
public interface IPacketListenerServerEntity<T> : INetworkEntity where T : IEntityNetworkPacket
|
||||
{
|
||||
void OnEntityServerPacketArrived(IConnection sender, T packet);
|
||||
}
|
||||
16
Engine.Systems/Network/ClientBehaviour.cs
Normal file
16
Engine.Systems/Network/ClientBehaviour.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
using Engine.Core;
|
||||
|
||||
namespace Engine.Systems.Network;
|
||||
|
||||
/// <summary>
|
||||
/// Basic client behaviour that finds the <see cref="INetworkCommunicatorClient"/> in the universe in it's first active frame.
|
||||
/// <br/>
|
||||
/// Disclaimer: It implements <see cref="IFirstFrameUpdate"/> and <see cref="ILastFrameUpdate"/> in virtual methods.
|
||||
/// </summary>
|
||||
public class ClientBehaviour : Behaviour, IFirstFrameUpdate, ILastFrameUpdate
|
||||
{
|
||||
public INetworkCommunicatorClient Client { get; private set; } = null!;
|
||||
|
||||
public virtual void FirstActiveFrame() => Client = Universe.FindRequiredBehaviour<INetworkCommunicatorClient>();
|
||||
public virtual void LastActiveFrame() => Client = null!;
|
||||
}
|
||||
21
Engine.Systems/Network/Hasher.cs
Normal file
21
Engine.Systems/Network/Hasher.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
namespace Engine.Systems.Network;
|
||||
|
||||
public static class Hasher
|
||||
{
|
||||
public static long FNV1a(string name)
|
||||
{
|
||||
const long fnvPrime = 1099511628211;
|
||||
long result = 1469598103934665603;
|
||||
|
||||
unchecked
|
||||
{
|
||||
foreach (char c in name)
|
||||
{
|
||||
result ^= c;
|
||||
result *= fnvPrime;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -10,99 +10,206 @@ namespace Engine.Systems.Network;
|
||||
/// <summary>
|
||||
/// Intermediary manager that looks up in it's hierarchy for a <see cref="INetworkCommunicator"/> to route/broadcast it's received packets to their destinations.
|
||||
/// </summary>
|
||||
/// TODO: I need to peer check this class, I don't exactly remember the state I was in when I was originally writing it and left it uncommented and the current comments are added later on.
|
||||
/// It's a fairly complex manager that relies heavily on Reflection and lots of generic method delegation which is making it very hard to read back.
|
||||
public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetworkManager
|
||||
{
|
||||
private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientPacketArrivalMethods = [];
|
||||
private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverPacketArrivalMethods = [];
|
||||
#region Packet Router/Broadcaster to Listener Delegates
|
||||
|
||||
private readonly Dictionary<Type, Dictionary<string, object>> clientPacketRouters = [];
|
||||
private readonly Dictionary<Type, Dictionary<string, object>> serverPacketRouters = [];
|
||||
/// <summary>
|
||||
/// Behaviour Type → Packet Type → List of <see cref="IPacketListenerClient{T}"/> listener methods (broadcast packets, client-side)
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientBroadcastPacketListenerMethods = [];
|
||||
|
||||
private readonly List<(Type packetType, Delegate @delegate)> packetRetrievalDelegates = [];
|
||||
/// <summary>
|
||||
/// Behaviour Type → Packet Type → List of <see cref="IPacketListenerServer{T}"/> listener methods (broadcast packets, server-side)
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverBroadcastPacketListenerMethods = [];
|
||||
|
||||
/// <summary>
|
||||
/// Behaviour Type → Packet Type → List of <see cref="IPacketListenerClientEntity{T}"/> listener methods (entity packets, client-side)
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> clientEntityPacketListenerMethods = [];
|
||||
|
||||
/// <summary>
|
||||
/// Behaviour Type → Packet Type → List of <see cref="IPacketListenerServerEntity{T}"/> listener methods (entity packets, server-side)
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, Dictionary<Type, List<MethodInfo>>> serverEntityPacketListenerMethods = [];
|
||||
|
||||
#endregion
|
||||
|
||||
#region Packet Router/Broadcaster Events
|
||||
|
||||
/// <summary>
|
||||
/// Packet Type → Behaviour.Id → Broadcaster Event (broadcast, client-side)
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, Dictionary<string, object>> clientPacketBroadcastEvents = [];
|
||||
|
||||
/// <summary>
|
||||
/// Packet Type → Behaviour.Id → Broadcaster Event (broadcast, server-side)
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, Dictionary<string, object>> serverPacketBroadcastEvents = [];
|
||||
|
||||
/// <summary>
|
||||
/// Maps an <see cref="IEntityNetworkPacket"/> type to a set of routing events,
|
||||
/// keyed by <see cref="IIdentifiable.Id"/>, for CLIENT entity listeners.
|
||||
/// The packet is routed to the correct <see cref="INetworkEntity"/> instance
|
||||
/// by matching <see cref="IEntityNetworkPacket.EntityId"/>.
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, Dictionary<string, object>> clientEntityPacketRouterEvents = [];
|
||||
|
||||
/// <summary>
|
||||
/// Maps an <see cref="IEntityNetworkPacket"/> type to a set of routing events,
|
||||
/// keyed by <see cref="IIdentifiable.Id"/>, for SERVER entity listeners.
|
||||
/// The packet is routed to the correct <see cref="INetworkEntity"/> instance
|
||||
/// by matching <see cref="IEntityNetworkPacket.EntityId"/>.
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, Dictionary<string, object>> serverEntityPacketRouterEvents = [];
|
||||
|
||||
#endregion
|
||||
|
||||
#region Packet Retrieval Delegates
|
||||
|
||||
/// <summary>
|
||||
/// Stores delegates that connect incoming broadcast packets from <see cref="INetworkCommunicator"/>
|
||||
/// to <see cref="OnPacketReceived{T}(IConnection, T)"/>.
|
||||
/// These are used to subscribe/unsubscribe from <see cref="INetworkCommunicator"/> events.
|
||||
/// </summary>
|
||||
private readonly List<PacketRetrievalDelegatePair> broadcastPacketRetrievalSubscriptionDelegates = [];
|
||||
|
||||
/// <summary>
|
||||
/// Stores delegates that connect incoming entity packets from <see cref="INetworkCommunicator"/>
|
||||
/// to <see cref="OnPacketReceived{T}(IConnection, T)"/>.
|
||||
/// These are used to subscribe/unsubscribe from <see cref="INetworkCommunicator"/> events.
|
||||
/// </summary>
|
||||
private readonly List<PacketRetrievalDelegatePair> entityPacketRetrievalSubscriptionDelegates = [];
|
||||
|
||||
/// <summary>
|
||||
/// Stores delegates that connect incoming all packets from <see cref="INetworkCommunicator"/> to
|
||||
/// <see cref="OnPacketReceived{T}(IConnection, T)"/>. This is a combination of all subscription
|
||||
/// delegates filtered so there are no duplicates packet entries.
|
||||
/// </summary>
|
||||
private readonly List<PacketRetrievalDelegatePair> uniqueRetrievalSubscriptionDelegates = [];
|
||||
|
||||
#endregion
|
||||
|
||||
#region Method Caches
|
||||
|
||||
/// <summary>
|
||||
/// Packet type → <see cref="ClearRouter{T}(object)"/> method.
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, MethodInfo> clearRoutesMethods = [];
|
||||
private readonly Dictionary<Type, MethodInfo> registerPacketListenersMethods = [];
|
||||
|
||||
/// <summary>
|
||||
/// Packet type → <see cref="RegisterBroadcastPacketListenerEvent{T}(INetworkEntity, Event{IConnection, T}, NetworkType)"/> method.
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, MethodInfo> registerBroadcastPacketListenersMethods = [];
|
||||
|
||||
/// <summary>
|
||||
/// Packet type → <see cref="RegisterEntityPacketListenerEvent{T}(INetworkEntity, Event{IConnection, T}, NetworkType)"/> method.
|
||||
/// </summary>
|
||||
private readonly Dictionary<Type, MethodInfo> registerEntityPacketListenersMethods = [];
|
||||
|
||||
#endregion
|
||||
|
||||
#region Network Entity Collector
|
||||
|
||||
/// <summary>
|
||||
/// All active network <see cref="INetworkEntity"/>, keyed by <see cref="IIdentifiable.Id"/>.
|
||||
/// </summary>
|
||||
private readonly Dictionary<string, INetworkEntity> _networkEntities = [];
|
||||
public IReadOnlyDictionary<string, INetworkEntity> NetworkEntities => _networkEntities;
|
||||
|
||||
/// <summary>
|
||||
/// Collector responsible for detecting <see cref="INetworkEntity"/>s entering/leaving the universe.
|
||||
/// </summary>
|
||||
private readonly BehaviourCollector<INetworkEntity> _networkEntityCollector = new();
|
||||
|
||||
public IBehaviourCollector<INetworkEntity> NetworkEntityCollector => _networkEntityCollector;
|
||||
|
||||
private INetworkCommunicator _networkCommunicator = null!;
|
||||
public INetworkCommunicator NetworkCommunicator
|
||||
{
|
||||
get => _networkCommunicator;
|
||||
set
|
||||
{
|
||||
if (_networkCommunicator == value)
|
||||
return;
|
||||
|
||||
INetworkCommunicator? previousCommunicator = _networkCommunicator;
|
||||
_networkCommunicator = value;
|
||||
|
||||
if (previousCommunicator is not null) UnsubscribeCommunicatorMethods(previousCommunicator);
|
||||
if (_networkCommunicator is not null) SubscribeCommunicatorMethods(_networkCommunicator);
|
||||
}
|
||||
}
|
||||
|
||||
#region Communicator Subscriptions
|
||||
private void SubscribeCommunicatorMethods(INetworkCommunicator networkCommunicator)
|
||||
{
|
||||
MethodInfo subscribeToPacketsMethod = typeof(INetworkCommunicator)
|
||||
.GetMethod(nameof(INetworkCommunicator.SubscribeToPackets), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
|
||||
|
||||
foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
|
||||
{
|
||||
MethodInfo genericSubscribeMethod = subscribeToPacketsMethod.MakeGenericMethod(packetType);
|
||||
genericSubscribeMethod.Invoke(networkCommunicator, [@delegate]);
|
||||
}
|
||||
}
|
||||
|
||||
private void UnsubscribeCommunicatorMethods(INetworkCommunicator networkCommunicator)
|
||||
{
|
||||
MethodInfo unsubscribeFromPacketsMethod = typeof(INetworkCommunicator)
|
||||
.GetMethod(nameof(INetworkCommunicator.UnsubscribeFromPackets), BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
|
||||
|
||||
foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
|
||||
{
|
||||
MethodInfo genericUnsubscribeMethod = unsubscribeFromPacketsMethod.MakeGenericMethod(packetType);
|
||||
genericUnsubscribeMethod.Invoke(networkCommunicator, [@delegate]);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Packet Routing
|
||||
#region Network Communicator
|
||||
|
||||
public INetworkCommunicator NetworkCommunicator
|
||||
{
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (field == value)
|
||||
return;
|
||||
|
||||
INetworkCommunicator? previousCommunicator = field;
|
||||
field = value;
|
||||
|
||||
// Unsubscribe packet delegates from old communicator
|
||||
if (previousCommunicator is not null)
|
||||
InvokeCommunicatorMethods(nameof(INetworkCommunicator.UnsubscribeFromPackets), previousCommunicator);
|
||||
|
||||
// Subscribe packet delegates to new communicator
|
||||
if (field is not null)
|
||||
InvokeCommunicatorMethods(nameof(INetworkCommunicator.SubscribeToPackets), field);
|
||||
}
|
||||
} = null!;
|
||||
|
||||
/// <summary>
|
||||
/// Dynamically invokes <see cref="INetworkCommunicator.SubscribeToPackets{T}(Event{IConnection, T}.EventHandler)"/>
|
||||
/// or <see cref="INetworkCommunicator.UnsubscribeFromPackets{T}(Event{IConnection, T}.EventHandler)"/>
|
||||
/// on the provided <see cref="INetworkCommunicator"/> for all known packet types.
|
||||
/// </summary>
|
||||
private void InvokeCommunicatorMethods(string methodName, INetworkCommunicator networkCommunicator)
|
||||
{
|
||||
MethodInfo unsubscribeFromPacketsMethod = typeof(INetworkCommunicator)
|
||||
.GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!;
|
||||
|
||||
foreach ((Type packetType, Delegate @delegate) in uniqueRetrievalSubscriptionDelegates)
|
||||
{
|
||||
MethodInfo genericMethod = unsubscribeFromPacketsMethod.MakeGenericMethod(packetType);
|
||||
genericMethod.Invoke(networkCommunicator, [@delegate]);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
|
||||
#region Packet Routing/Broadcasting
|
||||
|
||||
/// <summary>
|
||||
/// Entry point for ALL incoming packets from the <see cref="NetworkCommunicator"/>.
|
||||
/// </summary>
|
||||
private void OnPacketReceived<T>(IConnection sender, T entityDataPacket)
|
||||
{
|
||||
BroadcastPacket(sender, entityDataPacket);
|
||||
|
||||
if (entityDataPacket is IEntityNetworkPacket entityPacket)
|
||||
RoutePacket(sender, entityDataPacket, entityPacket);
|
||||
else
|
||||
BroadcastPacket(sender, entityDataPacket);
|
||||
}
|
||||
|
||||
private void RoutePacket<T>(IConnection sender, T entityDataPacket, IEntityNetworkPacket entityPacket)
|
||||
{
|
||||
if (NetworkCommunicator is INetworkCommunicatorClient)
|
||||
RoutePacket(clientPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
|
||||
RoutePacket(clientEntityPacketRouterEvents, entityPacket.EntityId, sender, entityDataPacket);
|
||||
|
||||
if (NetworkCommunicator is INetworkCommunicatorServer)
|
||||
RoutePacket(serverPacketRouters, entityPacket.EntityId, sender, entityDataPacket);
|
||||
RoutePacket(serverEntityPacketRouterEvents, entityPacket.EntityId, sender, entityDataPacket);
|
||||
}
|
||||
|
||||
private void BroadcastPacket<T>(IConnection sender, T entityDataPacket)
|
||||
{
|
||||
if (NetworkCommunicator is INetworkCommunicatorClient)
|
||||
BroadcastPacket(clientPacketRouters, sender, entityDataPacket);
|
||||
BroadcastPacket(clientPacketBroadcastEvents, sender, entityDataPacket);
|
||||
|
||||
if (NetworkCommunicator is INetworkCommunicatorServer)
|
||||
BroadcastPacket(serverPacketRouters, sender, entityDataPacket);
|
||||
BroadcastPacket(serverPacketBroadcastEvents, sender, entityDataPacket);
|
||||
}
|
||||
|
||||
private static void BroadcastPacket<T>(
|
||||
Dictionary<Type, Dictionary<string, object>> packetRouters,
|
||||
private void BroadcastPacket<T>(
|
||||
Dictionary<Type, Dictionary<string, object>> packetBroadcasters,
|
||||
IConnection sender,
|
||||
T entityDataPacket)
|
||||
{
|
||||
if (!packetRouters.TryGetValue(entityDataPacket!.GetType(), out Dictionary<string, object>? routers))
|
||||
if (!packetBroadcasters.TryGetValue(entityDataPacket!.GetType(), out Dictionary<string, object>? routers))
|
||||
return;
|
||||
|
||||
foreach ((string behaviourId, object routerEventReference) in routers)
|
||||
@@ -112,7 +219,7 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
|
||||
}
|
||||
}
|
||||
|
||||
private static void RoutePacket<T>(
|
||||
private void RoutePacket<T>(
|
||||
Dictionary<Type, Dictionary<string, object>> packetRouters,
|
||||
string entityId,
|
||||
IConnection sender,
|
||||
@@ -127,65 +234,114 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
|
||||
Event<IConnection, T> routerEvent = (Event<IConnection, T>)routerEventReference;
|
||||
routerEvent.Invoke(sender, entityDataPacket!);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Packet Routers
|
||||
|
||||
/// <summary>
|
||||
/// Registers routing events for the behaviour based on cached packet listener methods.
|
||||
/// </summary>
|
||||
private void RegisterPacketRoutersFor(
|
||||
INetworkEntity behaviour,
|
||||
Dictionary<Type, Dictionary<string, object>> packetRouters,
|
||||
Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods,
|
||||
NetworkType networkType)
|
||||
Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetListenerMethods,
|
||||
NetworkType networkType,
|
||||
Dictionary<Type, MethodInfo> registerPacketListenerListenersMethods)
|
||||
{
|
||||
if (!packetArrivalMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? arrivalMethods))
|
||||
if (!packetListenerMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? listenerMethods))
|
||||
return;
|
||||
|
||||
foreach ((Type packetType, List<MethodInfo> methods) in arrivalMethods)
|
||||
foreach (MethodInfo receiveMethod in methods)
|
||||
foreach (Type packetType in listenerMethods.Keys)
|
||||
{
|
||||
if (!packetRouters.TryGetValue(packetType, out Dictionary<string, object>? routers))
|
||||
{
|
||||
if (!packetRouters.TryGetValue(packetType, out Dictionary<string, object>? routers))
|
||||
{
|
||||
routers = [];
|
||||
packetRouters.Add(packetType, routers);
|
||||
}
|
||||
|
||||
object packetListenerEvent = CreateEventAndRegister(packetType, behaviour, networkType);
|
||||
routers.Add(behaviour.Id, packetListenerEvent);
|
||||
routers = [];
|
||||
packetRouters.Add(packetType, routers);
|
||||
}
|
||||
|
||||
object packetListenerEvent = CreateEventAndRegister(packetType, behaviour, networkType, registerPacketListenerListenersMethods);
|
||||
|
||||
routers.Add(behaviour.Id, packetListenerEvent);
|
||||
}
|
||||
}
|
||||
|
||||
private object CreateEventAndRegister(Type packetType, INetworkEntity behaviour, NetworkType networkType)
|
||||
/// <summary>
|
||||
/// Creates an Event<IConnection, TPacket> and attaches listener callbacks.
|
||||
/// </summary>
|
||||
private object CreateEventAndRegister(
|
||||
Type packetType,
|
||||
INetworkEntity behaviour,
|
||||
NetworkType networkType,
|
||||
Dictionary<Type, MethodInfo> registerPacketListenersMethods)
|
||||
{
|
||||
Type genericEventType = typeof(Event<,>).MakeGenericType(typeof(IConnection), packetType);
|
||||
object packetListenerEvent = Activator.CreateInstance(genericEventType)!;
|
||||
|
||||
if (!registerPacketListenersMethods.TryGetValue(packetType, out MethodInfo? registerPacketListenerMethod))
|
||||
throw new($"{nameof(RegisterPacketListenerEvent)} for {packetType.Name} has not been cached.");
|
||||
throw new($"Packet Listener Events for {packetType.Name} has not been cached.");
|
||||
|
||||
registerPacketListenerMethod.Invoke(this, [behaviour, packetListenerEvent, networkType]);
|
||||
return packetListenerEvent;
|
||||
}
|
||||
|
||||
private static void RegisterPacketListenerEvent<T>(
|
||||
/// <summary>
|
||||
/// Registers broadcast packet listeners on the behaviour.
|
||||
/// </summary>
|
||||
private static void RegisterBroadcastPacketListenerEvent<T>(
|
||||
INetworkEntity behaviour,
|
||||
Event<IConnection, T> packetListenerEvent,
|
||||
NetworkType networkType)
|
||||
{
|
||||
switch (networkType)
|
||||
{
|
||||
case NetworkType.Client: packetListenerEvent.AddListener((sender, packet) => ((IPacketListenerClient<T>)behaviour).OnClientPacketArrived(sender, packet)); break;
|
||||
case NetworkType.Server: packetListenerEvent.AddListener((sender, packet) => ((IPacketListenerServer<T>)behaviour).OnServerPacketArrived(sender, packet)); break;
|
||||
case NetworkType.Client:
|
||||
packetListenerEvent.AddListener(
|
||||
(sender, packet) => ((IPacketListenerClient<T>)behaviour).OnClientPacketArrived(sender, packet));
|
||||
break;
|
||||
|
||||
case NetworkType.Server:
|
||||
packetListenerEvent.AddListener(
|
||||
(sender, packet) => ((IPacketListenerServer<T>)behaviour).OnServerPacketArrived(sender, packet));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Registers entity-specific packet listeners on a network behaviour.
|
||||
/// </summary>
|
||||
private static void RegisterEntityPacketListenerEvent<T>(
|
||||
INetworkEntity behaviour,
|
||||
Event<IConnection, T> packetListenerEvent,
|
||||
NetworkType networkType
|
||||
) where T : IEntityNetworkPacket
|
||||
{
|
||||
switch (networkType)
|
||||
{
|
||||
case NetworkType.Client:
|
||||
packetListenerEvent.AddListener(
|
||||
(sender, packet) => ((IPacketListenerClientEntity<T>)behaviour).OnEntityClientPacketArrived(sender, packet));
|
||||
break;
|
||||
|
||||
case NetworkType.Server:
|
||||
packetListenerEvent.AddListener(
|
||||
(sender, packet) => ((IPacketListenerServerEntity<T>)behaviour).OnEntityServerPacketArrived(sender, packet));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Unregisters all routing events associated with the behaviour.
|
||||
/// </summary>
|
||||
private void UnregisterPacketRoutersFor(
|
||||
INetworkEntity behaviour,
|
||||
Dictionary<Type, Dictionary<string, object>> packetRouters,
|
||||
Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods)
|
||||
Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetListenerMethods)
|
||||
{
|
||||
if (!packetArrivalMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? arrivalMethods))
|
||||
if (!packetListenerMethods.TryGetValue(behaviour.GetType(), out Dictionary<Type, List<MethodInfo>>? listenerMethods))
|
||||
return;
|
||||
|
||||
foreach ((Type packetType, List<MethodInfo> methods) in arrivalMethods)
|
||||
foreach ((Type packetType, List<MethodInfo> methods) in listenerMethods)
|
||||
{
|
||||
if (!packetRouters.TryGetValue(packetType, out Dictionary<string, object>? routers))
|
||||
continue;
|
||||
@@ -200,6 +356,9 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Clears all listeners from a router event.
|
||||
/// </summary>
|
||||
private static void ClearRouter<T>(object routerEventReference)
|
||||
{
|
||||
Event<IConnection, T> routerEvent = (Event<IConnection, T>)routerEventReference;
|
||||
@@ -209,124 +368,192 @@ public class NetworkManager : Behaviour, IEnterUniverse, IExitUniverse, INetwork
|
||||
#endregion
|
||||
|
||||
#region Engine Callbacks
|
||||
private void OnCollected(IBehaviourCollector<INetworkEntity> sender, IBehaviourCollector<INetworkEntity>.BehaviourCollectedArguments args)
|
||||
|
||||
/// <summary>
|
||||
/// Called when an <see cref="INetworkEntity"/> enters the universe.
|
||||
/// Registers all packet routing for that entity.
|
||||
/// </summary>
|
||||
private void OnCollected(
|
||||
IBehaviourCollector<INetworkEntity> sender,
|
||||
IBehaviourCollector<INetworkEntity>.BehaviourCollectedArguments args)
|
||||
{
|
||||
INetworkEntity collectedBehaviour = args.BehaviourCollected;
|
||||
|
||||
if (!_networkEntities.TryAdd(collectedBehaviour.Id, collectedBehaviour))
|
||||
throw new($"Unable to add {collectedBehaviour.Id} to {nameof(NetworkManager)}");
|
||||
|
||||
RegisterPacketRoutersFor(collectedBehaviour, clientPacketRouters, clientPacketArrivalMethods, NetworkType.Client);
|
||||
RegisterPacketRoutersFor(collectedBehaviour, serverPacketRouters, serverPacketArrivalMethods, NetworkType.Server);
|
||||
RegisterPacketRoutersFor(collectedBehaviour, clientPacketBroadcastEvents, clientBroadcastPacketListenerMethods, NetworkType.Client, registerBroadcastPacketListenersMethods);
|
||||
RegisterPacketRoutersFor(collectedBehaviour, clientEntityPacketRouterEvents, clientEntityPacketListenerMethods, NetworkType.Client, registerEntityPacketListenersMethods);
|
||||
|
||||
RegisterPacketRoutersFor(collectedBehaviour, serverPacketBroadcastEvents, serverBroadcastPacketListenerMethods, NetworkType.Server, registerBroadcastPacketListenersMethods);
|
||||
RegisterPacketRoutersFor(collectedBehaviour, serverEntityPacketRouterEvents, serverEntityPacketListenerMethods, NetworkType.Server, registerEntityPacketListenersMethods);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Called when an <see cref="INetworkEntity"/> is removed from the universe.
|
||||
/// Cleans up all routing.
|
||||
/// </summary>
|
||||
private void OnRemoved(IBehaviourCollector<INetworkEntity> sender, IBehaviourCollector<INetworkEntity>.BehaviourRemovedArguments args)
|
||||
{
|
||||
INetworkEntity removedBehaviour = args.BehaviourRemoved;
|
||||
if (!_networkEntities.Remove(args.BehaviourRemoved.Id))
|
||||
|
||||
if (!_networkEntities.Remove(removedBehaviour.Id))
|
||||
return;
|
||||
|
||||
UnregisterPacketRoutersFor(removedBehaviour, clientPacketRouters, clientPacketArrivalMethods);
|
||||
UnregisterPacketRoutersFor(removedBehaviour, serverPacketRouters, serverPacketArrivalMethods);
|
||||
UnregisterPacketRoutersFor(removedBehaviour, clientPacketBroadcastEvents, clientBroadcastPacketListenerMethods);
|
||||
UnregisterPacketRoutersFor(removedBehaviour, clientEntityPacketRouterEvents, clientEntityPacketListenerMethods);
|
||||
|
||||
UnregisterPacketRoutersFor(removedBehaviour, serverPacketBroadcastEvents, serverBroadcastPacketListenerMethods);
|
||||
UnregisterPacketRoutersFor(removedBehaviour, serverEntityPacketRouterEvents, serverEntityPacketListenerMethods);
|
||||
}
|
||||
|
||||
public void ExitUniverse(IUniverse universe) => _networkEntityCollector.Unassign();
|
||||
|
||||
public void EnterUniverse(IUniverse universe)
|
||||
{
|
||||
_networkEntityCollector.Assign(universe);
|
||||
NetworkCommunicator = BehaviourController.GetRequiredBehaviourInParent<INetworkCommunicator>();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Initialization
|
||||
|
||||
public NetworkManager()
|
||||
{
|
||||
CachePacketRetrievalDelegates();
|
||||
CacheRetrievalSubscriptionDelegates();
|
||||
CacheRegistrationMethods();
|
||||
CachePacketArrivalMethods();
|
||||
CachePacketListenerMethods();
|
||||
|
||||
_networkEntityCollector.OnCollected.AddListener(OnCollected);
|
||||
_networkEntityCollector.OnRemoved.AddListener(OnRemoved);
|
||||
}
|
||||
|
||||
private void CachePacketRetrievalDelegates()
|
||||
/// <summary>
|
||||
/// Caches all retrieval subscription delegates for packets.
|
||||
/// </summary>
|
||||
private void CacheRetrievalSubscriptionDelegates()
|
||||
{
|
||||
IEnumerable<Type> packetTypes = AppDomain.CurrentDomain.GetAssemblies().SelectMany(a => a.GetTypes())
|
||||
.Where(t => typeof(INetworkPacket).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract && !t.IsGenericType);
|
||||
CachePacketRetrievalDelegates(typeof(INetworkPacket), broadcastPacketRetrievalSubscriptionDelegates);
|
||||
CachePacketRetrievalDelegates(typeof(IEntityNetworkPacket), entityPacketRetrievalSubscriptionDelegates);
|
||||
|
||||
MethodInfo onPacketArrivedMethod = GetType()
|
||||
.GetMethod(nameof(OnPacketReceived), BindingFlags.NonPublic | BindingFlags.Instance)!;
|
||||
uniqueRetrievalSubscriptionDelegates.AddRange(broadcastPacketRetrievalSubscriptionDelegates.Concat(entityPacketRetrievalSubscriptionDelegates).DistinctBy(pair => pair.PacketType));
|
||||
}
|
||||
|
||||
foreach (Type packetType in packetTypes)
|
||||
/// <summary>
|
||||
/// Creates delegates for all concrete packet types that forward packets to <see cref="OnPacketReceived{T}(IConnection, T)"/>.
|
||||
/// </summary>
|
||||
private void CachePacketRetrievalDelegates(Type packetType, List<PacketRetrievalDelegatePair> retrievalDelegates)
|
||||
{
|
||||
IEnumerable<Type> packetTypes =
|
||||
AppDomain.CurrentDomain.GetAssemblies()
|
||||
.SelectMany(a => a.GetTypes())
|
||||
.Where(t =>
|
||||
packetType.IsAssignableFrom(t) &&
|
||||
!t.IsInterface &&
|
||||
!t.IsAbstract &&
|
||||
!t.IsGenericType
|
||||
);
|
||||
|
||||
MethodInfo onPacketArrivedMethod = GetType().GetMethod(nameof(OnPacketReceived), BindingFlags.NonPublic | BindingFlags.Instance)!;
|
||||
|
||||
foreach (Type type in packetTypes)
|
||||
{
|
||||
MethodInfo genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(packetType);
|
||||
MethodInfo genericOnPacketArrivedMethod = onPacketArrivedMethod.MakeGenericMethod(type);
|
||||
|
||||
Type genericDelegateType = typeof(Event<,>.EventHandler).MakeGenericType(typeof(IConnection), type);
|
||||
|
||||
Type genericDelegateType = typeof(Event<,>.EventHandler).MakeGenericType(typeof(IConnection), packetType);
|
||||
Delegate genericPacketReceivedDelegate = Delegate.CreateDelegate(genericDelegateType, this, genericOnPacketArrivedMethod);
|
||||
|
||||
packetRetrievalDelegates.Add((packetType, genericPacketReceivedDelegate));
|
||||
retrievalDelegates.Add((type, genericPacketReceivedDelegate));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Caches all registration and cleanup methods for packets.
|
||||
/// </summary>
|
||||
private void CacheRegistrationMethods()
|
||||
{
|
||||
CacheRegistrationMethods(registerPacketListenersMethods, nameof(RegisterPacketListenerEvent));
|
||||
CacheRegistrationMethods(clearRoutesMethods, nameof(ClearRouter));
|
||||
CacheRegistrationMethods(registerBroadcastPacketListenersMethods, nameof(RegisterBroadcastPacketListenerEvent), broadcastPacketRetrievalSubscriptionDelegates);
|
||||
CacheRegistrationMethods(registerEntityPacketListenersMethods, nameof(RegisterEntityPacketListenerEvent), entityPacketRetrievalSubscriptionDelegates);
|
||||
CacheRegistrationMethods(clearRoutesMethods, nameof(ClearRouter), uniqueRetrievalSubscriptionDelegates);
|
||||
}
|
||||
|
||||
private void CacheRegistrationMethods(Dictionary<Type, MethodInfo> registrationMethods, string methodName)
|
||||
/// <summary>
|
||||
/// Creates generic method instances for each packet type listener to be registered into the <see cref="NetworkEntity"/>.
|
||||
/// </summary>
|
||||
private void CacheRegistrationMethods(
|
||||
Dictionary<Type, MethodInfo> listenerRegistrationMethods,
|
||||
string methodName,
|
||||
List<PacketRetrievalDelegatePair> packetRetrievalDelegates)
|
||||
{
|
||||
MethodInfo registerPacketMethod = typeof(NetworkManager).GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Static)!;
|
||||
|
||||
foreach ((Type packetType, Delegate @delegate) in packetRetrievalDelegates)
|
||||
{
|
||||
MethodInfo genericMethod = registerPacketMethod.MakeGenericMethod(packetType);
|
||||
registrationMethods.Add(packetType, genericMethod);
|
||||
listenerRegistrationMethods.TryAdd(packetType, genericMethod);
|
||||
}
|
||||
}
|
||||
|
||||
private void CachePacketArrivalMethods()
|
||||
/// <summary>
|
||||
/// Caches packet listener methods for all packet listener interfaces.
|
||||
/// </summary>
|
||||
private void CachePacketListenerMethods()
|
||||
{
|
||||
CachePacketArrivalMethods(clientPacketArrivalMethods, typeof(IPacketListenerClient<>), nameof(IPacketListenerClient<INetworkEntity>.OnClientPacketArrived));
|
||||
CachePacketArrivalMethods(serverPacketArrivalMethods, typeof(IPacketListenerServer<>), nameof(IPacketListenerServer<INetworkEntity>.OnServerPacketArrived));
|
||||
CachePacketListenerMethods(clientBroadcastPacketListenerMethods, typeof(IPacketListenerClient<>), nameof(IPacketListenerClient<>.OnClientPacketArrived));
|
||||
CachePacketListenerMethods(serverBroadcastPacketListenerMethods, typeof(IPacketListenerServer<>), nameof(IPacketListenerServer<>.OnServerPacketArrived));
|
||||
CachePacketListenerMethods(clientEntityPacketListenerMethods, typeof(IPacketListenerClientEntity<>), nameof(IPacketListenerClientEntity<>.OnEntityClientPacketArrived));
|
||||
CachePacketListenerMethods(serverEntityPacketListenerMethods, typeof(IPacketListenerServerEntity<>), nameof(IPacketListenerServerEntity<>.OnEntityServerPacketArrived));
|
||||
}
|
||||
|
||||
private static void CachePacketArrivalMethods(Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetArrivalMethods, Type listenerType, string packetArrivalMethodName)
|
||||
/// <summary>
|
||||
/// Discovers all types implementing a given packet listener interface and caches their methods.
|
||||
/// </summary>
|
||||
private static void CachePacketListenerMethods(
|
||||
Dictionary<Type, Dictionary<Type, List<MethodInfo>>> packetListenerMethods,
|
||||
Type listenerType,
|
||||
string packetListenerMethodName)
|
||||
{
|
||||
foreach (Type listenerClass in GetGenericsWith(listenerType))
|
||||
{
|
||||
Dictionary<Type, List<MethodInfo>> packetRouters = [];
|
||||
packetArrivalMethods.Add(listenerClass, packetRouters);
|
||||
Dictionary<Type, List<MethodInfo>> listenerMethodDictionary = [];
|
||||
packetListenerMethods.Add(listenerClass, listenerMethodDictionary);
|
||||
|
||||
foreach (Type packetListener in GetGenericInterfacesWith(listenerType, listenerClass))
|
||||
{
|
||||
Type packetType = packetListener.GetGenericArguments().First();
|
||||
|
||||
List<MethodInfo> arrivalMethods = packetListener
|
||||
.GetMethods()
|
||||
.Where(m => m.Name == packetArrivalMethodName)
|
||||
.ToList();
|
||||
List<MethodInfo> listenerMethods = [.. packetListener.GetMethods().Where(m => m.Name == packetListenerMethodName)];
|
||||
|
||||
packetRouters.Add(packetType, arrivalMethods);
|
||||
listenerMethodDictionary.Add(packetType, listenerMethods);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Finds all types that implement a generic interface.
|
||||
/// </summary>
|
||||
private static IEnumerable<Type> GetGenericsWith(Type type)
|
||||
=> AppDomain.CurrentDomain
|
||||
.GetAssemblies()
|
||||
.SelectMany(a =>
|
||||
a.GetTypes().Where(
|
||||
t => t.GetInterfaces().Any(
|
||||
i => i.IsGenericType && i.GetGenericTypeDefinition() == type
|
||||
)
|
||||
)
|
||||
);
|
||||
i => i.IsGenericType && i.GetGenericTypeDefinition() == type)));
|
||||
|
||||
// Gets all generic interfaces of a specific definition on a type
|
||||
private static IEnumerable<Type> GetGenericInterfacesWith(Type interfaceType, Type type)
|
||||
=> type.GetInterfaces().Where(
|
||||
i => i.IsGenericType && i.GetGenericTypeDefinition() == interfaceType
|
||||
);
|
||||
=> type.GetInterfaces().Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == interfaceType);
|
||||
|
||||
#endregion
|
||||
|
||||
// Identifies whether packet routing is client-side or server-side
|
||||
private enum NetworkType { Client, Server }
|
||||
|
||||
private readonly record struct PacketRetrievalDelegatePair(Type PacketType, Delegate Delegate)
|
||||
{
|
||||
public static implicit operator (Type packetType, Delegate @delegate)(PacketRetrievalDelegatePair value) => (value.PacketType, value.Delegate);
|
||||
public static implicit operator PacketRetrievalDelegatePair((Type packetType, Delegate @delegate) value) => new(value.packetType, value.@delegate);
|
||||
}
|
||||
}
|
||||
|
||||
16
Engine.Systems/Network/ServerBehaviour.cs
Normal file
16
Engine.Systems/Network/ServerBehaviour.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
using Engine.Core;
|
||||
|
||||
namespace Engine.Systems.Network;
|
||||
|
||||
/// <summary>
|
||||
/// Basic server behaviour that finds the <see cref="INetworkCommunicatorServer"/> in the universe in it's first active frame.
|
||||
/// <br/>
|
||||
/// Disclaimer: It implements <see cref="IFirstFrameUpdate"/> and <see cref="ILastFrameUpdate"/> in virtual methods.
|
||||
/// </summary>
|
||||
public class ServerBehaviour : Behaviour, IFirstFrameUpdate, ILastFrameUpdate
|
||||
{
|
||||
public INetworkCommunicatorServer Server { get; private set; } = null!;
|
||||
|
||||
public virtual void FirstActiveFrame() => Server = Universe.FindRequiredBehaviour<INetworkCommunicatorServer>();
|
||||
public virtual void LastActiveFrame() => Server = null!;
|
||||
}
|
||||
@@ -2,26 +2,14 @@ namespace Engine.Systems.Network;
|
||||
|
||||
public static class TypeHasher<T>
|
||||
{
|
||||
private static long _fnv1a = 0;
|
||||
public static long FNV1a
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_fnv1a == 0)
|
||||
unchecked
|
||||
{
|
||||
const long fnvPrime = 1099511628211;
|
||||
_fnv1a = 1469598103934665603;
|
||||
if (field == 0)
|
||||
field = Hasher.FNV1a(typeof(T).FullName ?? typeof(T).Name);
|
||||
|
||||
string typeName = typeof(T).FullName ?? typeof(T).Name;
|
||||
foreach (char c in typeName)
|
||||
{
|
||||
_fnv1a ^= c;
|
||||
_fnv1a *= fnvPrime;
|
||||
}
|
||||
}
|
||||
|
||||
return _fnv1a;
|
||||
return field;
|
||||
}
|
||||
}
|
||||
} = 0;
|
||||
}
|
||||
|
||||
@@ -14,23 +14,22 @@ public class State : BaseEntity, IState
|
||||
|
||||
private readonly List<StateTransition> transitions = [];
|
||||
private readonly Dictionary<string, StateTransition> possibleTransitions = [];
|
||||
private string _name = "Default State Name";
|
||||
|
||||
public IReadOnlyList<StateTransition> Transitions => transitions;
|
||||
public IReadOnlyDictionary<string, StateTransition> PossibleTransitions => possibleTransitions;
|
||||
public string Name
|
||||
{
|
||||
get => _name;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (_name.CompareTo(value) == 0)
|
||||
if (field.CompareTo(value) == 0)
|
||||
return;
|
||||
|
||||
string previousName = _name;
|
||||
_name = value;
|
||||
string previousName = field;
|
||||
field = value;
|
||||
OnNameChanged?.Invoke(this, new(previousName));
|
||||
}
|
||||
}
|
||||
} = "Default State Name";
|
||||
|
||||
public void RemoveTransition(string name)
|
||||
{
|
||||
|
||||
@@ -10,20 +10,19 @@ public abstract class StateBehaviourBase : Behaviour, IState
|
||||
public Event<IState, IState.StateTransitionReadyArguments> OnStateTransitionReady { get; } = new();
|
||||
public Event<INameable, INameable.NameChangedArguments> OnNameChanged { get; } = new();
|
||||
|
||||
private string _name = string.Empty;
|
||||
public string Name
|
||||
{
|
||||
get => _name;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (_name.CompareTo(value) == 0)
|
||||
if (field.CompareTo(value) == 0)
|
||||
return;
|
||||
|
||||
string previousName = _name;
|
||||
_name = value;
|
||||
string previousName = field;
|
||||
field = value;
|
||||
OnNameChanged?.Invoke(this, new(previousName));
|
||||
}
|
||||
}
|
||||
} = string.Empty;
|
||||
|
||||
protected virtual void OnUpdateState() { }
|
||||
public void Update()
|
||||
|
||||
@@ -9,33 +9,26 @@ public class StateMachine : Behaviour, IUpdate
|
||||
|
||||
private readonly Event<IState, IState.StateTransitionReadyArguments>.EventHandler delegateOnStateTransitionReady = null!;
|
||||
|
||||
private IState _state = new State();
|
||||
|
||||
public StateMachine()
|
||||
{
|
||||
delegateOnStateTransitionReady = OnStateTransitionReady;
|
||||
}
|
||||
|
||||
[Serialize]
|
||||
public IState State
|
||||
{
|
||||
get => _state;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (_state == value)
|
||||
if (field == value)
|
||||
return;
|
||||
|
||||
IState previousState = _state;
|
||||
IState previousState = field;
|
||||
previousState.OnStateTransitionReady.RemoveListener(delegateOnStateTransitionReady);
|
||||
|
||||
_state = value;
|
||||
field = value;
|
||||
previousState.TransitionFrom(value);
|
||||
value.TransitionTo(_state);
|
||||
value.TransitionTo(field);
|
||||
OnStateChanged?.Invoke(this, new(value, previousState));
|
||||
|
||||
value.OnStateTransitionReady.AddListener(delegateOnStateTransitionReady);
|
||||
}
|
||||
}
|
||||
} = new State();
|
||||
|
||||
private void OnStateTransitionReady(IState sender, IState.StateTransitionReadyArguments args)
|
||||
{
|
||||
@@ -55,5 +48,10 @@ public class StateMachine : Behaviour, IUpdate
|
||||
State.Update();
|
||||
}
|
||||
|
||||
public StateMachine()
|
||||
{
|
||||
delegateOnStateTransitionReady = OnStateTransitionReady;
|
||||
}
|
||||
|
||||
public readonly record struct StateChangedArguments(IState CurrentState, IState PreviousState);
|
||||
}
|
||||
|
||||
@@ -14,18 +14,17 @@ public class Timer : Behaviour, IUpdate, IEnterUniverse, IExitUniverse, ITimer
|
||||
public double StartTime { get; protected set; } = 0f;
|
||||
public float Percentage => (float)(1f - (Remaining / StartTime));
|
||||
|
||||
private double _remaining = 0f;
|
||||
public double Remaining
|
||||
{
|
||||
get => _remaining;
|
||||
get;
|
||||
protected set
|
||||
{
|
||||
if (value < .0f)
|
||||
value = .0f;
|
||||
|
||||
_remaining = value;
|
||||
field = value;
|
||||
}
|
||||
}
|
||||
} = 0f;
|
||||
|
||||
private bool shouldBeTicking = false;
|
||||
private bool hasStartedTickingBefore = false;
|
||||
|
||||
@@ -13,17 +13,18 @@ internal class Tween : ITween
|
||||
public Event<ITween> OnUpdated { get; } = new();
|
||||
public Event<ITween, ITween.TweenDeltaArguments> OnDeltaUpdated { get; } = new();
|
||||
|
||||
private TweenState _state = TweenState.Idle;
|
||||
private float _counter = 0f;
|
||||
|
||||
public TweenState State
|
||||
{
|
||||
get => _state;
|
||||
get;
|
||||
set
|
||||
{
|
||||
if (value == _state)
|
||||
if (value == field)
|
||||
return;
|
||||
|
||||
TweenState previousState = _state;
|
||||
_state = value;
|
||||
TweenState previousState = field;
|
||||
field = value;
|
||||
switch (value)
|
||||
{
|
||||
case TweenState.Completed: OnCompleted?.Invoke(this); OnEnded?.Invoke(this); break;
|
||||
@@ -37,11 +38,10 @@ internal class Tween : ITween
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} = TweenState.Idle;
|
||||
|
||||
public float Duration { get; internal set; } = 1f;
|
||||
public float Progress { get; internal set; } = 0f;
|
||||
private float _counter = 0f;
|
||||
|
||||
public IEasing Easing { get; set; } = EaseLinear.Instance;
|
||||
public float Value => Easing.Evaluate(Progress);
|
||||
|
||||
@@ -2,4 +2,4 @@ using Engine.Core;
|
||||
|
||||
namespace Engine.Systems.Tween;
|
||||
|
||||
public class WaitForTweenCompleteCoroutineYield(ITween tween) : CoroutineYield(() => tween.State == TweenState.Completed);
|
||||
public class WaitForTweenCompleteCoroutineYield(ITween tween) : WaitUntilYield(() => tween.State == TweenState.Completed);
|
||||
|
||||
@@ -2,4 +2,4 @@ using Engine.Core;
|
||||
|
||||
namespace Engine.Systems.Tween;
|
||||
|
||||
public class WaitWhileTweenActiveCoroutineYield(ITween tween) : CoroutineYield(() => tween.State.CheckFlag(TweenState.Completed | TweenState.Cancelled));
|
||||
public class WaitWhileTweenActiveCoroutineYield(ITween tween) : WaitUntilYield(() => tween.State.CheckFlag(TweenState.Completed | TweenState.Cancelled));
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>Engine</RootNamespace>
|
||||
|
||||
Reference in New Issue
Block a user