diff --git a/control/GameControl.java b/control/GameControl.java index 1458380..4b9b3f3 100644 --- a/control/GameControl.java +++ b/control/GameControl.java @@ -26,7 +26,7 @@ public class GameControl implements JoystickListener, ButtonListener, ActionList this.view = view; this.gsm = gsm; view.setIgnoreRepaint(true); - update = new Timer(0,this); + update = new Timer(1000/60,this); update.start(); // Timer update = new Timer(); // update.schedule(new TimerTask() { diff --git a/control/GameStateManager.java b/control/GameStateManager.java index eca79de..c9e47df 100644 --- a/control/GameStateManager.java +++ b/control/GameStateManager.java @@ -9,6 +9,7 @@ import model.gameState.GameOverState; import model.gameState.GameState; import model.gameState.MenuState; import model.gameState.PlayState; +import model.gameState.PreGameState; import model.gameState.TitleState; import control.button.Button; import control.button.ButtonHandler; @@ -24,7 +25,8 @@ public class GameStateManager { TITLE_STATE, MENU_STATE, PLAY_STATE, - GAMEOVER_STATE + GAMEOVER_STATE, + PRE_GAME_STATE } public GameStateManager(SongHandler sh){ @@ -33,6 +35,7 @@ public class GameStateManager { gamestates.add(new MenuState(this, sh)); gamestates.add(new PlayState(this, sh)); gamestates.add(new GameOverState(this, sh)); + gamestates.add(new PreGameState(this,sh)); setState(State.TITLE_STATE); } diff --git a/image/Images.java b/image/Images.java index bf0536b..7d6043a 100644 --- a/image/Images.java +++ b/image/Images.java @@ -33,6 +33,8 @@ public class Images { images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/aanwijzers4sho.png")))); images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/kast.png")))); images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/gameover.png")))); + images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/screenshot.png")))); + } catch (IOException e) { e.printStackTrace(); } @@ -43,7 +45,7 @@ public class Images { } public enum ImageType { - pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast,gameover + pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast,gameover, screenshot } public static BufferedImage readImage(File f) { diff --git a/image/screenshot.png b/image/screenshot.png new file mode 100644 index 0000000..4f04a35 Binary files /dev/null and b/image/screenshot.png differ diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java index e81029e..f696188 100644 --- a/model/gameState/MenuState.java +++ b/model/gameState/MenuState.java @@ -160,7 +160,7 @@ public class MenuState extends GameState { } if(e.getButton().getButtonID() == 1){ sh.close(); - gsm.setState(control.GameStateManager.State.PLAY_STATE); + gsm.setState(control.GameStateManager.State.PRE_GAME_STATE); } }else{ //Screen for selecting song if(e.getButton().getButtonID() == 1){ diff --git a/model/gameState/PreGameState.java b/model/gameState/PreGameState.java new file mode 100644 index 0000000..d750fb8 --- /dev/null +++ b/model/gameState/PreGameState.java @@ -0,0 +1,75 @@ +package model.gameState; + +import image.Images; + +import java.awt.Font; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; + +import model.SongHandler; +import control.GameStateManager; +import control.button.ButtonEvent; +import control.joystick.JoystickEvent; + +public class PreGameState extends GameState { + + double index2 = 2.25; + double index = 2.25; + double timer; + + BufferedImage screenshot; + + public PreGameState(GameStateManager gsm, SongHandler sh) { + super(gsm, sh); + screenshot = Images.getImage(Images.ImageType.screenshot); + } + + @Override + public void init() { + + } + + @Override + public void update(float factor) { +// timer = timer +factor/1000; +// index -= timer; + index2 -= factor/1000; + index = (double) Math.round(index2*1000)/1000; + if(index <= 0){ + gsm.setState(control.GameStateManager.State.PLAY_STATE); + } + + } + + @Override + public void draw(Graphics2D g2) { + Font textFont = new Font("OCR A Extended", Font.BOLD,200); + g2.setFont(textFont); + g2.drawString("" + index, 325, 400); + + if(index < 0.75) + g2.drawString("GO!!!",325,600); + else if (index < 1.5) + g2.drawString("SET", 450,600); + else + g2.drawString("READY", 325, 600); + + } + + + @Override + public void buttonPressed(ButtonEvent e) { + + } + + @Override + public void buttonReleased(ButtonEvent e) { + + } + + @Override + public void onJoystickMoved(JoystickEvent e) { + + } + +}