21 Commits

Author SHA1 Message Date
29a7f5880f feat: transform up, down, left & right properties added 2025-06-09 18:59:15 +03:00
eee3056614 fix: events not having default parameterless constructor 2025-06-09 18:34:20 +03:00
152b0e93db feat: added list pools 2025-06-09 18:33:47 +03:00
3f914fe46f refactor: extracted interface from pool and added events 2025-06-09 18:19:32 +03:00
62b54ee836 feat: event listener counts as constructor parameters 2025-06-09 18:19:08 +03:00
6a41407005 feat: added raycasting support for physics engine 2D 2025-06-09 18:11:20 +03:00
adfa6c6ba0 feat: Vector2D.Reversed property added 2025-06-09 18:04:41 +03:00
a53766f472 fix: forgotten extension method for Line2D.IntersectionPoint 2025-06-09 17:51:34 +03:00
40735c713a feat: added basic pool helper 2025-06-09 17:51:06 +03:00
2054ae3a35 feat: added Ray2D primitive 2025-06-09 16:55:42 +03:00
9066e11c12 perf: simplified Line2D.ClosestPointTo method 2025-06-08 23:40:00 +03:00
f16a7e55c9 chore: fixed record struct arguments' naming 2025-06-08 21:12:16 +03:00
e3b32b3c4a chore: removed unused variables 2025-06-08 21:11:47 +03:00
a02584f3b6 chore: removed DelegateExtensions.InvokeSafe 2025-06-07 18:19:56 +03:00
45524e474e refactor: updated systems to use the update interfaces 2025-06-06 20:26:19 +03:00
fbdea47dc7 docs: updated physics interface delta parameter comment 2025-06-05 23:28:08 +03:00
f5fbd4e5ef feat: IPhysicsIteration interface added 2025-06-05 23:23:34 +03:00
c7f63dc638 refactor: rewritten MonoGameWindow to take in a universe as a constructor parameter 2025-06-04 20:13:01 +03:00
beecefec1c refactor: switched from universe objects to behaviours on all managers like update, draw & physics etc. 2025-06-03 23:59:40 +03:00
24d1a1d764 feat: ISpriteBatch added for MonoGame integration 2025-06-03 23:38:25 +03:00
9edf3b0aa6 feat: one time listeners for events added 2025-06-03 11:43:46 +03:00
33 changed files with 720 additions and 159 deletions

View File

@@ -20,6 +20,26 @@ public interface ITransform2D : IBehaviour
/// </summary>
Event<ITransform2D, RotationChangedArguments> OnRotationChanged { get; }
/// <summary>
/// The <see cref="Vector2D"/> pointing upwards in world space.
/// </summary>
Vector2D Up { get; }
/// <summary>
/// The <see cref="Vector2D"/> pointing upwards in world space.
/// </summary>
Vector2D Down { get; }
/// <summary>
/// The <see cref="Vector2D"/> pointing upwards in world space.
/// </summary>
Vector2D Left { get; }
/// <summary>
/// The <see cref="Vector2D"/> pointing upwards in world space.
/// </summary>
Vector2D Right { get; }
/// <summary>
/// The world position of the <see cref="ITransform2D"/> in 2D space.
/// </summary>

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
namespace Syntriax.Engine.Core;
public class CoroutineManager : UniverseObject
public class CoroutineManager : Behaviour, IUpdate
{
private readonly List<IEnumerator> enumerators = [];
@@ -18,17 +18,7 @@ public class CoroutineManager : UniverseObject
enumerators.Remove(enumerator);
}
protected override void OnEnteringUniverse(IUniverse universe)
{
universe.OnUpdate.AddListener(OnUpdate);
}
protected override void OnExitingUniverse(IUniverse universe)
{
universe.OnUpdate.RemoveListener(OnUpdate);
}
private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments args)
void IUpdate.Update()
{
for (int i = enumerators.Count - 1; i >= 0; i--)
{
@@ -39,4 +29,6 @@ public class CoroutineManager : UniverseObject
enumerators.RemoveAt(i);
}
}
public CoroutineManager() => Priority = int.MinValue;
}

View File

@@ -1,18 +0,0 @@
using System;
namespace Syntriax.Engine.Core;
public static class DelegateExtensions
{
[Obsolete($"{nameof(InvokeSafe)} causes memory allocation, please use Invoke() instead.")]
public static void InvokeSafe(this Delegate @delegate, params object?[] args)
{
foreach (Delegate invocation in Delegate.EnumerateInvocationList(@delegate))
try { invocation.DynamicInvoke(args); }
catch (Exception exception)
{
string methodCallRepresentation = $"{invocation.Method.DeclaringType?.FullName}.{invocation.Method.Name}({string.Join(", ", args)})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
}
}
}

View File

