updated collision with paddle mechanics

Author: GustavoLR548

src/main/java/com/gustavolr/engine/entity/Entity.java

@@ -8,6 +8,8 @@ public abstract class Entity {
     protected Vector position;
     protected int width;
     protected int height;
+    int collision_timer = 0;
+    int max_timer = 60;
 
     public Entity(Vector position, int width, int height) {
         this.position = position;
@@ -35,18 +37,28 @@ public void setHeight(int height) {
     }
 
     public void update() {
-
+        if(collision_timer < max_timer) {
+            collision_timer++;
+        }
+        System.out.println("collision " + collision_timer);
     }
 
     public void render(Graphics g) {
 
     }
 
-	public boolean isColidding(Entity e1) {
-		
+	public boolean isColidding(Entity e1) {   
+        if (collision_timer < max_timer) {
+            return false;
+        }
+
 		Rectangle e1Mask = new Rectangle(e1.position.x, e1.position.y, e1.width, e1.height);
 		Rectangle e2Mask = new Rectangle(this.position.x, this.position.y, this.width, this.height);
 
-		return e1Mask.intersects(e2Mask);
+        boolean response = e1Mask.intersects(e2Mask);
+        if(response)
+            collision_timer = 0;
+
+		return response;
 	}
 }

src/main/java/com/gustavolr/engine/window/GameWindowConstants.java

@@ -4,8 +4,8 @@
 
 public final class GameWindowConstants {
 
-    public static final int DEFAULT_WINDOW_WIDTH = 260;
-    public static final int DEFAULT_WINDOW_HEIGHT = 140;
+    public static final int DEFAULT_WINDOW_WIDTH = 320;
+    public static final int DEFAULT_WINDOW_HEIGHT = 180;
     public static final int DEFAULT_WINDOW_SCALE = 4;
 
     public static final Color BACKGROUND_COLOR = new Color(28, 28, 28);

src/main/java/com/gustavolr/game_entities/Ball.java

@@ -9,41 +9,39 @@
 
 public class Ball extends Entity {
 
-    private int speed;
     private Color color = Color.WHITE;
 
-    float dx = 1;
-    float dy = 1;
+    public double dx,dy,speed;
 
     public Ball(Vector position, int width, int height) {
         super(position, width, height);
-        speed = 1;
+        speed = 3;
+        dx = 1;
+        dy = 1;
     }
 
-    public void invertDX() {
-        dx *= -1;
-    }
-
-    public void increaseSpeed() {
-        this.speed += 1;
-    }
+    @Override
+    public void update() {
 
-    public int getSpeed() {
-        return speed;
-    }
+        if(position.y < 0 || position.y > GameWindow.getWindowHeight() - this.height)
+            dy *= -1;
 
-    public void setSpeed(int speed) {
-        this.speed = speed;
+        position.x += dx;
+        position.y += dy;
+        super.update();
     }
 
-    @Override
-    public void update() {
+    public void calculateAngleAfterColisionWith(Entity paddle) {
+        double relativeInsersectY = (paddle.getPosition().y + (paddle.getHeight()/2.0)) - (this.getPosition().y + (this.getHeight() / 2.0));
+        double normalIntersectY = relativeInsersectY / (paddle.getHeight() / 2.0);
+        double theta = Math.toRadians(normalIntersectY * 45);
 
-        position.x += dx * speed;
-        position.y += dy * speed;
+        double newDx = Math.abs(Math.cos(theta)) * this.speed;
+        double newDy = (-Math.sin(theta)) * this.speed;
 
-        if(position.y < 0 || position.y > GameWindow.getWindowHeight() - this.height)
-            dy *= -1;
+        double oldSign = Math.signum(this.dx);
+        this.dx = newDx * (-1.0 * oldSign);
+        this.dy = newDy;
     }
 
     @Override

src/main/java/com/gustavolr/game_entities/Enemy.java

@@ -5,6 +5,7 @@
 
 import com.gustavolr.engine.entity.Entity;
 import com.gustavolr.engine.entity.Vector;
+import com.gustavolr.engine.window.GameWindow;
 
 public class Enemy extends Entity {
 
@@ -19,15 +20,17 @@ public Enemy(Vector position, int width, int height) {
     public void render(Graphics g) {
         g.setColor(this.color);
         g.fillRect(this.position.x, this.position.y, this.width, this.height);
+        super.update();
     }
 
     public void ballMoved(Vector ballPosition) {
 
         Vector direction = new Vector();
 
-        if (ballPosition.y < position.y) {
+        if (ballPosition.y < position.y && position.y > 0) {
             direction.y -= speed;
-        } else {
+            
+        } else if (ballPosition.y > position.y && position.y < GameWindow.getWindowHeight() - this.height ) {
             direction.y += speed;
         }
 

src/main/java/com/gustavolr/game_entities/Player.java

@@ -31,6 +31,7 @@ else if (GameInput.isKeyPressed(KeyEvent.VK_DOWN) && position.y < GameWindow.get
         }
 
         this.position = this.position.add(direction);
+        super.update();
     }
 
     @Override

src/main/java/com/gustavolr/game_scenes/MainScene.java

@@ -31,8 +31,8 @@ public final class MainScene implements Scene {
     private final List<Entity> entities;
 
     public MainScene() {
-        p = new Player(PLAYER_START_POSITION.clone(), 5, 25);
-        e = new Enemy(ENEMY_START_POSITION.clone(), 5, 25);
+        p = new Player(PLAYER_START_POSITION.clone(), 4, 35);
+        e = new Enemy(ENEMY_START_POSITION.clone(), 4, 35);
         b = new Ball(BALL_START_POSITION.clone(),7,7);
 
         this.enemyScore = 0;
@@ -59,6 +59,9 @@ public void update() {
             e.update();
         }
 
+        System.out.println("b.dx = " + b.dx);
+        System.out.println("b.dy = " + b.dy);
+
         e.ballMoved(b.getPosition());
 
         checkIfBallCollidedWithPaddles();
@@ -67,17 +70,26 @@ public void update() {
     }   
 
     public void checkIfBallCollidedWithPaddles() {
-        if (b.isColidding(e)) {
-            b.invertDX();
-        } else if(b.isColidding(p)) {
-            b.invertDX();
+        if (b.isColidding(e) || b.isColidding(p)) {
+
+            System.out.println("colisao com paddle");
+            Entity collidedEntity;
+
+            if(b.isColidding(e)) {
+                collidedEntity = e;
+            } else {
+                collidedEntity = p;
+            }
+
+            b.calculateAngleAfterColisionWith(collidedEntity);
         }
     }
 
     public void checkForScoring() {
         Vector ballPosition = b.getPosition();
+        int width = b.getWidth();
 
-        if (enemyScored(ballPosition.x)) {
+        if (enemyScored(ballPosition.x, width)) {
             enemyScore += 1;
             enemyScoreText.setLabel(Integer.toString(enemyScore));
             updateBallPosition();
@@ -93,14 +105,14 @@ public boolean playerScored(int ball_x) {
         return ball_x > GameWindow.getWindowWidth();
     }
 
-    public boolean enemyScored(int ball_x) {
-        return ball_x < 0;
+    public boolean enemyScored(int ball_x, int ball_width) {
+        return ball_x < -ball_width;
     } 
 
     public void updateBallPosition() {
         b.setPosition(BALL_START_POSITION.clone());
-        b.setSpeed(1);
-        b.invertDX();
+        b.dx = 1;
+        b.dy = 1;
     }
 
     @Override