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

refactor: Dependency Injection to PhysicsEngine2Ds

This commit is contained in:
Syntriax 2024-01-30 19:35:36 +03:00
parent 8619778d52
commit de336d0ee5
2 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Engine.Physics2D/PhysicsEngine2D.cs
View File

@ -12,8 +12,9 @@ public class PhysicsEngine2D : IPhysicsEngine2D
private readonly List<ICollider2D> colliders = new(64); private readonly List<ICollider2D> colliders = new(64);
private int _iterationCount = 1; private int _iterationCount = 1;
private ICollisionDetector2D collisionDetector = new CollisionDetector2D();
private ICollisionResolver2D collisionResolver = new CollisionResolver2D(); private readonly ICollisionDetector2D collisionDetector = null!;
private readonly ICollisionResolver2D collisionResolver = null!;
public int IterationCount { get => _iterationCount; set => _iterationCount = value < 1 ? 1 : value; } public int IterationCount { get => _iterationCount; set => _iterationCount = value < 1 ? 1 : value; }
@ -122,4 +123,16 @@ public class PhysicsEngine2D : IPhysicsEngine2D
colliders.Remove(collider2D); colliders.Remove(collider2D);
} }
public PhysicsEngine2D()
{
collisionDetector = new CollisionDetector2D();
collisionResolver = new CollisionResolver2D();
}
public PhysicsEngine2D(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
{
this.collisionDetector = collisionDetector;
this.collisionResolver = collisionResolver;
}
} }

32
Engine.Physics2D/PhysicsEngine2DCacher.cs
View File

@ -14,8 +14,9 @@ public class PhysicsEngine2DCacher : IPhysicsEngine2D, IAssignableGameManager
private int _iterationCount = 1; private int _iterationCount = 1;
protected ICollisionDetector2D collisionDetector = new CollisionDetector2D(); // TODO Dependency Injection or Reversion protected readonly ICollisionDetector2D collisionDetector = null!;
protected ICollisionResolver2D collisionResolver = new CollisionResolver2D(); // TODO Dependency Injection or Reversion protected readonly ICollisionResolver2D collisionResolver = null!;
protected BehaviourCacher<IRigidBody2D> rigidBodyCacher = new(); protected BehaviourCacher<IRigidBody2D> rigidBodyCacher = new();
protected BehaviourCacher<ICollider2D> colliderCacher = new(); protected BehaviourCacher<ICollider2D> colliderCacher = new();
@ -121,6 +122,29 @@ public class PhysicsEngine2DCacher : IPhysicsEngine2D, IAssignableGameManager
return true; return true;
} }
public PhysicsEngine2DCacher() { } public PhysicsEngine2DCacher()
public PhysicsEngine2DCacher(IGameManager gameManager) => Assign(gameManager); {
collisionDetector = new CollisionDetector2D();
collisionResolver = new CollisionResolver2D();
}
public PhysicsEngine2DCacher(IGameManager gameManager)
{
Assign(gameManager);
collisionDetector = new CollisionDetector2D();
collisionResolver = new CollisionResolver2D();
}
public PhysicsEngine2DCacher(IGameManager gameManager, ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
{
Assign(gameManager);
this.collisionDetector = collisionDetector;
this.collisionResolver = collisionResolver;
}
public PhysicsEngine2DCacher(ICollisionDetector2D collisionDetector, ICollisionResolver2D collisionResolver)
{
this.collisionDetector = collisionDetector;
this.collisionResolver = collisionResolver;
}
} }