@@ -5,11 +5,14 @@ namespace Syntriax.Engine.Core;
public class Event
{
private readonly List<EventHandler> listeners = new(8);
private readonly List<EventHandler> listeners = null!;
private readonly List<EventHandler> onceListeners = null!;
public void AddListener(EventHandler listener) => listeners.Add(listener);
public void AddOnceListener(EventHandler listener) => onceListeners.Add(listener);
public void RemoveListener(EventHandler listener) => listeners.Remove(listener);
public void Clear() => listeners.Clear();
public void RemoveOnceListener(EventHandler listener) => onceListeners.Remove(listener);
public void Clear() { listeners.Clear(); onceListeners.Clear(); }
public void Invoke()
{
for (int i = 0; i < listeners.Count; i++)
@@ -19,6 +22,29 @@ public class Event
string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}()";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
}
for (int i = onceListeners.Count - 1; i >= 0; i--)
{
try { onceListeners[i].Invoke(); }
catch (Exception exception)
{
string methodCallRepresentation = $"{onceListeners[i].Method.DeclaringType?.FullName}.{onceListeners[i].Method.Name}()";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
}
onceListeners.RemoveAt(i);
}
}
public Event(int initialListenerCount = 4, int initialOnceListenerCount = 2)
{
listeners = new(initialListenerCount);
onceListeners = new(initialOnceListenerCount);
}
public Event()
{
listeners = new(4);
onceListeners = new(2);
}
public delegate void EventHandler();
@@ -26,20 +52,46 @@ public class Event
public class Event<TSender>
{
private readonly List<EventHandler> listeners = new(8);
private readonly List<EventHandler> listeners = null!;
private readonly List<EventHandler> onceListeners = null!;
public void AddListener(EventHandler listener) => listeners.Add(listener);
public void AddOnceListener(EventHandler listener) => onceListeners.Add(listener);
public void RemoveListener(EventHandler listener) => listeners.Remove(listener);
public void Clear() => listeners.Clear();
public void Invoke(TSender argument)
public void RemoveOnceListener(EventHandler listener) => onceListeners.Remove(listener);
public void Clear() { listeners.Clear(); onceListeners.Clear(); }
public void Invoke(TSender sender)
{
for (int i = 0; i < listeners.Count; i++)
try { listeners[i].Invoke(argument); }
try { listeners[i].Invoke(sender); }
catch (Exception exception)
{
string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({argument})";
string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({sender})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
}
for (int i = onceListeners.Count - 1; i >= 0; i--)
{
try { onceListeners[i].Invoke(sender); }
catch (Exception exception)
{
string methodCallRepresentation = $"{onceListeners[i].Method.DeclaringType?.FullName}.{onceListeners[i].Method.Name}({sender})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
}
onceListeners.RemoveAt(i);
}
}
public Event(int initialListenerCount = 4, int initialOnceListenerCount = 2)
{
listeners = new(initialListenerCount);
onceListeners = new(initialOnceListenerCount);
}
public Event()
{
listeners = new(4);
onceListeners = new(2);
}
public delegate void EventHandler(TSender sender);
@@ -47,11 +99,14 @@ public class Event<TSender>
public class Event<TSender, TArguments>
{
private readonly List<EventHandler> listeners = new(8);
private readonly List<EventHandler> listeners = null!;
private readonly List<EventHandler> onceListeners = null!;
public void AddListener(EventHandler listener) => listeners.Add(listener);
public void AddOnceListener(EventHandler listener) => onceListeners.Add(listener);
public void RemoveListener(EventHandler listener) => listeners.Remove(listener);
public void Clear() => listeners.Clear();
public void RemoveOnceListener(EventHandler listener) => onceListeners.Remove(listener);
public void Clear() { listeners.Clear(); onceListeners.Clear(); }
public void Invoke(TSender sender, TArguments args)
{
for (int i = 0; i < listeners.Count; i++)
@@ -61,6 +116,29 @@ public class Event<TSender, TArguments>
string methodCallRepresentation = $"{listeners[i].Method.DeclaringType?.FullName}.{listeners[i].Method.Name}({string.Join(", ", sender, args)})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
}
for (int i = onceListeners.Count - 1; i >= 0; i--)
{
try { onceListeners[i].Invoke(sender, args); }
catch (Exception exception)
{
string methodCallRepresentation = $"{onceListeners[i].Method.DeclaringType?.FullName}.{onceListeners[i].Method.Name}({string.Join(", ", sender, args)})";
Console.WriteLine($"Unexpected exception on invocation of method {methodCallRepresentation}:{Environment.NewLine}{exception.InnerException}");
}
onceListeners.RemoveAt(i);
}
}
public Event(int initialListenerCount = 4, int initialOnceListenerCount = 2)
{
listeners = new(initialListenerCount);
onceListeners = new(initialOnceListenerCount);
}
public Event()
{
listeners = new(4);
onceListeners = new(2);
}
public delegate void EventHandler(TSender sender, TArguments args);

View File

@@ -0,0 +1,10 @@
namespace Syntriax.Engine.Core;
public interface IPool<T>
{
Event<IPool<T>, T> OnRemoved { get; }
Event<IPool<T>, T> OnReturned { get; }
T Get();
void Return(T item);
}

View File

@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
namespace Syntriax.Engine.Core;
public class ListPool<T> : IPool<List<T>>
{
public Event<IPool<List<T>>, List<T>> OnReturned { get; } = new();
public Event<IPool<List<T>>, List<T>> OnRemoved { get; } = new();
private readonly Func<List<T>> generator = null!;
private readonly Queue<List<T>> queue = new();
public List<T> Get()
{
if (!queue.TryDequeue(out List<T>? result))
result = generator();
result.Clear();
OnRemoved?.Invoke(this, result);
return result;
}
public void Return(List<T> list)
{
if (queue.Contains(list))
return;
list.Clear();
queue.Enqueue(list);
OnReturned?.Invoke(this, list);
}
public ListPool(Func<List<T>> generator, int initialCapacity = 1)
{
this.generator = generator;
for (int i = 0; i < initialCapacity; i++)
queue.Enqueue(generator());
}
}

View File

@@ -0,0 +1,38 @@
using System;
using System.Collections.Generic;
namespace Syntriax.Engine.Core;
public class Pool<T> : IPool<T>
{
public Event<IPool<T>, T> OnRemoved { get; } = new();
public Event<IPool<T>, T> OnReturned { get; } = new();
private readonly Func<T> generator = null!;
private readonly Queue<T> queue = new();
public T Get()
{
if (!queue.TryDequeue(out T? result))
result = generator();
OnRemoved?.Invoke(this, result);
return result;
}
public void Return(T item)
{
if (queue.Contains(item))
return;
queue.Enqueue(item);
OnReturned?.Invoke(this, item);
}
public Pool(Func<T> generator, int initialCapacity = 1)
{
this.generator = generator;
for (int i = 0; i < initialCapacity; i++)
queue.Enqueue(generator());
}
}

View File

@@ -167,17 +167,14 @@ public readonly struct Line2D(Vector2D from, Vector2D to)
/// </summary>
public static Vector2D ClosestPointTo(Line2D line, Vector2D point)
{
Vector2D edgeVector = line.From.FromTo(line.To);
Vector2D pointVector = point - line.From;
Vector2D lineRelativeVector = line.From.FromTo(line.To);
float t = (pointVector.X * edgeVector.X + pointVector.Y * edgeVector.Y) / (edgeVector.X * edgeVector.X + edgeVector.Y * edgeVector.Y);
Vector2D lineDirection = lineRelativeVector.Normalized;
Vector2D pointVector = line.From.FromTo(point);
t = Math.Max(0, Math.Min(1, t));
float dot = lineDirection.Dot(pointVector).Clamp(0f, lineRelativeVector.Magnitude);
float closestX = line.From.X + t * edgeVector.X;
float closestY = line.From.Y + t * edgeVector.Y;
return new Vector2D((float)closestX, (float)closestY);
return lineDirection * dot;
}
/// <summary>
@@ -205,6 +202,9 @@ public static class Line2DExtensions
/// <inheritdoc cref="Line2D.Intersects(Line2D, Vector2D)" />
public static bool Intersects(this Line2D line, Vector2D point) => Line2D.Intersects(line, point);
/// <inheritdoc cref="Line2D.IntersectionPoint(Line2D, Line2D)" />
public static Vector2D IntersectionPoint(this Line2D left, Line2D right) => Line2D.IntersectionPoint(left, right);
/// <inheritdoc cref="Line2D.GetT(Line2D, Vector2D)" />
public static float GetT(this Line2D line, Vector2D point) => Line2D.GetT(line, point);
@@ -214,6 +214,9 @@ public static class Line2DExtensions
/// <inheritdoc cref="Line2D.Intersects(Line2D, Line2D, out Vector2D?)" />
public static bool Intersects(this Line2D left, Line2D right, [NotNullWhen(returnValue: true)] out Vector2D? point) => Line2D.Intersects(left, right, out point);
/// <inheritdoc cref="Line2D.ClosestPointTo(Line2D, Vector2D)" />
public static Vector2D ClosestPointTo(this Line2D line, Vector2D point) => Line2D.ClosestPointTo(line, point);
/// <inheritdoc cref="Line2D.ApproximatelyEquals(Line2D, Line2D, float)" />
public static bool ApproximatelyEquals(this Line2D left, Line2D right, float epsilon = float.Epsilon) => Line2D.ApproximatelyEquals(left, right, epsilon);
}

