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

chore: updated engine

Browse Source
This commit is contained in:
Syntriax
2025-04-13 22:24:56 +03:00
parent 51854a3e59
commit 34aa4dbb69
13 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Shared/Behaviours/BallBehaviour.cs
View File

@@ -20,7 +20,7 @@ public class BallBehaviour : Behaviour2D
BehaviourController.GetRequiredBehaviour<ICollider2D>().OnCollisionDetected += OnCollisionDetected;
rigidBody = BehaviourController.GetRequiredBehaviour<IRigidBody2D>();
if (HierarchyObject.GameManager.TryFindBehaviour(out PongManagerBehaviour? pongManager))
if (UniverseObject.Universe.TryFindBehaviour(out PongManagerBehaviour? pongManager))
{
pongManager.OnReset += ResetBall;
pongManager.OnScored += ResetBall;
@@ -54,7 +54,7 @@ public class BallBehaviour : Behaviour2D
if (rigidBody.Velocity.MagnitudeSquared <= 0.01f)
return;
Vector2D speedUp = rigidBody.Velocity.Normalized * GameManager.Time.DeltaTime;
Vector2D speedUp = rigidBody.Velocity.Normalized * Universe.Time.DeltaTime;
rigidBody.Velocity += speedUp * SpeedUpMultiplier;
}

18
Shared/Behaviours/CameraController.cs
View File

@@ -15,7 +15,7 @@ public class CameraController : Behaviour
protected override void OnFirstActiveFrame()
{
cameraBehaviour ??= BehaviourController.GetRequiredBehaviour<MonoGameCamera2DBehaviour>();
buttonInputs = GameManager.FindRequiredBehaviour<IButtonInputs<Keys>>();
buttonInputs = Universe.FindRequiredBehaviour<IButtonInputs<Keys>>();
buttonInputs.RegisterOnPress(Keys.F, SwitchToFullScreen);
buttonInputs.RegisterOnPress(Keys.R, ResetCamera);
@@ -24,21 +24,21 @@ public class CameraController : Behaviour
protected override void OnUpdate()
{
if (buttonInputs.IsPressed(Keys.U))
cameraBehaviour.Zoom += GameManager.Time.DeltaTime * 5f;
cameraBehaviour.Zoom += Universe.Time.DeltaTime * 5f;
if (buttonInputs.IsPressed(Keys.J))
cameraBehaviour.Zoom -= GameManager.Time.DeltaTime * 5f;
cameraBehaviour.Zoom -= Universe.Time.DeltaTime * 5f;
if (buttonInputs.IsPressed(Keys.NumPad8)) cameraBehaviour.Transform.LocalPosition += Vector2D.Up * GameManager.Time.DeltaTime * 500f;
if (buttonInputs.IsPressed(Keys.NumPad2)) cameraBehaviour.Transform.LocalPosition -= Vector2D.Up * GameManager.Time.DeltaTime * 500f;
if (buttonInputs.IsPressed(Keys.NumPad6)) cameraBehaviour.Transform.LocalPosition += Vector2D.Right * GameManager.Time.DeltaTime * 500f;
if (buttonInputs.IsPressed(Keys.NumPad4)) cameraBehaviour.Transform.LocalPosition -= Vector2D.Right * GameManager.Time.DeltaTime * 500f;
if (buttonInputs.IsPressed(Keys.NumPad8)) cameraBehaviour.Transform.LocalPosition += Vector2D.Up * Universe.Time.DeltaTime * 500f;
if (buttonInputs.IsPressed(Keys.NumPad2)) cameraBehaviour.Transform.LocalPosition -= Vector2D.Up * Universe.Time.DeltaTime * 500f;
if (buttonInputs.IsPressed(Keys.NumPad6)) cameraBehaviour.Transform.LocalPosition += Vector2D.Right * Universe.Time.DeltaTime * 500f;
if (buttonInputs.IsPressed(Keys.NumPad4)) cameraBehaviour.Transform.LocalPosition -= Vector2D.Right * Universe.Time.DeltaTime * 500f;
if (buttonInputs.IsPressed(Keys.Q))
cameraBehaviour.Transform.Rotation += GameManager.Time.DeltaTime * 45f;
cameraBehaviour.Transform.Rotation += Universe.Time.DeltaTime * 45f;
if (buttonInputs.IsPressed(Keys.E))
cameraBehaviour.Transform.Rotation -= GameManager.Time.DeltaTime * 45f;
cameraBehaviour.Transform.Rotation -= Universe.Time.DeltaTime * 45f;
}
private void SwitchToFullScreen(IButtonInputs<Keys> inputs, Keys keys)

6
Shared/Behaviours/MonoGameCamera2DBehaviour.cs
View File

@@ -28,7 +28,7 @@ public class MonoGameCamera2DBehaviour(GraphicsDeviceManager Graphics) : Behavio
return;
_matrixTransform = value;
OnMatrixTransformChanged?.Invoke(this);
OnMatrixTransformChanged?.InvokeSafe(this);
}
}
@@ -47,7 +47,7 @@ public class MonoGameCamera2DBehaviour(GraphicsDeviceManager Graphics) : Behavio
return;
_viewport = value;
OnViewportChanged?.Invoke(this);
OnViewportChanged?.InvokeSafe(this);
}
}
@@ -62,7 +62,7 @@ public class MonoGameCamera2DBehaviour(GraphicsDeviceManager Graphics) : Behavio
return;
_zoom = newValue;
OnZoomChanged?.Invoke(this);
OnZoomChanged?.InvokeSafe(this);
}
}

