primeira versao

Author: GustavoLR548

res/sfx/paddle.wav

@@ -4,6 +4,7 @@
 import com.gustavolr.game_scenes.MainScene;
 
 public final class Main  {
+    
     public static void main( String[] args ) {
         GameEngine gameEngine = new GameEngine();
 

res/sfx/score.wav

@@ -3,6 +3,7 @@
 import java.awt.Graphics;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import com.gustavolr.engine.game_loop.GameLoop;
 import com.gustavolr.engine.game_loop.GameLoopListener;
@@ -17,6 +18,8 @@ public final class GameEngine implements GameLoopListener{
 
     private final List<Scene> scene_manager;
 
+    public static Random rng = new Random();
+
     public GameEngine() {
 
         this.scene_manager = new ArrayList<>();

res/sfx/wall.wav

@@ -8,8 +8,6 @@ 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;
@@ -37,27 +35,19 @@ 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) {   
-        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);
+
+		Rectangle e1Mask = new Rectangle((int)e1.position.x, (int)e1.position.y, e1.width, e1.height);
+		Rectangle e2Mask = new Rectangle((int)this.position.x, (int)this.position.y, this.width, this.height);
 
         boolean response = e1Mask.intersects(e2Mask);
-        if(response)
-            collision_timer = 0;
 
 		return response;
 	}

src/main/java/com/gustavolr/Main.java

@@ -2,15 +2,15 @@
 
 public class Vector {
 
-    public int x;
-    public int y;
+    public float x;
+    public float y;
 
     public Vector() {
         this.x = 0;
         this.y = 0;
     }
 
-    public Vector(int x, int y) {
+    public Vector(float x, float y) {
         this.x = x;
         this.y = y;
     }

src/main/java/com/gustavolr/engine/GameEngine.java

@@ -0,0 +1,59 @@
+package com.gustavolr.engine.sound;
+
+import java.io.File;
+
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+
+public class SoundPlayer {
+    
+    Clip soundClip;
+    public String fileName;
+
+    boolean soundLoaded;
+
+    public SoundPlayer() {
+        soundLoaded = false;
+    }
+
+    public SoundPlayer(String fileName) {
+        this.fileName = fileName;
+        this.loadSFXfromFile(fileName);
+    }
+
+    public void loadSFXfromFile(String fileName) {
+
+        File sfxFile = new File(fileName.strip());
+
+        try {
+
+            AudioInputStream audio = AudioSystem.getAudioInputStream(sfxFile);
+            this.soundClip = AudioSystem.getClip();
+            soundClip.open(audio);
+        
+            this.soundLoaded = true;
+        } catch (Exception e) {
+
+            e.printStackTrace();
+            soundLoaded = false;
+        } 
+    }
+    
+    public void setLoopMode(int loopMode) {
+        soundClip.loop(loopMode);
+    }
+
+    public void play() {
+
+        if (soundLoaded) {
+
+            soundClip.setFramePosition(0);
+            soundClip.start();
+        } else {
+
+            System.err.println("Error! No sound/music was loaded!");
+        }
+    }
+
+}

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

@@ -56,7 +56,7 @@ public void render(Graphics g) {
 		g.setFont(labelFont);
 		metrics = g.getFontMetrics(labelFont);
 
-		g.drawString(this.label, this.position.x, this.position.y );
+		g.drawString(this.label, (int)this.position.x, (int)this.position.y );
 	}
 
 }

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

@@ -3,32 +3,40 @@
 import java.awt.Graphics;
 import java.awt.Color;
 
+import com.gustavolr.engine.GameEngine;
 import com.gustavolr.engine.entity.Entity;
 import com.gustavolr.engine.entity.Vector;
+import com.gustavolr.engine.sound.SoundPlayer;
 import com.gustavolr.engine.window.GameWindow;
+import com.gustavolr.utils.OsUtils;
 
 public class Ball extends Entity {
 
     private Color color = Color.WHITE;
 
     public double dx,dy,speed;
 
+    private final static SoundPlayer wallSFX = new SoundPlayer(OsUtils.getResource(OsUtils.join("sfx","wall.wav")).getFile());
+    private final static SoundPlayer paddleSFX = new SoundPlayer(OsUtils.getResource(OsUtils.join("sfx","paddle.wav")).getFile());
+
     public Ball(Vector position, int width, int height) {
         super(position, width, height);
-        speed = 3;
-        dx = 1;
-        dy = 1;
+        speed = 2;
+        dx = (GameEngine.rng.nextInt(1) == 1 ? -1 : 1) * speed;
+        dy = 0;
     }
 
     @Override
     public void update() {
 
-        if(position.y < 0 || position.y > GameWindow.getWindowHeight() - this.height)
+        if((position.y <= 0 && dy < 0) || position.y >= GameWindow.getWindowHeight() - height) {
             dy *= -1;
+            wallSFX.play();
+        }
 
         position.x += dx;
         position.y += dy;
-        super.update();
+
     }
 
     public void calculateAngleAfterColisionWith(Entity paddle) {
@@ -42,12 +50,15 @@ public void calculateAngleAfterColisionWith(Entity paddle) {
         double oldSign = Math.signum(this.dx);
         this.dx = newDx * (-1.0 * oldSign);
         this.dy = newDy;
+
+        speed += 0.1;
+        paddleSFX.play();
     }
 
     @Override
     public void render(Graphics g) {
         g.setColor(color);
-        g.fillOval(position.x, position.y, width, height);
+        g.fillOval((int)position.x, (int)position.y, width, height);
     }
 
 }