View File

@@ -0,0 +1,66 @@
namespace Syntriax.Engine.Core;
public readonly struct Ray2D(Vector2D Origin, Vector2D Direction)
{
/// <summary>
/// The starting point of the <see cref="Ray2D"/>.
/// </summary>
public readonly Vector2D Origin = Origin;
/// <summary>
/// The direction in which the <see cref="Ray2D"/> points. Should be a normalized vector.
/// </summary>
public readonly Vector2D Direction = Direction;
/// <summary>
/// Gets a <see cref="Ray2D"/> with the same origin but with the direction reversed.
/// </summary>
public readonly Ray2D Reversed => new(Origin, -Direction);
public static implicit operator Ray2D(Line2D line) => new(line.From, line.From.FromTo(line.To).Normalized);
/// <summary>
/// Constructs a <see cref="Line2D"/> from a <see cref="Ray2D"/>, extending from its origin in the <see cref="Ray2D"/>'s direction for a given distance.
/// </summary>
/// <param name="ray">The source <see cref="Ray2D"/>.</param>
/// <param name="distance">The length of the line segment to create from the <see cref="Ray2D"/>.</param>
/// <returns>A <see cref="Line2D"/> representing the segment of the <see cref="Ray2D"/>.</returns>
public static Line2D GetLine(Ray2D ray, float distance)
=> new(ray.Origin, ray.Origin + ray.Direction * distance);
/// <summary>
/// Evaluates the point on the <see cref="Ray2D"/> at a specified distance from its origin.
/// </summary>
/// <param name="ray">The <see cref="Ray2D"/> to evaluate.</param>
/// <param name="distanceFromOrigin">The distance from the origin along the <see cref="Ray2D"/>'s direction.</param>
/// <returns>A <see cref="Vector2D"/> representing the point at the given distance on the <see cref="Ray2D"/>.</returns>
public static Vector2D Evaluate(Ray2D ray, float distanceFromOrigin)
=> ray.Origin + ray.Direction * distanceFromOrigin;
/// <summary>
/// Calculates the closest point on the <see cref="Ray2D"/> to the specified point.
/// </summary>
public static Vector2D ClosestPointTo(Ray2D ray, Vector2D point)
{
Vector2D originToPoint = ray.Origin.FromTo(point);
float dot = ray.Direction.Dot(originToPoint);
return ray.Origin + ray.Direction * dot;
}
}
/// <summary>
/// Provides extension methods for the <see cref="Ray2D"/> struct.
/// </summary>
public static class Ray2DExtensions
{
/// <inheritdoc cref="Ray2D.GetLine(Ray2D, float) />
public static Line2D ToLine(this Ray2D ray, float distance) => Ray2D.GetLine(ray, distance);
/// <inheritdoc cref="Ray2D.Evaluate(Ray2D, float) />
public static Vector2D Evaluate(this Ray2D ray, float distanceFromOrigin) => Ray2D.Evaluate(ray, distanceFromOrigin);
/// <inheritdoc cref="Ray2D.ClosestPointTo(Ray2D, Vector2D) />
public static Vector2D ClosestPointTo(this Ray2D ray, Vector2D point) => Ray2D.ClosestPointTo(ray, point);
}

View File

@@ -31,6 +31,11 @@ public readonly struct Vector2D(float x, float y)
/// </summary>
public float MagnitudeSquared => LengthSquared(this);
/// <summary>
/// Gets a <see cref="Vector2D"/> with the direction reversed.
/// </summary>
public readonly Vector2D Reversed => -this;
/// <summary>
/// The normalized form of the <see cref="Vector2D"/> (a <see cref="Vector2D"/> with the same direction and a magnitude of 1).
/// </summary>

View File

@@ -2,7 +2,7 @@ using System.Collections.Generic;
namespace Syntriax.Engine.Core;
public class DrawManager : UniverseObject
public class DrawManager : Behaviour
{
// We use Descending order because draw calls are running from last to first
private static Comparer<IBehaviour> SortByDescendingPriority() => Comparer<IBehaviour>.Create((x, y) => y.Priority.CompareTo(x.Priority));
@@ -29,7 +29,7 @@ public class DrawManager : UniverseObject
postDrawEntities[i].PostDraw();
}
protected override void OnEnteringUniverse(IUniverse universe)
protected override void OnEnteredUniverse(IUniverse universe)
{
preDrawEntities.Assign(universe);
drawEntities.Assign(universe);
@@ -40,7 +40,7 @@ public class DrawManager : UniverseObject
universe.OnPostDraw.AddListener(OnPostDraw);
}
protected override void OnExitingUniverse(IUniverse universe)
protected override void OnExitedUniverse(IUniverse universe)
{
preDrawEntities.Unassign();
drawEntities.Unassign();

View File

@@ -2,7 +2,7 @@ using System.Collections.Generic;
namespace Syntriax.Engine.Core;
public class UpdateManager : UniverseObject
public class UpdateManager : Behaviour
{
// We use Ascending order because draw calls are running from last to first
private static Comparer<IBehaviour> SortByAscendingPriority() => Comparer<IBehaviour>.Create((x, y) => x.Priority.CompareTo(y.Priority));
@@ -14,7 +14,7 @@ public class UpdateManager : UniverseObject
private readonly List<IFirstFrameUpdate> toCallFirstFrameUpdates = new(32);
protected override void OnEnteringUniverse(IUniverse universe)
protected override void OnEnteredUniverse(IUniverse universe)
{
firstFrameUpdates.Assign(universe);
preUpdateEntities.Assign(universe);
@@ -26,7 +26,7 @@ public class UpdateManager : UniverseObject
universe.OnPostUpdate.AddListener(OnPostUpdate);
}
protected override void OnExitingUniverse(IUniverse universe)
protected override void OnExitedUniverse(IUniverse universe)
{
firstFrameUpdates.Unassign();
preUpdateEntities.Unassign();

View File

@@ -19,6 +19,11 @@ public class Transform2D : Behaviour, ITransform2D
private ITransform2D? parentTransform = null;
public Vector2D Up => Vector2D.Up.Rotate(Rotation * Math.DegreeToRadian);
public Vector2D Down => Vector2D.Down.Rotate(Rotation * Math.DegreeToRadian);
public Vector2D Left => Vector2D.Left.Rotate(Rotation * Math.DegreeToRadian);
public Vector2D Right => Vector2D.Right.Rotate(Rotation * Math.DegreeToRadian);
public Vector2D Position
{
get => _position;

View File

@@ -1,10 +1,8 @@
using Microsoft.Xna.Framework.Graphics;
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Integration.MonoGame;
public interface IDrawableSprite : IBehaviour
{
void Draw(SpriteBatch spriteBatch);
void Draw(ISpriteBatch spriteBatch);
}

View File

@@ -0,0 +1,29 @@
using System.Text;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Integration.MonoGame;
public interface ISpriteBatch
{
void Begin(SpriteSortMode sortMode = SpriteSortMode.Deferred, BlendState? blendState = null, SamplerState? samplerState = null, DepthStencilState? depthStencilState = null, RasterizerState? rasterizerState = null, Effect? effect = null, Matrix? transformMatrix = null);
void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth);
void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth);
void Draw(Texture2D texture, AABB destinationAABB, AABB? sourceAABB, Color color, float rotation, Vector2D origin, SpriteEffects effects, float layerDepth);
void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color);
void Draw(Texture2D texture, AABB destinationAABB, AABB? sourceAABB, Color color);
void Draw(Texture2D texture, Vector2D position, Color color);
void Draw(Texture2D texture, AABB destinationAABB, Color color);
void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color);
void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth);
void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth);
void DrawString(SpriteFont spriteFont, string text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth, bool rtl);
void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color);
void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, float scale, SpriteEffects effects, float layerDepth);
void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth);
void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color, float rotation, Vector2D origin, Vector2D scale, SpriteEffects effects, float layerDepth, bool rtl);
void End();
}

