Merge pull request #1 from Programando-o-Mundo/awt-refactor

Awt refactor

Author: GustavoLR548

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

@@ -15,6 +15,7 @@ public final class GameEngine implements GameLoopListener{
 
     private final GameWindow window;
     private final GameInput input;
+    private GameLoop gameLoop;
 
     private final List<Scene> scene_manager;
 
@@ -37,15 +38,15 @@ public void addScene(Scene scene) {
     public void start() {
         this.window.toggleFrameVisibility(true);
         this.window.requestFocus();
-        new GameLoop(this);
+        gameLoop = new GameLoop(this);
     }
 
     @Override
     public void update() {
 
-        for(Scene scene : scene_manager) {
+        for(Scene scene : scene_manager) 
             scene.update();
-        }
+        
     }
 
     @Override
@@ -55,6 +56,7 @@ public void render() {
         if ( g == null ) 
             return;
 
+        
         this.window.drawBackground(g);
 
         // Game Rendering goes here

src/main/java/com/gustavolr/engine/sound/SoundPlayer.java

@@ -1,6 +1,8 @@
 package com.gustavolr.engine.sound;
 
+import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.InputStream;
 
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
@@ -9,26 +11,24 @@
 public class SoundPlayer {
 
     Clip soundClip;
-    public String fileName;
 
     boolean soundLoaded;
 
     public SoundPlayer() {
         soundLoaded = false;
     }
 
-    public SoundPlayer(String fileName) {
-        this.fileName = fileName;
+    public SoundPlayer(InputStream fileName) {
         this.loadSFXfromFile(fileName);
     }
 
-    public void loadSFXfromFile(String fileName) {
+    public void loadSFXfromFile(InputStream file) {
 
-        File sfxFile = new File(fileName.strip());
+        InputStream bufferedInputStream = new BufferedInputStream(file);
 
         try {
 
-            AudioInputStream audio = AudioSystem.getAudioInputStream(sfxFile);
+            AudioInputStream audio = AudioSystem.getAudioInputStream(bufferedInputStream);
             this.soundClip = AudioSystem.getClip();
             soundClip.open(audio);
 

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

@@ -1,25 +1,23 @@
 package com.gustavolr.engine.window;
 
-import java.awt.Canvas;
-import java.awt.Graphics;
 import java.awt.Dimension;
+import java.awt.Frame;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferStrategy;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.awt.Graphics;
 
-import javax.swing.JFrame;
-
-public final class GameWindow extends Canvas{
-    
-    private static final long serialVersionUID = 1L;
-
-    private static JFrame windowFrame;
+public final class GameWindow extends Frame implements WindowListener{
 
     private static short width;
     private static short height;
     private static byte scale;
 
     public static BufferedImage bufferLayer;
 
+    public boolean playerPressXtoQuit;
+
     public GameWindow(String frameName) {
         this(GameWindowConstants.DEFAULT_WINDOW_WIDTH, 
              GameWindowConstants.DEFAULT_WINDOW_HEIGHT, 
@@ -28,10 +26,13 @@ public GameWindow(String frameName) {
     }
 
     public GameWindow(int width, int height, int scale, String frameName) {
+        super(frameName);
         GameWindow.width = (short)width;
         GameWindow.height = (short)height;
         GameWindow.scale = (byte)scale;
 
+        playerPressXtoQuit = false;
+
         this.initWindowFrame(frameName);
     }
 
@@ -61,18 +62,15 @@ public BufferedImage getBufferedImage() {
 
     public void initWindowFrame(String frameName) {
 
-        windowFrame = new JFrame(frameName);
-
-        windowFrame.setResizable(false);
+        setResizable(false);
 
-        windowFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
-        this.setPreferredSize(new Dimension(width*scale,height*scale));
-        windowFrame.add(this);
-        windowFrame.pack(); // The pack method sizes the frame so that all its contents are at or above their preferred sizes
+        setPreferredSize(new Dimension(width*scale,height*scale));
 
+        pack(); // The pack method sizes the frame so that all its contents are at or above their preferred sizes
+        addWindowListener(this);
         // Centralize the window to the center of the user screen
-        windowFrame.setLocationRelativeTo(null); 
+        setLocationRelativeTo(null); 
+        setLayout(null);
 
         bufferLayer = new BufferedImage((int)width,(int)height, BufferedImage.TYPE_INT_RGB);
 
@@ -82,7 +80,7 @@ public void initWindowFrame(String frameName) {
     }
 
     public void toggleFrameVisibility(boolean visibility) {
-        windowFrame.setVisible(visibility);
+        this.setVisible(visibility);
     }
 
     public Graphics getWindowLayer() {
@@ -106,11 +104,58 @@ public void drawFinalScene(Graphics g) {
         BufferStrategy bs = this.getBufferStrategy();
 
         g.dispose();
-        g = bs.getDrawGraphics();
 
-        g.drawImage(bufferLayer, 0, 0, width * scale, height * scale, null);
+        try {
+            g = bs.getDrawGraphics();
+
+            g.drawImage(bufferLayer, 5, 29, width * scale, height * scale, null);
+        
+            bs.show();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void windowActivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void windowClosed(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void windowClosing(WindowEvent arg0) {
+        setVisible(false);
+        dispose();
+        System.exit(0);
+    }
+
+    @Override
+    public void windowDeactivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void windowDeiconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void windowIconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    @Override
+    public void windowOpened(WindowEvent arg0) {
+        // TODO Auto-generated method stub
 
-        bs.show();
     }
-    
 }

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

@@ -16,8 +16,8 @@ public class Ball extends Entity {
 
     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());
+    private final static SoundPlayer wallSFX = new SoundPlayer(OsUtils.getResourceAsInputStream(OsUtils.join("sfx","wall.wav")));
+    private final static SoundPlayer paddleSFX = new SoundPlayer(OsUtils.getResourceAsInputStream(OsUtils.join("sfx","paddle.wav")));
 
     public Ball(Vector position, int width, int height) {
         super(position, width, height);

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

@@ -34,9 +34,9 @@ public final class MainScene implements Scene {
 
     private final List<Entity> entities;
 
-    private final static SoundPlayer scoreSFX = new SoundPlayer(OsUtils.getResource(OsUtils.join("sfx","score.wav")).getFile());
+    private final static SoundPlayer scoreSFX = new SoundPlayer(OsUtils.getResourceAsInputStream(OsUtils.join("sfx","score.wav")));
 
-    private final static int MAX_SCORE = 1;
+    private final static int MAX_SCORE = 3;
 
     public MainScene() {