6 files changed, 188 insertions, 67 deletions

@@ -8,7 +8,7 @@ package com.fourisland.frigidearth;
  *
  * @author hatkirby
  */
-public interface GameState extends Renderable
+public interface GameState extends Renderable, Inputable
 {
     public void tick();
 }
@@ -0,0 +1,16 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourisland.frigidearth;
+
+import java.awt.event.KeyEvent;
+
+/**
+ *
+ * @author hatkirby
+ */
+public interface Inputable
+{
+    public void processInput(KeyEvent e);
+}
@@ -13,9 +13,12 @@ import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
 import java.awt.Transparency;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.awt.image.BufferStrategy;
 import java.awt.image.BufferedImage;
 import java.util.List;
+import java.util.Stack;
 import java.util.concurrent.CopyOnWriteArrayList;
 import javax.swing.JFrame;
 
@@ -25,8 +28,9 @@ import javax.swing.JFrame;
  */
 public class Main
 {
-    static final int GAME_WIDTH = 320;
-    static final int GAME_HEIGHT = 240;
+    public static final int GAME_WIDTH = 320;
+    public static final int GAME_HEIGHT = 240;
+    public static final int FPS = (1000 / 60); // 60 fps
     
     private static JFrame mainWindow;
     private static Color[][] grid;
@@ -34,6 +38,7 @@ public class Main
     private static int drawOffsetY = 0;
     private static Canvas gameCanvas;
     private static List<Renderable> renderables = new CopyOnWriteArrayList<Renderable>();
+    private static Stack<Inputable> inputables = new Stack<Inputable>();
     private static GameState gameState;
     
     public static void main(String[] args)
@@ -45,31 +50,82 @@ public class Main
         mainWindow.setSize(GAME_WIDTH*2, GAME_HEIGHT*2);
         mainWindow.setLocation(GraphicsEnvironment.getLocalGraphicsEnvironment().getCenterPoint().x-GAME_WIDTH, GraphicsEnvironment.getLocalGraphicsEnvironment().getCenterPoint().y-GAME_HEIGHT);
         mainWindow.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        mainWindow.addKeyListener(new KeyListener() {
+            @Override
+            public void keyTyped(KeyEvent ke)
+            {
+                // No me importa
+            }
+
+            @Override
+            public void keyPressed(KeyEvent ke)
+            {
+                inputables.peek().processInput(ke);
+                gameState.tick();
+            }
+
+            @Override
+            public void keyReleased(KeyEvent ke)
+            {
+                // No me importa
+            }
+        });
         mainWindow.add(gameCanvas);
         mainWindow.setVisible(true);
         
         gameCanvas.createBufferStrategy(2);
         
-        gameState = new TileGameState();
-        renderables.add(gameState);
+        setGameState(new MapViewGameState());
         
         gameState.tick();
         
+        long waitTime = System.nanoTime() + (1000000*FPS);
         for (;;)
         {
-            render(gameCanvas);
-            
-            try
-            {
-                Thread.sleep(10);
-            } catch (InterruptedException ex)
+            if (System.nanoTime() > waitTime)
             {
-                //Nothing
+                render(gameCanvas);
+                waitTime = System.nanoTime() + (1000000*FPS);
             }
         }
     }
     