View File

@@ -0,0 +1,64 @@
using System.Text;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Integration.MonoGame;
public class SpriteBatchWrapper(GraphicsDevice graphicsDevice) : ISpriteBatch
{
private readonly SpriteBatch spriteBatch = new(graphicsDevice);
public void Begin(SpriteSortMode sortMode = SpriteSortMode.Deferred, BlendState? blendState = null, SamplerState? samplerState = null, DepthStencilState? depthStencilState = null, RasterizerState? rasterizerState = null, Effect? effect = null, Matrix? transformMatrix = null)
=> spriteBatch.Begin(sortMode, blendState, samplerState, depthStencilState, rasterizerState, effect, transformMatrix);
public void Draw(Texture2D texture, Vector2D position, AABB? 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);
public void Draw(Texture2D texture, Vector2D position, AABB? 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);
public void Draw(Texture2D texture, AABB destinationAABB, AABB? sourceAABB, Color color, float rotation, Vector2D origin, SpriteEffects effects, float layerDepth)
=> spriteBatch.Draw(texture, destinationAABB.ToRectangle(), sourceAABB?.ToRectangle(), color, rotation, origin.ToDisplayVector2(), effects, layerDepth);
public void Draw(Texture2D texture, Vector2D position, AABB? sourceAABB, Color color)
=> spriteBatch.Draw(texture, position.ToDisplayVector2(), sourceAABB?.ToRectangle(), color);
public void Draw(Texture2D texture, AABB destinationAABB, AABB? 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);
public void Draw(Texture2D texture, AABB 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);
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);
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);
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);
public void DrawString(SpriteFont spriteFont, StringBuilder text, Vector2D position, Color color)
=> spriteBatch.DrawString(spriteFont, text, position.ToDisplayVector2(), 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);
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);
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);
public void End()
=> spriteBatch.End();
}

View File

@@ -1,7 +1,5 @@
using System.Collections.Generic;
using Microsoft.Xna.Framework.Graphics;
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Integration.MonoGame;
@@ -9,8 +7,10 @@ namespace Syntriax.Engine.Integration.MonoGame;
public class SpriteBatcher : BehaviourBase, IFirstFrameUpdate, IDraw
{
private static Comparer<IBehaviour> SortByPriority() => Comparer<IBehaviour>.Create((x, y) => y.Priority.CompareTo(x.Priority));
private SpriteBatch spriteBatch = null!;
private ISpriteBatch spriteBatch = null!;
private MonoGameCamera2DBehaviour camera2D = null!;
private readonly ActiveBehaviourCollectorSorted<IDrawableSprite> drawableSprites = new() { SortBy = SortByPriority() };
public void FirstActiveFrame()
@@ -18,7 +18,7 @@ public class SpriteBatcher : BehaviourBase, IFirstFrameUpdate, IDraw
MonoGameWindowContainer windowContainer = Universe.FindRequiredBehaviour<MonoGameWindowContainer>();
camera2D = Universe.FindRequiredBehaviour<MonoGameCamera2DBehaviour>();
spriteBatch = new(windowContainer.Window.GraphicsDevice);
spriteBatch = new SpriteBatchWrapper(windowContainer.Window.GraphicsDevice);
drawableSprites.Unassign();
drawableSprites.Assign(Universe);
}

View File

@@ -13,18 +13,25 @@ public static class EngineConverterExtensions
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static UniverseTime ToEngineTime(this GameTime gameTime) => new(gameTime.TotalGameTime, gameTime.ElapsedGameTime);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vector2D ToVector2D(this Vector2 vector) => new(vector.X, vector.Y);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Color ToColor(this ColorRGBA rgba) => new(rgba.R, rgba.G, rgba.B, rgba.A);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vector2D ToVector2D(this Point point) => new(point.X, point.Y);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vector2 ToVector2(this Vector2D vector) => new(vector.X, vector.Y);
[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()
{
@@ -33,4 +40,13 @@ public static class EngineConverterExtensions
Width = rectangle.Width,
Height = rectangle.Height
};
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Rectangle ToRectangle(this AABB aabb) => new()
{
X = (int)(aabb.LowerBoundary.X * screenScale.X),
Y = (int)(aabb.LowerBoundary.Y * screenScale.Y),
Width = (int)(aabb.UpperBoundary.X - aabb.LowerBoundary.X),
Height = (int)(aabb.UpperBoundary.Y - aabb.LowerBoundary.Y)
};
}

View File

