From 6c326b1fc6291be4ab45f2f1ad5c8efce89e248a Mon Sep 17 00:00:00 2001 From: Syntriax Date: Fri, 9 Feb 2024 09:44:25 +0300 Subject: [PATCH] chore: Engine Update --- Engine | 2 +- Game/GamePong.cs | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Engine b/Engine index be06575..2cf6135 160000 --- a/Engine +++ b/Engine @@ -1 +1 @@ -Subproject commit be06575f913c2b649f53c9fe7a8ed33abdf5734f +Subproject commit 2cf6135063b12dfff4d2c8391ad8edde806183f0 diff --git a/Game/GamePong.cs b/Game/GamePong.cs index 5b93ddc..3723b62 100644 --- a/Game/GamePong.cs +++ b/Game/GamePong.cs @@ -25,9 +25,9 @@ public class GamePong : Game private ShapeBatch shapeBatch = null!; private GameManager gameManager = null!; - private BehaviourCacher displayableCacher = null!; - private BehaviourCacher displayableShapeCacher = null!; - private BehaviourCacher monoGameContentLoaderCacher = null!; + private BehaviourCollector displayableCollector = null!; + private BehaviourCollector displayableShapeCollector = null!; + private BehaviourCollector monoGameContentLoaderCollector = null!; private MonoGameCamera2DBehaviour cameraBehaviour = null!; private PongManagerBehaviour pongManager = null!; @@ -51,12 +51,12 @@ public class GamePong : Game { // TODO: Add your initialization logic here gameManager = new(); - displayableCacher = new(gameManager); - displayableShapeCacher = new(gameManager); - monoGameContentLoaderCacher = new(gameManager); - physicsEngine = new PhysicsEngine2DCacher(gameManager) { IterationPerStep = 3 }; + displayableCollector = new(gameManager); + displayableShapeCollector = new(gameManager); + monoGameContentLoaderCollector = new(gameManager); + physicsEngine = new PhysicsEngine2DCollector(gameManager) { IterationPerStep = 3 }; - monoGameContentLoaderCacher.OnCached += (_, cached) => cached.LoadContent(Content); + monoGameContentLoaderCollector.OnCollected += (_, cached) => cached.LoadContent(Content); gameManager.Initialize(); @@ -182,12 +182,12 @@ public class GamePong : Game gameManager.PreDraw(); spriteBatch.Begin(SpriteSortMode.Deferred, transformMatrix: cameraBehaviour.MatrixTransform); - foreach (var displayable in displayableCacher) + foreach (var displayable in displayableCollector) displayable.Draw(spriteBatch); spriteBatch.End(); shapeBatch.Begin(cameraBehaviour.MatrixTransform); - foreach (var displayableShape in displayableShapeCacher) + foreach (var displayableShape in displayableShapeCollector) displayableShape.Draw(shapeBatch); shapeBatch.End();