Merge pull request #86 from Hinsbart/mono-pong

Code enhancements for the mono pong demo.

Author: akien-mga

mono/monkey_pong/Ball.cs

@@ -3,10 +3,10 @@
 
 public class Ball : Area2D
 {
-    private const int BALL_SPEED = 100;
+    private const int BallSpeed = 100;
 
     private Vector2 direction = new Vector2(-1, 0);
-    private int speed = BALL_SPEED;
+    private int speed = BallSpeed;
 
     private Vector2 initialPos;
 
@@ -22,7 +22,7 @@ public Vector2 GetDirection()
     public void Reset()
     {
         SetPosition(initialPos);
-        speed = BALL_SPEED;
+        speed = BallSpeed;
         direction = new Vector2(-1, 0);
     }
 

mono/monkey_pong/CeilingFloor.cs

@@ -8,9 +8,8 @@ public class CeilingFloor : Area2D
 
     public void OnAreaEntered(Area2D area)
     {
-        if (area is Ball)
+        if (area is Ball ball)
         {
-            Ball ball = (Ball)area;
             ball.SetDirection(ball.GetDirection() + new Vector2(0, yDirection));
         }
     }

mono/monkey_pong/Paddle.cs

@@ -6,7 +6,7 @@ public class Paddle : Area2D
     [Export]
     private int ballDir = 1;
 
-    private const int MOVE_SPEED = 100;
+    private const int MoveSpeed = 100;
 
     public override void _Process(float delta)
     {
@@ -16,23 +16,22 @@ public override void _Process(float delta)
         if (Input.IsActionPressed(which + "_move_up") && GetPosition().y > 0)
         {
             Vector2 pos = GetPosition();
-            pos.y -= MOVE_SPEED * delta;
+            pos.y -= MoveSpeed * delta;
             SetPosition(pos);
         }
         if (Input.IsActionPressed(which + "_move_down") && GetPosition().y < GetViewportRect().Size.y)
         {
             Vector2 pos = GetPosition();
-            pos.y += MOVE_SPEED * delta;
+            pos.y += MoveSpeed * delta;
             SetPosition(pos);
         }
     }
 
     public void OnAreaEntered(Area2D area)
     {
-        if (area is Ball)
+        if (area is Ball ball)
         {
             // Assign new direction
-            Ball ball = (Ball)area;
             ball.SetDirection(new Vector2(ballDir, (float)new Random().NextDouble() * 2 - 1).normalized());
         }
     }

mono/monkey_pong/Wall.cs

@@ -5,10 +5,9 @@ public class Wall : Area2D
 {
     public void OnWallAreaEntered(Area2D area)
     {
-        if (area is Ball)
+        if (area is Ball ball)
         {
             // Oops, ball went out of game place, reset
-            Ball ball = (Ball)area;
             ball.Reset();
         }
     }