@@ -5,38 +5,31 @@ using Syntriax.Engine.Core;
namespace Syntriax.Engine.Integration.MonoGame;
public abstract class MonoGameWindow : Game
public class MonoGameWindow : Game
{
public GraphicsDeviceManager Graphics { get; protected set; } = null!;
public IUniverse Universe { get; protected set; } = null!;
public ColorRGB BackgroundColor { get; set; } = new ColorRGB(35, 20, 35);
public MonoGameWindow()
public MonoGameWindow(IUniverse? universe = null)
{
Preserver.Preserve();
Graphics = new GraphicsDeviceManager(this);
Content.RootDirectory = "Content";
IsMouseVisible = true;
Universe = new Universe();
Universe = universe ?? new Universe();
Universe.InstantiateUniverseObject().SetUniverseObject("Window Container")
.BehaviourController.AddBehaviour<MonoGameWindowContainer>(this);
}
protected abstract void PopulateUniverse(IUniverse universe);
protected override void Initialize()
{
Universe.Initialize();
Universe.InstantiateUniverseObject().SetUniverseObject("Window Container")
.BehaviourController.AddBehaviour<MonoGameWindowContainer>(this);
PopulateUniverse(Universe);
base.Initialize();
}
protected override void LoadContent()
{
// TODO: use this.Content to load your game content here
}
protected override void Update(GameTime gameTime)
{
Universe.Update(gameTime.ToEngineTime());

View File

@@ -44,7 +44,7 @@ public interface ICollider2D : IBehaviour
void Resolve(CollisionDetectionInformation collisionDetectionInformation);
void Trigger(ICollider2D initiator);
readonly record struct CollisionDetectedArguments(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
readonly record struct CollisionResolvedArguments(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
readonly record struct TriggeredArguments(ICollider2D sender, ICollider2D initiatorCollider);
readonly record struct CollisionDetectedArguments(ICollider2D Sender, CollisionDetectionInformation CollisionDetectionInformation);
readonly record struct CollisionResolvedArguments(ICollider2D Sender, CollisionDetectionInformation CollisionDetectionInformation);
readonly record struct TriggeredArguments(ICollider2D Sender, ICollider2D InitiatorCollider);
}

View File

@@ -1,3 +1,5 @@
using System.Collections.Generic;
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Physics2D;
@@ -35,6 +37,26 @@ public interface IPhysicsEngine2D
/// <param name="deltaTime">The time step.</param>
void StepIndividual(IRigidBody2D rigidBody, float deltaTime);
readonly record struct PhysicsIterationArguments(IPhysicsEngine2D sender, float iterationDeltaTime);
readonly record struct PhysicsStepArguments(IPhysicsEngine2D sender, float stepDeltaTime);
/// <summary>
/// Casts a <see cref="Ray2D"/> into the scene and returns the closest <see cref="RaycastResult"/> it hits, if any.
/// </summary>
/// <param name="ray">The <see cref="Ray2D"/> to cast.</param>
/// <param name="length">The maximum distance to check for intersections. Defaults to <see cref="float.MaxValue"/>.</param>
/// <returns>
/// A <see cref="RaycastResult"/> containing information about the hit, or <see cref="null"/> if no hit was detected.
/// </returns>
RaycastResult? Raycast(Ray2D ray, float length = float.MaxValue);
/// <summary>
/// Casts a <see cref="Ray2D"/> into the scene and stores all hit results in the provided list.
/// </summary>
/// <param name="ray">The <see cref="Ray2D"/> to cast.</param>
/// <param name="results">
/// A list to which all <see cref="RaycastResult"/>s will be added. The list will be populated with zero or more <see cref="RaycastResult"/> objects.
/// </param>
/// <param name="length">The maximum distance to check for intersections. Defaults to <see cref="float.MaxValue"/>.</param>
void Raycast(Ray2D ray, IList<RaycastResult> results, float length = float.MaxValue);
readonly record struct PhysicsIterationArguments(IPhysicsEngine2D Sender, float IterationDeltaTime);
readonly record struct PhysicsStepArguments(IPhysicsEngine2D Sender, float StepDeltaTime);
}

View File

@@ -0,0 +1,23 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Physics2D;
/// <summary>
/// Represents a 2D raycast resolver.
/// </summary>
public interface IRaycastResolver2D
{
/// <summary>
/// Casts a <see cref="Ray2D"/> against a specific <see cref="ICollider2D"/> shape and returns the first hit, if any.
/// </summary>
/// <typeparam name="T">The type of the <see cref="ICollider2D"/>, which must implement <see cref="ICollider2D"/>.</typeparam>
/// <param name="shape">The <see cref="ICollider2D"/> shape to test against.</param>
/// <param name="ray">The <see cref="Ray2D"/> to cast.</param>
/// <param name="length">
/// The maximum distance to check along the <see cref="Ray2D"/>. Defaults to <see cref="float.MaxValue"/>.
/// </param>
/// <returns>
/// A <see cref="RaycastResult"/> containing information about the intersection, or <see cref="null"/> if there was no hit.
/// </returns>
RaycastResult? RaycastAgainst<T>(T shape, Ray2D ray, float length = float.MaxValue) where T : ICollider2D;
}

View File

@@ -0,0 +1,14 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Physics2D;
public readonly struct RaycastResult(Ray2D ray, ICollider2D collider2D, Vector2D position, Vector2D normal)
{
public readonly Ray2D Ray = ray;
public readonly Vector2D Position = position;
public readonly Vector2D Normal = normal;
public readonly ICollider2D Collider2D = collider2D;
public readonly RigidBody2D? RigidBody2D = collider2D.BehaviourController.GetBehaviourInParent<RigidBody2D>();
}

View File

@@ -0,0 +1,15 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Physics2D;
/// <summary>
/// Represents a <see cref="IBehaviour"/> that listens to physics simulation update phase.
/// </summary>
public interface IPhysicsIteration : IBehaviour
{
/// <summary>
/// Iterates the physics state of the object based on the elapsed time since the last iteration.
/// </summary>
/// <param name="delta">The time elapsed since the last physics iteration.</param>
void PhysicsIterate(float delta);
}

View File

@@ -10,6 +10,6 @@ public interface IPhysicsUpdate : IBehaviour
/// <summary>
/// Updates the physics state of the object based on the elapsed time since the last update.
/// </summary>
/// <param name="delta">The time elapsed since the last physics update, typically in seconds.</param>
/// <param name="delta">The time elapsed since the last physics update.</param>
void PhysicsUpdate(float delta);
}

View File

@@ -10,6 +10,6 @@ public interface IPostPhysicsUpdate : IBehaviour
/// <summary>
/// Execute logic that should occur after the physics simulation has been updated.
/// </summary>
/// <param name="delta">The time elapsed since the last physics update, typically in seconds.</param>
/// <param name="delta">The time elapsed since the last physics update.</param>
void PostPhysicsUpdate(float delta);
}

View File

@@ -10,6 +10,6 @@ public interface IPrePhysicsUpdate : IBehaviour
/// <summary>
/// Execute logic that should occur before the physics simulation is updated.
/// </summary>
/// <param name="delta">The time elapsed since the last physics update, typically in seconds.</param>
/// <param name="delta">The time elapsed since the last physics update.</param>
void PrePhysicsUpdate(float delta);
}

View File