2
Shared/Behaviours/MovementBallBehaviour.cs
View File

@@ -27,7 +27,7 @@ public class MovementBallBehaviour : Behaviour2D
if (rigidBody.Velocity.MagnitudeSquared <= 0.01f)
return;
Vector2D speedUp = rigidBody.Velocity.Normalized * GameManager.Time.DeltaTime;
Vector2D speedUp = rigidBody.Velocity.Normalized * Universe.Time.DeltaTime;
rigidBody.Velocity += speedUp * SpeedUpMultiplier;
}

6
Shared/Behaviours/PaddleBehaviour.cs
View File

@@ -26,16 +26,16 @@ public class PaddleBehaviour(Keys Up, Keys Down, float High, float Low, float Sp
return;
if (isUpPressed)
Transform.Position = Transform.Position + Vector2D.Up * GameManager.Time.DeltaTime * Speed;
Transform.Position = Transform.Position + Vector2D.Up * Universe.Time.DeltaTime * Speed;
else if (isDownPressed)
Transform.Position = Transform.Position + -Vector2D.Up * GameManager.Time.DeltaTime * Speed;
Transform.Position = Transform.Position + -Vector2D.Up * Universe.Time.DeltaTime * Speed;
Transform.Position = new Vector2D(Transform.Position.X, MathF.Max(MathF.Min(Transform.Position.Y, High), Low));
}
protected override void OnFirstActiveFrame()
{
inputs = GameManager.FindRequiredBehaviour<IButtonInputs<Keys>>();
inputs = Universe.FindRequiredBehaviour<IButtonInputs<Keys>>();
inputs.RegisterOnPress(Up, OnUpPressed);
inputs.RegisterOnRelease(Up, OnUpReleased);

10
Shared/Behaviours/PongManagerBehaviour.cs
View File

@@ -24,7 +24,7 @@ public class PongManagerBehaviour : Behaviour
protected override void OnFirstActiveFrame()
{
var buttonInputs = GameManager.FindRequiredBehaviour<IButtonInputs<Keys>>();
var buttonInputs = Universe.FindRequiredBehaviour<IButtonInputs<Keys>>();
buttonInputs.RegisterOnRelease(Keys.Space, (_, _1) => Reset());
}
@@ -32,7 +32,7 @@ public class PongManagerBehaviour : Behaviour
public void ScoreToLeft()
{
ScoreLeft++;
OnScored?.Invoke(this);
OnScored?.InvokeSafe(this);
CheckFinish();
}
@@ -40,7 +40,7 @@ public class PongManagerBehaviour : Behaviour
public void ScoreToRight()
{
ScoreRight++;
OnScored?.Invoke(this);
OnScored?.InvokeSafe(this);
CheckFinish();
}
@@ -48,7 +48,7 @@ public class PongManagerBehaviour : Behaviour
public void Reset()
{
ScoreLeft = ScoreRight = 0;
OnReset?.Invoke(this);
OnReset?.InvokeSafe(this);
}
private void CheckFinish()
@@ -56,6 +56,6 @@ public class PongManagerBehaviour : Behaviour
int halfwayScore = (int)(WinScore * .5f);
if (ScoreLeft > halfwayScore || ScoreRight > halfwayScore)
OnFinished?.Invoke(this);
OnFinished?.InvokeSafe(this);
}
}

2
Shared/Behaviours/TextScoreBehaviour.cs
View File

@@ -11,7 +11,7 @@ public class TextScoreBehaviour : TextBehaviour
protected override void OnFirstActiveFrame()
{
if (!HierarchyObject.GameManager.TryFindBehaviour(out pongManager))
if (!UniverseObject.Universe.TryFindBehaviour(out pongManager))
return;
pongManager.OnScored += UpdateScores;

2
Shared/Behaviours/WallScoreBehaviour.cs
View File

@@ -14,6 +14,6 @@ public class WallScoreBehaviour(Action OnCollision) : Behaviour2D
if (!BehaviourController.TryGetBehaviour(out ICollider2D? collider2D))
return;
collider2D.OnCollisionDetected += (_, _1) => OnCollision?.Invoke();
collider2D.OnCollisionDetected += (_, _1) => OnCollision?.InvokeSafe();
}
}