jogo quase pronto

GustavoLR548 · GustavoLR548 · commit bfe0d338ad1b · 2022-12-12T15:28:00.000-03:00
diff --git a/src/main/java/com/gustavolr/Main.java b/src/main/java/com/gustavolr/Main.java
@@ -3,8 +3,7 @@
 import com.gustavolr.engine.GameEngine;
 import com.gustavolr.game_scenes.MainScene;
 
-public final class Main 
-{
+public final class Main  {
     public static void main( String[] args ) {
         GameEngine gameEngine = new GameEngine();
         
diff --git a/src/main/java/com/gustavolr/engine/entity/Vector.java b/src/main/java/com/gustavolr/engine/entity/Vector.java
@@ -24,4 +24,13 @@ public Vector add(Vector v) {
         return tmp;
     }
 
+    public Vector clone() {
+        return new Vector(x,y);
+    }
+
+    @Override
+    public String toString() {
+        return "Vector(x:" + x + ", y:" + y + ");";
+    }
+
 }
diff --git a/src/main/java/com/gustavolr/engine/input/GameInput.java b/src/main/java/com/gustavolr/engine/input/GameInput.java
@@ -40,7 +40,6 @@ public void keyReleased(KeyEvent k) {
     @Override
     public void keyTyped(KeyEvent arg0) {
         // TODO Auto-generated method stub
-        System.out.println(arg0);
     }
     
 }
diff --git a/src/main/java/com/gustavolr/engine/ui/Text/Text.java b/src/main/java/com/gustavolr/engine/ui/Text/Text.java
@@ -0,0 +1,62 @@
+package com.gustavolr.engine.ui.Text;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+
+import com.gustavolr.engine.entity.Entity;
+import com.gustavolr.engine.entity.Vector;
+
+public class Text extends Entity {
+
+    String label;
+    Color textColor;
+    Font labelFont;
+    byte fontSize;
+    FontMetrics metrics;
+
+    public Text(Vector position, String label) {
+        super(position, 0, 0);
+        
+        this.label = label;
+        this.fontSize = (byte)TextConstants.DEFAULT_FONT_SIZE;
+        this.textColor = TextConstants.DEFAULT_TEXT_COLOR;
+        this.labelFont = TextConstants.DEFAULT_TEXT_FONT;
+
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public Color getTextColor() {
+        return textColor;
+    }
+
+    public void setTextColor(Color textColor) {
+        this.textColor = textColor;
+    }
+
+    public Font getLabelFont() {
+        return labelFont;
+    }
+
+    public void setLabelFont(Font labelFont) {
+        this.labelFont = labelFont;
+    }
+
+	public void render(Graphics g) {
+		
+		g.setColor(this.textColor);
+		g.setFont(labelFont);
+		metrics = g.getFontMetrics(labelFont);
+
+		g.drawString(this.label, this.position.x, this.position.y );
+	}
+
+}
diff --git a/src/main/java/com/gustavolr/engine/ui/Text/TextConstants.java b/src/main/java/com/gustavolr/engine/ui/Text/TextConstants.java
@@ -0,0 +1,11 @@
+package com.gustavolr.engine.ui.Text;
+
+import java.awt.Color;
+import java.awt.Font;
+
+public final class TextConstants {
+    public static final Color DEFAULT_TEXT_COLOR = Color.WHITE;
+    public static final String DEFAULT_FONT = "Century";
+    public static final int DEFAULT_FONT_SIZE = 20;
+    public static final Font DEFAULT_TEXT_FONT = new Font(DEFAULT_FONT, Font.BOLD, DEFAULT_FONT_SIZE);
+}
diff --git a/src/main/java/com/gustavolr/engine/window/GameWindow.java b/src/main/java/com/gustavolr/engine/window/GameWindow.java
@@ -4,7 +4,6 @@
 import java.awt.Graphics;
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
-import java.awt.Color;
 import java.awt.image.BufferStrategy;
 
 import javax.swing.JFrame;
@@ -30,7 +29,6 @@ public GameWindow(String frameName) {
 
     public GameWindow(int width, int height, int scale, String frameName) {
         GameWindow.width = (short)width;
-        System.out.println(height);
         GameWindow.height = (short)height;
         GameWindow.scale = (byte)scale;
 
@@ -99,7 +97,7 @@ public Graphics getWindowLayer() {
 
     public void drawBackground(Graphics g) {
         
-        g.setColor(Color.BLACK);
+        g.setColor(GameWindowConstants.BACKGROUND_COLOR);
         g.fillRect(0, 0, GameWindow.getWindowWidth(), GameWindow.getWindowHeight());
     }
 
diff --git a/src/main/java/com/gustavolr/engine/window/GameWindowConstants.java b/src/main/java/com/gustavolr/engine/window/GameWindowConstants.java
@@ -1,8 +1,12 @@
 package com.gustavolr.engine.window;
 
+import java.awt.Color;
+
 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_SCALE = 4;
+
+    public static final Color BACKGROUND_COLOR = new Color(28, 28, 28);
 }
diff --git a/src/main/java/com/gustavolr/game_entities/Ball.java b/src/main/java/com/gustavolr/game_entities/Ball.java
@@ -6,13 +6,11 @@
 import com.gustavolr.engine.entity.Entity;
 import com.gustavolr.engine.entity.Vector;
 import com.gustavolr.engine.window.GameWindow;
-import com.gustavolr.listeners.BallMovedListener;
 
 public class Ball extends Entity {
 
     private int speed;
-    private Color color;
-    private BallMovedListener listener;
+    private Color color = Color.WHITE;
 
     float dx = 1;
     float dy = 1;
@@ -22,11 +20,7 @@ public Ball(Vector position, int width, int height) {
         speed = 1;
     }
 
-    public void addListener(BallMovedListener b) {
-        this.listener = b;
-    }
-
-    public void ballCollidedWithPaddle() {
+    public void invertDX() {
         dx *= -1;
     }
 
@@ -38,10 +32,6 @@ public void update() {
 
         if(position.y < 0 || position.y > GameWindow.getWindowHeight())
             dy *= -1;
-
-        if (listener != null) {
-            this.listener.ballMoved(position);
-        }
     }
 
     @Override
diff --git a/src/main/java/com/gustavolr/game_entities/Enemy.java b/src/main/java/com/gustavolr/game_entities/Enemy.java
@@ -5,12 +5,11 @@
 
 import com.gustavolr.engine.entity.Entity;
 import com.gustavolr.engine.entity.Vector;
-import com.gustavolr.listeners.BallMovedListener;
 
-public class Enemy extends Entity implements BallMovedListener {
+public class Enemy extends Entity {
 
     private int speed = 1;
-    private Color color = Color.RED;
+    private Color color = new Color(196,30,58);
 
     public Enemy(Vector position, int width, int height) {
         super(position, width, height);
@@ -22,7 +21,6 @@ public void render(Graphics g) {
         g.fillRect(this.position.x, this.position.y, this.width, this.height);
     }
 
-    @Override
     public void ballMoved(Vector ballPosition) {
         
         Vector direction = new Vector();
diff --git a/src/main/java/com/gustavolr/game_entities/Player.java b/src/main/java/com/gustavolr/game_entities/Player.java
@@ -11,7 +11,7 @@
 public class Player extends Entity {
 
     private int speed = 1;
-    private Color color = Color.WHITE;
+    private Color color = new Color(65,105,225);
 
     public Player(Vector position, int width, int height) {
         super(position, width, height);
diff --git a/src/main/java/com/gustavolr/game_scenes/MainScene.java b/src/main/java/com/gustavolr/game_scenes/MainScene.java
@@ -1,33 +1,52 @@
 package com.gustavolr.game_scenes;
 
 import java.awt.Graphics;
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
 import com.gustavolr.engine.entity.Entity;
 import com.gustavolr.engine.entity.Vector;
 import com.gustavolr.engine.scene.Scene;
+import com.gustavolr.engine.ui.Text.Text;
 import com.gustavolr.engine.window.GameWindow;
 import com.gustavolr.game_entities.*;
 
-public class MainScene implements Scene {
+public final class MainScene implements Scene {
 
     private Player p;
     private Enemy e;
     private Ball b;
 
+    private Text enemyScoreText;
+    private Text playerScoreText;
+
+    private int enemyScore;
+    private int playerScore;
+
     private final List<Entity> entities;
     
     public MainScene() {
-        p = new Player(new Vector(), 10, 50);
-        e = new Enemy(new Vector(GameWindow.getWindowWidth()-10,0), 10, 50);
-        b = new Ball(new Vector(GameWindow.getWindowWidth()/2-3,GameWindow.getWindowHeight()/2-3),7,7);
-        b.addListener(e);
+        p = new Player(MainSceneConstants.PLAYER_START_POSITION.clone(), 10, 50);
+        e = new Enemy(MainSceneConstants.ENEMY_START_POSITION.clone(), 10, 50);
+        b = new Ball(MainSceneConstants.BALL_START_POSITION.clone(),7,7);
+
+        this.enemyScore = 0;
+        int enemyScorePositionX = (int)(GameWindow.getWindowWidth() - (GameWindow.getWindowWidth()*0.15));
+        int enemyScorePositionY = (int)(GameWindow.getWindowWidth()*0.1);
+        enemyScoreText = new Text(new Vector(enemyScorePositionX,enemyScorePositionY), "0");
+
+        this.playerScore = 0;
+        int playerScorePositionX = (int)(GameWindow.getWindowWidth() - (GameWindow.getWindowWidth()*0.87));
+        int playerScorePositionY = (int)(GameWindow.getWindowWidth()*0.1);
+        playerScoreText = new Text(new Vector(playerScorePositionX,playerScorePositionY), "0");
 
         entities = new ArrayList<>();
         entities.add(p);
         entities.add(e);
         entities.add(b);
+        entities.add(enemyScoreText);
+        entities.add(playerScoreText);
     }
 
     @Override
@@ -36,17 +55,73 @@ public void update() {
             e.update();
         }
 
+        e.ballMoved(b.getPosition());
+
+        checkIfBallCollidedWithPaddles();
+
+        checkForScoring();
+    }   
+
+    public void checkIfBallCollidedWithPaddles() {
         if (b.isColidding(e)) {
-            b.ballCollidedWithPaddle();
+            b.invertDX();
         } else if(b.isColidding(p)) {
-            b.ballCollidedWithPaddle();
+            b.invertDX();
         }
-    }   
+    }
+
+    public void checkForScoring() {
+        Vector ballPosition = b.getPosition();
+
+        if (enemyScored(ballPosition.x)) {
+            enemyScore += 1;
+            enemyScoreText.setLabel(Integer.toString(enemyScore));
+            updateBallPosition();
+
+        } else if(playerScored(ballPosition.x)) {
+            playerScore += 1;
+            playerScoreText.setLabel(Integer.toString(playerScore));
+            updateBallPosition();
+        }
+    }
+
+    public boolean playerScored(int ball_x) {
+        return ball_x > GameWindow.getWindowWidth();
+    }
+
+    public boolean enemyScored(int ball_x) {
+        return ball_x < 0;
+    } 
+
+    public void updateBallPosition() {
+        b.setPosition(MainSceneConstants.BALL_START_POSITION.clone());
+        b.invertDX();
+    }
 
     @Override
     public void render(Graphics g) {
+
+        drawNet(g, 
+                GameWindow.getWindowWidth()/2, 
+                5, GameWindow.getWindowWidth()/2, 
+                GameWindow.getWindowHeight()+5, 
+                5);
+
         for( Entity e : entities) {
             e.render(g);
         }
     }
+
+    public static void drawNet(Graphics g, int x0, int y0, int x1, int y1, int interval) {
+        g.setColor(Color.WHITE);
+        if (y0 == y1) {
+            for (int i = x0; i < x1; i += interval) {
+                g.drawLine(i, y0, i, y1);
+            }
+        } else {
+            for (int i = y0; i < y1; i += interval) {
+                g.drawLine(x0, i, x1, i);
+            }
+        }
+    }
 }
diff --git a/src/main/java/com/gustavolr/game_scenes/MainSceneConstants.java b/src/main/java/com/gustavolr/game_scenes/MainSceneConstants.java
@@ -0,0 +1,11 @@
+package com.gustavolr.game_scenes;
+
+import com.gustavolr.engine.entity.Vector;
+import com.gustavolr.engine.window.GameWindow;
+
+public final class MainSceneConstants {
+    
+    public static final Vector PLAYER_START_POSITION = new Vector(0,GameWindow.getWindowHeight()/2);
+    public static final Vector ENEMY_START_POSITION = new Vector(GameWindow.getWindowWidth()-10,0);
+    public static final Vector BALL_START_POSITION = new Vector(GameWindow.getWindowWidth()/2-3,GameWindow.getWindowHeight()/2-3);
+}
diff --git a/src/main/java/com/gustavolr/listeners/BallMovedListener.java b/src/main/java/com/gustavolr/listeners/BallMovedListener.java

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,13 @@ public Vector add(Vector v) {`
`24`	`24`	`return tmp;`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ public Vector clone() {`
	`28`	`+ return new Vector(x,y);`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ @Override`
	`32`	`+ public String toString() {`
	`33`	`+ return "Vector(x:" + x + ", y:" + y + ");";`
	`34`	`+ }`
	`35`	`+`
`27`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ public void keyReleased(KeyEvent k) {`
`40`	`40`	`@Override`
`41`	`41`	`public void keyTyped(KeyEvent arg0) {`
`42`	`42`	`// TODO Auto-generated method stub`
`43`		`- System.out.println(arg0);`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`}`