@@ -5,12 +5,9 @@ using Syntriax.Engine.Core;
namespace Syntriax.Engine.Physics2D;
public class PhysicsCoroutineManager : UniverseObject
public class PhysicsCoroutineManager : Behaviour, IPhysicsUpdate
{
private readonly Event<IUniverse, IUniverse.UpdateArguments>.EventHandler delegateOnUpdate = null!;
private readonly List<IEnumerator> enumerators = [];
private IPhysicsEngine2D? physicsEngine = null;
public IEnumerator CreateCoroutine(IEnumerator enumerator)
{
@@ -23,16 +20,7 @@ public class PhysicsCoroutineManager : UniverseObject
enumerators.Remove(enumerator);
}
protected override void OnEnteringUniverse(IUniverse universe)
{
physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>();
if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine)
foundPhysicsEngine.OnPhysicsStep.RemoveListener(OnPhysicsStep);
else
universe.OnUpdate.AddListener(OnUpdate);
}
private void OnPhysicsStep(IPhysicsEngine2D sender, float stepDeltaTime)
public void PhysicsUpdate(float delta)
{
for (int i = enumerators.Count - 1; i >= 0; i--)
{
@@ -44,28 +32,5 @@ public class PhysicsCoroutineManager : UniverseObject
}
}
protected override void OnExitingUniverse(IUniverse universe)
{
if (physicsEngine is IPhysicsEngine2D existingPhysicsEngine)
existingPhysicsEngine.OnPhysicsStep.RemoveListener(OnPhysicsStep);
universe.OnUpdate.RemoveListener(OnUpdate);
}
private void OnUpdate(IUniverse sender, IUniverse.UpdateArguments args)
{
if (Universe is not IUniverse universe)
return;
physicsEngine = universe.GetUniverseObject<IPhysicsEngine2D>();
if (physicsEngine is IPhysicsEngine2D foundPhysicsEngine)
{
foundPhysicsEngine.OnPhysicsStep.AddListener(OnPhysicsStep);
universe.OnUpdate.RemoveListener(OnUpdate);
}
}
public PhysicsCoroutineManager()
{
delegateOnUpdate = OnUpdate;
}
public PhysicsCoroutineManager() => Priority = int.MinValue;
}

View File

