chore: updated engine
This commit is contained in:
parent
67e46cdaf3
commit
51854a3e59
2
Engine
2
Engine
@ -1 +1 @@
|
|||||||
Subproject commit c135035d5b72730a71665de3c9f27611880f32c8
|
Subproject commit 9e4c74ed1d73eac40ed29fbdb1e5103c121844a9
|
@ -17,14 +17,8 @@ public class BallBehaviour : Behaviour2D
|
|||||||
|
|
||||||
protected override void OnFirstActiveFrame()
|
protected override void OnFirstActiveFrame()
|
||||||
{
|
{
|
||||||
if (!BehaviourController.TryGetBehaviour(out IRigidBody2D? foundRigidBody))
|
BehaviourController.GetRequiredBehaviour<ICollider2D>().OnCollisionDetected += OnCollisionDetected;
|
||||||
throw new Exception($"{nameof(IRigidBody2D)} is missing on {HierarchyObject.Name}.");
|
rigidBody = BehaviourController.GetRequiredBehaviour<IRigidBody2D>();
|
||||||
if (!BehaviourController.TryGetBehaviour(out ICollider2D? foundCollider))
|
|
||||||
throw new Exception($"{nameof(ICollider2D)} is missing on {HierarchyObject.Name}.");
|
|
||||||
|
|
||||||
foundCollider.OnCollisionDetected += OnCollisionDetected;
|
|
||||||
|
|
||||||
rigidBody = foundRigidBody;
|
|
||||||
|
|
||||||
if (HierarchyObject.GameManager.TryFindBehaviour(out PongManagerBehaviour? pongManager))
|
if (HierarchyObject.GameManager.TryFindBehaviour(out PongManagerBehaviour? pongManager))
|
||||||
{
|
{
|
||||||
|
@ -14,12 +14,9 @@ public class CameraController : Behaviour
|
|||||||
|
|
||||||
protected override void OnFirstActiveFrame()
|
protected override void OnFirstActiveFrame()
|
||||||
{
|
{
|
||||||
if (BehaviourController.TryGetBehaviour(out MonoGameCamera2DBehaviour? foundCameraBehaviour))
|
cameraBehaviour ??= BehaviourController.GetRequiredBehaviour<MonoGameCamera2DBehaviour>();
|
||||||
cameraBehaviour = foundCameraBehaviour;
|
buttonInputs = GameManager.FindRequiredBehaviour<IButtonInputs<Keys>>();
|
||||||
|
|
||||||
cameraBehaviour ??= BehaviourController.AddBehaviour<MonoGameCamera2DBehaviour>();
|
|
||||||
|
|
||||||
buttonInputs = GameManager.FindBehaviour<IButtonInputs<Keys>>() ?? throw new("Unable to find inputs");
|
|
||||||
buttonInputs.RegisterOnPress(Keys.F, SwitchToFullScreen);
|
buttonInputs.RegisterOnPress(Keys.F, SwitchToFullScreen);
|
||||||
buttonInputs.RegisterOnPress(Keys.R, ResetCamera);
|
buttonInputs.RegisterOnPress(Keys.R, ResetCamera);
|
||||||
}
|
}
|
||||||
|
@ -16,15 +16,10 @@ public class MovementBallBehaviour : Behaviour2D
|
|||||||
|
|
||||||
protected override void OnFirstActiveFrame()
|
protected override void OnFirstActiveFrame()
|
||||||
{
|
{
|
||||||
if (!BehaviourController.TryGetBehaviour(out IRigidBody2D? foundRigidBody))
|
rigidBody = BehaviourController.GetRequiredBehaviour<IRigidBody2D>();
|
||||||
throw new Exception($"{nameof(IRigidBody2D)} is missing on {HierarchyObject.Name}.");
|
|
||||||
if (!BehaviourController.TryGetBehaviour(out ICollider2D? foundCollider))
|
|
||||||
throw new Exception($"{nameof(ICollider2D)} is missing on {HierarchyObject.Name}.");
|
|
||||||
|
|
||||||
foundRigidBody.Velocity = StartDirection * Speed;
|
rigidBody.Velocity = StartDirection * Speed;
|
||||||
foundCollider.OnCollisionDetected += OnCollisionDetected;
|
BehaviourController.GetRequiredBehaviour<ICollider2D>().OnCollisionDetected += OnCollisionDetected;
|
||||||
|
|
||||||
rigidBody = foundRigidBody;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnUpdate()
|
protected override void OnUpdate()
|
||||||
|
@ -35,7 +35,7 @@ public class PaddleBehaviour(Keys Up, Keys Down, float High, float Low, float Sp
|
|||||||
|
|
||||||
protected override void OnFirstActiveFrame()
|
protected override void OnFirstActiveFrame()
|
||||||
{
|
{
|
||||||
inputs = GameManager.FindBehaviour<IButtonInputs<Keys>>() ?? throw new("Unable to find inputs");
|
inputs = GameManager.FindRequiredBehaviour<IButtonInputs<Keys>>();
|
||||||
|
|
||||||
inputs.RegisterOnPress(Up, OnUpPressed);
|
inputs.RegisterOnPress(Up, OnUpPressed);
|
||||||
inputs.RegisterOnRelease(Up, OnUpReleased);
|
inputs.RegisterOnRelease(Up, OnUpReleased);
|
||||||
|
@ -24,7 +24,7 @@ public class PongManagerBehaviour : Behaviour
|
|||||||
|
|
||||||
protected override void OnFirstActiveFrame()
|
protected override void OnFirstActiveFrame()
|
||||||
{
|
{
|
||||||
var buttonInputs = GameManager.FindBehaviour<IButtonInputs<Keys>>() ?? throw new("Unable to find inputs");
|
var buttonInputs = GameManager.FindRequiredBehaviour<IButtonInputs<Keys>>();
|
||||||
buttonInputs.RegisterOnRelease(Keys.Space, (_, _1) => Reset());
|
buttonInputs.RegisterOnRelease(Keys.Space, (_, _1) => Reset());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user