From 7597ae93f38aaa32b099b19a3b65b96196f735e3 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Sat, 2 Jun 2012 18:46:15 -0400
Subject: Fixed wonky characters

Instead of rendering a font, characters are now taken from a character map. Also, tick() was removed from GameState because it is only ever called after processInput() and so there's no real point in having separate methods.
---
 src/com/fourisland/frigidearth/GameState.java      |   2 +-
 src/com/fourisland/frigidearth/Main.java           |   3 --
 .../fourisland/frigidearth/MapViewGameState.java   |  35 +++++++-------
 src/com/fourisland/frigidearth/SystemFont.java     |  52 +++++++++++++++++++++
 .../frigidearth/TransparentPixelFilter.java        |  35 ++++++++++++++
 .../fourisland/frigidearth/resources/RMG2000.ttf   | Bin 70260 -> 0 bytes
 src/com/fourisland/frigidearth/resources/font2.png | Bin 0 -> 5254 bytes
 7 files changed, 104 insertions(+), 23 deletions(-)
 create mode 100644 src/com/fourisland/frigidearth/SystemFont.java
 create mode 100644 src/com/fourisland/frigidearth/TransparentPixelFilter.java
 delete mode 100644 src/com/fourisland/frigidearth/resources/RMG2000.ttf
 create mode 100644 src/com/fourisland/frigidearth/resources/font2.png

(limited to 'src/com')

diff --git a/src/com/fourisland/frigidearth/GameState.java b/src/com/fourisland/frigidearth/GameState.java
index 08aa173..860411e 100644
--- a/src/com/fourisland/frigidearth/GameState.java
+++ b/src/com/fourisland/frigidearth/GameState.java
@@ -10,5 +10,5 @@ package com.fourisland.frigidearth;
  */
 public interface GameState extends Renderable, Inputable
 {
-    public void tick();
+    
 }
diff --git a/src/com/fourisland/frigidearth/Main.java b/src/com/fourisland/frigidearth/Main.java
index fe936b0..ed35f9c 100644
--- a/src/com/fourisland/frigidearth/Main.java
+++ b/src/com/fourisland/frigidearth/Main.java
@@ -61,7 +61,6 @@ public class Main
             public void keyPressed(KeyEvent ke)
             {
                 inputables.peek().processInput(ke);
-                gameState.tick();
             }
 
             @Override
@@ -77,8 +76,6 @@ public class Main
         
         setGameState(new MapViewGameState());
         
-        gameState.tick();
-        
         long waitTime = System.nanoTime() + (1000000*FPS);
         for (;;)
         {
diff --git a/src/com/fourisland/frigidearth/MapViewGameState.java b/src/com/fourisland/frigidearth/MapViewGameState.java
index 543ce0b..2ecaeb1 100644
--- a/src/com/fourisland/frigidearth/MapViewGameState.java
+++ b/src/com/fourisland/frigidearth/MapViewGameState.java
@@ -37,22 +37,6 @@ public class MapViewGameState implements GameState
             }
         }
     }
-    
-    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)
     {
@@ -67,9 +51,7 @@ public class MapViewGameState implements GameState
         }
         
         // 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);
+        g.drawImage(SystemFont.getCharacter('@'), playerx*TILE_WIDTH, playery*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
     }
     
     public void processInput(KeyEvent e)
@@ -98,6 +80,21 @@ public class MapViewGameState implements GameState
             {
                 playery++;
             }
+        } else {
+            return;
+        }
+        
+        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));
+                }
+            }
         }
     }
 }
diff --git a/src/com/fourisland/frigidearth/SystemFont.java b/src/com/fourisland/frigidearth/SystemFont.java
new file mode 100644
index 0000000..2ea5057
--- /dev/null
+++ b/src/com/fourisland/frigidearth/SystemFont.java
@@ -0,0 +1,52 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourisland.frigidearth;
+
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
+import java.awt.Transparency;
+import java.awt.image.BufferedImage;
+import java.awt.image.FilteredImageSource;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.imageio.ImageIO;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class SystemFont
+{
+    private static BufferedImage fontGraphic = null;
+    
+    public static void initalize()
+    {
+        try
+        {
+            BufferedImage temp = ImageIO.read(SystemFont.class.getResourceAsStream("resources/font2.png"));
+            GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
+            GraphicsDevice device = env.getDefaultScreenDevice();
+            GraphicsConfiguration config = device.getDefaultConfiguration();
+            fontGraphic = config.createCompatibleImage(temp.getWidth(), temp.getHeight(), Transparency.TRANSLUCENT);
+            fontGraphic.createGraphics().drawImage(Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(temp.getSource(), new TransparentPixelFilter(temp.getRGB(0, 0)))),0,0,null);
+        } catch (IOException ex)
+        {
+            Logger.getLogger(SystemFont.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
+    
+    public static BufferedImage getCharacter(char c)
+    {
+        if (fontGraphic == null)
+        {
+            initalize();
+        }
+        
+        return fontGraphic.getSubimage((c % 16) * 12, (c / 16) * 12, 12, 12);
+    }
+}
diff --git a/src/com/fourisland/frigidearth/TransparentPixelFilter.java b/src/com/fourisland/frigidearth/TransparentPixelFilter.java
new file mode 100644
index 0000000..3f7e92b
--- /dev/null
+++ b/src/com/fourisland/frigidearth/TransparentPixelFilter.java
@@ -0,0 +1,35 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.fourisland.frigidearth;
+
+import java.awt.image.RGBImageFilter;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class TransparentPixelFilter extends RGBImageFilter {
+
+    private int trans;
+    public TransparentPixelFilter(int i)
+    {
+        trans = i;
+        
+        canFilterIndexColorModel = true;
+    }
+
+    @Override
+    public int filterRGB(int x, int y, int rgb)
+    {
+        if (rgb == trans)
+        {
+            return 0;
+        } else {
+            return rgb;
+        }
+    }
+
+}
diff --git a/src/com/fourisland/frigidearth/resources/RMG2000.ttf b/src/com/fourisland/frigidearth/resources/RMG2000.ttf
deleted file mode 100644
index 5012ff1..0000000
Binary files a/src/com/fourisland/frigidearth/resources/RMG2000.ttf and /dev/null differ
diff --git a/src/com/fourisland/frigidearth/resources/font2.png b/src/com/fourisland/frigidearth/resources/font2.png
new file mode 100644
index 0000000..540690c
Binary files /dev/null and b/src/com/fourisland/frigidearth/resources/font2.png differ
-- 
cgit 1.4.1