@@ -4,30 +4,65 @@ using Syntriax.Engine.Core;
namespace Syntriax.Engine.Physics2D;
public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
public class PhysicsEngine2D : Behaviour, IPreUpdate, IPhysicsEngine2D
{
public Event<IPhysicsEngine2D, float> OnPhysicsIteration { get; } = new();
public Event<IPhysicsEngine2D, float> OnPhysicsStep { get; } = new();
private readonly Event<IUniverse, IUniverse.UpdateArguments>.EventHandler delegateOnPreUpdate = null!;
private float physicsTicker = 0f;
private int _iterationPerStep = 1;
private float _iterationPeriod = 1f / 60f;
protected readonly ICollisionDetector2D collisionDetector = null!;
protected readonly ICollisionResolver2D collisionResolver = null!;
protected readonly IRaycastResolver2D raycastResolver = null!;
private static Comparer<IBehaviour> SortByPriority() => Comparer<IBehaviour>.Create((x, y) => y.Priority.CompareTo(x.Priority));
protected ActiveBehaviourCollectorSorted<IPrePhysicsUpdate> physicsPreUpdateCollector = new() { SortBy = SortByPriority() };
protected ActiveBehaviourCollectorSorted<IPhysicsUpdate> physicsUpdateCollector = new() { SortBy = SortByPriority() };
protected ActiveBehaviourCollectorSorted<IPhysicsIteration> physicsIterationCollector = new() { SortBy = SortByPriority() };
protected ActiveBehaviourCollectorSorted<IPostPhysicsUpdate> physicsPostUpdateCollector = new() { SortBy = SortByPriority() };
protected BehaviourCollector<IRigidBody2D> rigidBodyCollector = new();
protected BehaviourCollector<ICollider2D> colliderCollector = new();
private readonly ListPool<ICollider2D> colliderPool = new(() => new(32));
private readonly ListPool<IPrePhysicsUpdate> prePhysicsUpdatePool = new(() => new(32));
private readonly ListPool<IPhysicsUpdate> physicsUpdatePool = new(() => new(32));
private readonly ListPool<IPhysicsIteration> physicsIterationPool = new(() => new(32));
private readonly ListPool<IPostPhysicsUpdate> postPhysicsUpdatePool = new(() => new(32));
public int IterationPerStep { get => _iterationPerStep; set => _iterationPerStep = value < 1 ? 1 : value; }
public float IterationPeriod { get => _iterationPeriod; set => _iterationPeriod = value.Max(0.0001f); }
public RaycastResult? Raycast(Ray2D ray, float length = float.MaxValue)
{
RaycastResult? closestResult = null;
float closestDistance = float.MaxValue;
for (int i = 0; i < colliderCollector.Count; i++)
if (raycastResolver.RaycastAgainst(colliderCollector[i], ray, length) is RaycastResult raycastResult)
{
float magnitudeSquared = raycastResult.Position.FromTo(ray.Origin).MagnitudeSquared;
if (magnitudeSquared > closestDistance)
continue;
closestDistance = magnitudeSquared;
closestResult = raycastResult;
}
return closestResult;
}
public void Raycast(Ray2D ray, IList<RaycastResult> results, float length = float.MaxValue)
{
results.Clear();
for (int i = 0; i < colliderCollector.Count; i++)
if (raycastResolver.RaycastAgainst(colliderCollector[i], ray, length) is RaycastResult raycastResult)
results.Add(raycastResult);
}
public void Step(float deltaTime)
{
float intervalDeltaTime = deltaTime / IterationPerStep;
@@ -40,6 +75,9 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
{
for (int i = physicsIterationCollector.Count - 1; i >= 0; i--)
physicsIterationCollector[i].PhysicsIterate(intervalDeltaTime);
// Can Parallel
for (int i = rigidBodyCollector.Count - 1; i >= 0; i--)
StepRigidBody(rigidBodyCollector[i], intervalDeltaTime);
@@ -79,24 +117,29 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
{
float intervalDeltaTime = deltaTime / IterationPerStep;
List<ICollider2D> childColliders = [];
List<IPrePhysicsUpdate> physicsPreUpdates = [];
List<IPhysicsUpdate> physicsUpdates = [];
List<IPostPhysicsUpdate> physicsPostUpdates = [];
List<ICollider2D> childColliders = colliderPool.Get();
List<IPrePhysicsUpdate> physicsPreUpdates = prePhysicsUpdatePool.Get();
List<IPhysicsUpdate> physicsUpdates = physicsUpdatePool.Get();
List<IPhysicsIteration> physicsIterations = physicsIterationPool.Get();
List<IPostPhysicsUpdate> physicsPostUpdates = postPhysicsUpdatePool.Get();
rigidBody.BehaviourController.GetBehavioursInChildren(childColliders);
rigidBody.BehaviourController.GetBehavioursInChildren(physicsPreUpdates);
rigidBody.BehaviourController.GetBehavioursInChildren(physicsUpdates);
rigidBody.BehaviourController.GetBehavioursInChildren(physicsIterations);
rigidBody.BehaviourController.GetBehavioursInChildren(physicsPostUpdates);
foreach (IPrePhysicsUpdate physicsPreUpdate in physicsPreUpdates)
physicsPreUpdate.PrePhysicsUpdate(deltaTime);
for (int i = physicsPreUpdates.Count - 1; i >= 0; i--)
physicsPreUpdates[i].PrePhysicsUpdate(deltaTime);
foreach (IPhysicsUpdate physicsUpdate in physicsUpdates)
physicsUpdate.PhysicsUpdate(deltaTime);
for (int i = physicsUpdates.Count - 1; i >= 0; i--)
physicsUpdates[i].PhysicsUpdate(deltaTime);
for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
{
for (int i = physicsIterations.Count - 1; i >= 0; i--)
physicsIterations[i].PhysicsIterate(intervalDeltaTime);
StepRigidBody(rigidBody, intervalDeltaTime);
for (int i = childColliders.Count - 1; i >= 0; i--)
@@ -120,8 +163,14 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
}
}
foreach (IPostPhysicsUpdate physicsPostUpdate in physicsPostUpdates)
physicsPostUpdate.PostPhysicsUpdate(deltaTime);
for (int i = physicsPostUpdates.Count - 1; i >= 0; i--)
physicsPostUpdates[i].PostPhysicsUpdate(deltaTime);
colliderPool.Return(childColliders);
prePhysicsUpdatePool.Return(physicsPreUpdates);
physicsUpdatePool.Return(physicsUpdates);
physicsIterationPool.Return(physicsIterations);
postPhysicsUpdatePool.Return(physicsPostUpdates);
}
private void ResolveColliders(ICollider2D colliderX, ICollider2D colliderY)
@@ -174,31 +223,29 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
rigidBody.Transform.Rotation += rigidBody.AngularVelocity * intervalDeltaTime;
}
protected override void OnEnteringUniverse(IUniverse universe)
protected override void OnEnteredUniverse(IUniverse universe)
{
physicsPreUpdateCollector.Assign(universe);
physicsUpdateCollector.Assign(universe);
physicsIterationCollector.Assign(universe);
physicsPostUpdateCollector.Assign(universe);
colliderCollector.Assign(universe);
rigidBodyCollector.Assign(universe);
universe.OnPreUpdate.AddListener(OnEnginePreUpdate);
}
protected override void OnExitingUniverse(IUniverse universe)
protected override void OnExitedUniverse(IUniverse universe)
{
physicsPreUpdateCollector.Unassign();
physicsUpdateCollector.Unassign();
physicsIterationCollector.Unassign();
physicsPostUpdateCollector.Unassign();
colliderCollector.Unassign();
rigidBodyCollector.Unassign();
universe.OnPreUpdate.RemoveListener(OnEnginePreUpdate);
}
private void OnEnginePreUpdate(IUniverse sender, IUniverse.UpdateArguments args)
void IPreUpdate.PreUpdate()
{
physicsTicker += args.EngineTime.DeltaTime;
physicsTicker += Universe.Time.DeltaTime;
while (physicsTicker >= IterationPeriod)
{
@@ -211,15 +258,15 @@ public class PhysicsEngine2D : UniverseObject, IPhysicsEngine2D
{
collisionDetector = new CollisionDetector2D();
collisionResolver = new CollisionResolver2D();
delegateOnPreUpdate = OnEnginePreUpdate;
raycastResolver = new RaycastResolver2D();
Priority = int.MaxValue;
}
public PhysicsEngine2D(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
public PhysicsEngine2D(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver, IRaycastResolver2D raycastResolver)
{
this.collisionDetector = collisionDetector;
this.collisionResolver = collisionResolver;
delegateOnPreUpdate = OnEnginePreUpdate;
this.raycastResolver = raycastResolver;
Priority = int.MaxValue;
}
}

View File

@@ -19,6 +19,7 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
private readonly ICollisionDetector2D collisionDetector = null!;
private readonly ICollisionResolver2D collisionResolver = null!;
private readonly IRaycastResolver2D raycastResolver = null!;
public int IterationPerStep { get => _iterationCount; set => _iterationCount = value < 1 ? 1 : value; }
@@ -43,6 +44,34 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
rigidBody.BehaviourController.OnBehaviourAdded.RemoveListener(delegateOnBehaviourAdded);
rigidBody.BehaviourController.OnBehaviourRemoved.RemoveListener(delegateOnBehaviourRemoved);
}
public RaycastResult? Raycast(Ray2D ray, float length = float.MaxValue)
{
RaycastResult? closestResult = null;
float closestDistance = float.MaxValue;
for (int i = 0; i < colliders.Count; i++)
if (raycastResolver.RaycastAgainst(colliders[i], ray, length) is RaycastResult raycastResult)
{
float magnitudeSquared = raycastResult.Position.FromTo(ray.Origin).MagnitudeSquared;
if (magnitudeSquared > closestDistance)
continue;
closestDistance = magnitudeSquared;
closestResult = raycastResult;
}
return closestResult;
}
public void Raycast(Ray2D ray, IList<RaycastResult> results, float length = float.MaxValue)
{
results.Clear();
for (int i = 0; i < colliders.Count; i++)
if (raycastResolver.RaycastAgainst(colliders[i], ray, length) is RaycastResult raycastResult)
results.Add(raycastResult);
}
public void Step(float deltaTime)
{
@@ -86,25 +115,30 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
List<ICollider2D> childColliders = [];
List<IPrePhysicsUpdate> physicsPreUpdates = [];
List<IPhysicsUpdate> physicsUpdates = [];
List<IPhysicsIteration> physicsIterations = [];
List<IPostPhysicsUpdate> physicsPostUpdates = [];
rigidBody.BehaviourController.GetBehavioursInChildren(childColliders);
rigidBody.BehaviourController.GetBehavioursInChildren(physicsPreUpdates);
rigidBody.BehaviourController.GetBehavioursInChildren(physicsUpdates);
rigidBody.BehaviourController.GetBehavioursInChildren(physicsIterations);
rigidBody.BehaviourController.GetBehavioursInChildren(physicsPostUpdates);
foreach (IPrePhysicsUpdate physicsPreUpdate in physicsPreUpdates)
physicsPreUpdate.PrePhysicsUpdate(deltaTime);
for (int i = physicsPreUpdates.Count - 1; i >= 0; i--)
physicsPreUpdates[i].PrePhysicsUpdate(deltaTime);
foreach (IPhysicsUpdate physicsUpdate in physicsUpdates)
physicsUpdate.PhysicsUpdate(deltaTime);
for (int i = physicsUpdates.Count - 1; i >= 0; i--)
physicsUpdates[i].PhysicsUpdate(deltaTime);
for (int iterationIndex = 0; iterationIndex < IterationPerStep; iterationIndex++)
{
for (int i = physicsIterations.Count - 1; i >= 0; i--)
physicsIterations[i].PhysicsIterate(intervalDeltaTime);
StepRigidBody(rigidBody, intervalDeltaTime);
foreach (ICollider2D collider in childColliders)
collider.Recalculate();
for (int i = childColliders.Count - 1; i >= 0; i--)
childColliders[i].Recalculate();
for (int x = 0; x < childColliders.Count; x++)
{
@@ -124,8 +158,8 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
}
}
foreach (IPostPhysicsUpdate physicsPostUpdate in physicsPostUpdates)
physicsPostUpdate.PostPhysicsUpdate(deltaTime);
for (int i = physicsPostUpdates.Count - 1; i >= 0; i--)
physicsPostUpdates[i].PostPhysicsUpdate(deltaTime);
}
private void ResolveColliders(ICollider2D colliderX, ICollider2D colliderY)
@@ -198,15 +232,17 @@ public class PhysicsEngine2DStandalone : IPhysicsEngine2D
{
collisionDetector = new CollisionDetector2D();
collisionResolver = new CollisionResolver2D();
raycastResolver = new RaycastResolver2D();
delegateOnBehaviourAdded = OnBehaviourAdded;
delegateOnBehaviourRemoved = OnBehaviourRemoved;
}
public PhysicsEngine2DStandalone(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
public PhysicsEngine2DStandalone(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver, IRaycastResolver2D raycastResolver)
{
this.collisionDetector = collisionDetector;
this.collisionResolver = collisionResolver;
this.raycastResolver = raycastResolver;
delegateOnBehaviourAdded = OnBehaviourAdded;
delegateOnBehaviourRemoved = OnBehaviourRemoved;

View File

@@ -0,0 +1,100 @@
using System.Collections.Generic;
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Physics2D;
public class RaycastResolver2D : IRaycastResolver2D
{
private readonly ListPool<Line2D> lineCacheQueue = new(() => new(4));
RaycastResult? IRaycastResolver2D.RaycastAgainst<T>(T shape, Ray2D ray, float length)
{
if (shape is IShapeCollider2D shapeCollider)
return RaycastAgainstShape(shapeCollider, ray, length);
else if (shape is ICircleCollider2D circleCollider)
return RaycastAgainstCircle(circleCollider, ray, length);
throw new System.NotSupportedException($"{shape.GetType().FullName} is not supported by {GetType().FullName}. Please implement a {nameof(IRaycastResolver2D)} and use it as the raycast resolver.");
}
public RaycastResult? RaycastAgainstShape(IShapeCollider2D shapeCollider, Ray2D ray, float length)
{
List<Line2D> line2Ds = lineCacheQueue.Get();
RaycastResult? raycastResult = null;
float closestRaycastResultSquared = float.MaxValue;
shapeCollider.ShapeWorld.ToLines(line2Ds);
Line2D rayLine = ray.ToLine(length);
foreach (Line2D line in line2Ds)
{
if (line.Intersects(rayLine))
{
Vector2D hitPosition = line.IntersectionPoint(rayLine);
float hitDistanceSquared = ray.Origin.FromTo(hitPosition).MagnitudeSquared;
if (closestRaycastResultSquared < hitDistanceSquared)
continue;
closestRaycastResultSquared = hitDistanceSquared;
Vector2D lineDirection = line.Direction;
Vector2D normal1 = lineDirection.Perpendicular();
Vector2D normal2 = -lineDirection.Perpendicular();
float normalDot1 = rayLine.Direction.Dot(normal1);
float normalDot2 = rayLine.Direction.Dot(normal2);
Vector2D hitNormal = normalDot1 < normalDot2 ? normal1 : normal2;
if (shapeCollider.ShapeWorld.Overlaps(ray.Origin))
hitNormal = hitNormal.Reversed;
raycastResult = new(ray, shapeCollider, hitPosition, hitNormal);
}
}
lineCacheQueue.Return(line2Ds);
return raycastResult;
}
public RaycastResult? RaycastAgainstCircle(ICircleCollider2D circleCollider, Ray2D ray, float length)
{
Circle circle = circleCollider.CircleWorld;
if (circle.Overlaps(ray.Origin, out _, out float depth))
{
Vector2D insideNormal = circle.Center.FromTo(ray.Origin).Normalized;
Vector2D insidePosition = circle.Center + insideNormal * circle.Radius;
return new(ray, circleCollider, insidePosition, insideNormal);
}
Vector2D originToCircle = ray.Origin.FromTo(circle.Center);
float distanceToClosest = ray.Direction.Dot(originToCircle);
Vector2D closestPoint = ray.Origin + ray.Direction * distanceToClosest;
Vector2D closestPointToCircle = closestPoint.FromTo(circle.Center);
float closestToCircleDistanceSquared = closestPointToCircle.MagnitudeSquared;
if (closestToCircleDistanceSquared > circle.RadiusSquared)
return null;
float distanceToHit = distanceToClosest - (circle.Radius - closestToCircleDistanceSquared.Sqrt());
if (distanceToHit > length || distanceToHit < 0f)
return null;
Vector2D hitPosition = ray.Evaluate(distanceToHit);
Vector2D hitNormal = circle.Center.FromTo(hitPosition).Normalized;
return new(ray, circleCollider, hitPosition, hitNormal);
}
}

View File

@@ -18,6 +18,6 @@ public interface IReadOnlyTimer
TimerState State { get; }
readonly record struct TimerDeltaArguments(double delta);
readonly record struct TimerDeltaArguments(double Delta);
}

View File

@@ -5,7 +5,7 @@ using Syntriax.Engine.Core;
namespace Syntriax.Engine.Systems.Tween;
public class TweenManager : UniverseObject, ITweenManager
public class TweenManager : Behaviour, ITweenManager
{
private CoroutineManager coroutineManager = null!;
@@ -73,12 +73,12 @@ public class TweenManager : UniverseObject, ITweenManager
Return((Tween)tween);
}
protected override void OnEnteringUniverse(IUniverse universe)
protected override void OnEnteredUniverse(IUniverse universe)
{
coroutineManager = universe.GetRequiredUniverseObject<CoroutineManager>();
coroutineManager = universe.FindRequiredBehaviour<CoroutineManager>();
}
protected override void OnExitingUniverse(IUniverse universe)
protected override void OnExitedUniverse(IUniverse universe)
{
coroutineManager = null!;
}