Engine: Wrote Message System

MessageWindow now has a static method run by SpecialEvent that triggers the message box. This method blocks until the message is complete and renders via Display's new feature. The message box also now features the "next" arrow and the letters gradually appear.

Display has also been re-worked to have a list of a new interface called Renderable, which is any object that can be rendered. Such objects (such as MessageWindow) can register to Display, which will render them onto the game frame after the GameState has been rendered.

Closes #5.

4 files changed, 11 insertions, 34 deletions

@@ -5,30 +5,18 @@
 
 package com.fourisland.fourpuzzle.gamestate;
 
-import java.awt.Graphics2D;
+import com.fourisland.fourpuzzle.util.Renderable;
 
 /**
  *
  * @author hatkirby
  */
-public interface GameState {
+public interface GameState extends Renderable {
     
     public void initalize();
     public void deinitalize();
     
     public void processInput();
     public void doGameCycle();
-    public void render(Graphics2D g);
     
-}
-
-/*
-    TitleScreen
-    MapView
-    Battle
-    GameOver
-    Menu
-    LoadFile
-    SaveFile
-    Transition
-*/
\ No newline at end of file
+}
\ No newline at end of file
@@ -27,20 +27,20 @@ import java.util.Arrays;
 public class TitleScreenGameState implements GameState {
     
     ChoiceWindow choices;
-    int wx, wy;
     
     public void initalize()
     {
         Audio.playMusic(Database.getMusic(Music.Title));
         
-        choices = new ChoiceWindow(Arrays.asList(Database.getVocab(Vocabulary.NewGame), Database.getVocab(Vocabulary.LoadGame), Database.getVocab(Vocabulary.EndGame)), true);
-        wx = (Game.WIDTH/5)-(choices.getWidth()/2);
-        wy = (Game.HEIGHT/4*3)-(choices.getHeight()/2);
+        choices = new ChoiceWindow(Arrays.asList(Database.getVocab(Vocabulary.NewGame), Database.getVocab(Vocabulary.LoadGame), Database.getVocab(Vocabulary.EndGame)), true, ChoiceWindow.ChoiceWindowLocation.BottomLeft);
+        Display.registerRenderable(choices);
     }
     
     public void deinitalize()
     {
         Audio.stopMusic();
+        
+        Display.unregisterRenderable(choices);
     }
 
     PauseTimer pt = new PauseTimer(0);
@@ -112,7 +112,6 @@ public class TitleScreenGameState implements GameState {
     public void render(Graphics2D g)
     {
         g.drawImage(ObjectLoader.getImage("Picture", "Title"), 0, 0, null);
-        choices.render(g, wx, wy);
     }
 
 }
@@ -23,7 +23,6 @@ import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventTh
 import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.AutomaticViewpoint;
 import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.Viewpoint;
 import com.fourisland.fourpuzzle.util.Functions;
-import com.fourisland.fourpuzzle.window.MessageWindow;
 import java.awt.Graphics2D;
 import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
@@ -229,11 +228,6 @@ public class MapViewGameState implements GameState {
 
         g.drawImage(eventLayer, 0, 0, Game.WIDTH, Game.HEIGHT, x, y, x+Game.WIDTH, y+Game.HEIGHT, null);
         g.drawImage(currentMap.renderUpper(), 0, 0, Game.WIDTH, Game.HEIGHT, x, y, x+Game.WIDTH, y+Game.HEIGHT, null);
-        
-        if (mw != null)
-        {
-            mw.render(g);
-        }
     }
     
     public void setCurrentMap(String mapName)
@@ -256,11 +250,5 @@ public class MapViewGameState implements GameState {
     {
         currentViewpoint = viewpoint;
     }
-    
-    volatile MessageWindow mw = null;
-    public void displayMessage(String message)
-    {
-        mw = new MessageWindow(message);
-    }
 
 }
@@ -17,6 +17,7 @@ import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.MovingViewpoint;
 import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.Viewpoint;
 import com.fourisland.fourpuzzle.transition.InTransition;
 import com.fourisland.fourpuzzle.transition.OutTransition;
+import com.fourisland.fourpuzzle.window.MessageWindow;
 import java.util.concurrent.CountDownLatch;
 
 /**
@@ -50,10 +51,11 @@ public class SpecialEvent {
      * been read.
      * 
      * @param message The message to display
+     * @throws InterruptedException 
      */
-    public void DisplayMessage(String message)
+    public void DisplayMessage(String message) throws InterruptedException
     {
-        mapView.displayMessage(message);
+        MessageWindow.displayMessage(message);
     }
 
     /**