-    public static void render(Canvas gameCanvas)
+    public static void setGameState(GameState m_gameState)
+    {
+        renderables.clear();
+        inputables.clear();
+        
+        gameState = m_gameState;
+        renderables.add(gameState);
+        inputables.push(gameState);
+    }
+    
+    public static void addRenderable(Renderable renderable)
+    {
+        renderables.add(renderable);
+    }
+    
+    public static void removeRenderable(Renderable renderable)
+    {
+        renderables.remove(renderable);
+    }
+    
+    public static void addInputable(Inputable inputable)
+    {
+        inputables.push(inputable);
+    }
+    
+    public static void removeInputable(Inputable inputable)
+    {
+        if (inputables.peek() == inputable)
+        {
+            inputables.pop();
+        } else {
+            throw new IllegalStateException("Inputable to be removed must be at the top of the stack");
+        }
+    }
+    
+    private static void render(Canvas gameCanvas)
     {
         BufferStrategy buffer = gameCanvas.getBufferStrategy();
         GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -0,0 +1,103 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourisland.frigidearth;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.event.KeyEvent;
+import java.util.Random;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class MapViewGameState implements GameState
+{
+    private final int TILE_WIDTH = 16;
+    private final int TILE_HEIGHT = 16;
+    private final int GAME_WIDTH = Main.GAME_WIDTH / TILE_WIDTH;
+    private final int GAME_HEIGHT = Main.GAME_HEIGHT / TILE_HEIGHT;
+    private Color[][] grid;
+    private int playerx = 4;
+    private int playery = 4;
+    
+    public MapViewGameState()
+    {
+        Random r = new Random();
+        grid = new Color[GAME_WIDTH][GAME_HEIGHT];
+        
+        for (int x=0; x<GAME_WIDTH; x++)
+        {
+            for (int y=0; y<GAME_HEIGHT; y++)
+            {
+                grid[x][y] = new Color(r.nextInt(256), r.nextInt(256), r.nextInt(256));
+            }
+        }
+    }
+    
+    public void tick()
+    {
+        Random r = new Random();
+        
+        if (r.nextBoolean())
+        {
+            for (int x=0; x<GAME_WIDTH; x++)
+            {
+                for (int y=0; y<GAME_HEIGHT; y++)
+                {
+                    grid[x][y] = new Color(r.nextInt(256), r.nextInt(256), r.nextInt(256));
+                }
+            }
+        }
+    }
+
+    public void render(Graphics2D g)
+    {
+        // Render tiles
+        for (int x=0; x<GAME_WIDTH; x++)
+        {
+            for (int y=0; y<GAME_HEIGHT; y++)
+            {
+                g.setColor(grid[x][y]);
+                g.fillRect(x*TILE_WIDTH, y*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT);
+            }
+        }
+        
+        // Render player
+        g.setColor(Color.white);
+        g.setFont(new Font("Lucida Sans", Font.BOLD, 16));
+        g.drawString("@", playerx*TILE_WIDTH+3, (playery+1)*TILE_HEIGHT);
+    }
+    
+    public void processInput(KeyEvent e)
+    {
+        if (e.getKeyCode() == KeyEvent.VK_LEFT)
+        {
+            if (playerx > 0)
+            {
+                playerx--;
+            }
+        } else if (e.getKeyCode() == KeyEvent.VK_RIGHT)
+        {
+            if (playerx < GAME_WIDTH - 1)
+            {
+                playerx++;
+            }
+        } else if (e.getKeyCode() == KeyEvent.VK_UP)
+        {
+            if (playery > 0)
+            {
+                playery--;
+            }
+        } else if (e.getKeyCode() == KeyEvent.VK_DOWN)
+        {
+            if (playery < GAME_HEIGHT - 1)
+            {
+                playery++;
+            }
+        }
+    }
+}
@@ -1,54 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.fourisland.frigidearth;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.util.Random;
-
-/**
- *
- * @author hatkirby
- */
-public class TileGameState implements GameState
-{
-    private final int TILE_WIDTH = 16;
-    private final int TILE_HEIGHT = 16;
-    private final int GAME_WIDTH = Main.GAME_WIDTH / TILE_WIDTH;
-    private final int GAME_HEIGHT = Main.GAME_HEIGHT / TILE_HEIGHT;
-    private Color[][] grid;
-    
-    public TileGameState()
-    {
-        Random r = new Random();
-        grid = new Color[GAME_WIDTH][GAME_HEIGHT];
-        
-        for (int x=0; x<GAME_WIDTH; x++)
-        {
-            for (int y=0; y<GAME_HEIGHT; y++)
-            {
-                grid[x][y] = new Color(r.nextInt(256), r.nextInt(256), r.nextInt(256));
-            }
-        }
-    }
-    
-    public void tick()
-    {
-        
-    }
-
-    public void render(Graphics2D g)
-    {
-        for (int x=0; x<GAME_WIDTH; x++)
-        {
-            for (int y=0; y<GAME_HEIGHT; y++)
-            {
-                g.setColor(grid[x][y]);
-                g.fillRect(x*TILE_WIDTH, y*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT);
-            }
-        }
-    }
-    
-}