From 9cb41d127063297432f768f7cb0f466b76921103 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Mon, 18 Jan 2010 21:18:07 +0100
Subject: Give up tile based maps; maps look much better now

---
 src/de/gamezock/metacraft/ui/Main.java | 42 +++++++++++++++-------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'src/de/gamezock/metacraft/ui/Main.java')

diff --git a/src/de/gamezock/metacraft/ui/Main.java b/src/de/gamezock/metacraft/ui/Main.java
index f5eb3f9..287af22 100644
--- a/src/de/gamezock/metacraft/ui/Main.java
+++ b/src/de/gamezock/metacraft/ui/Main.java
@@ -16,16 +16,17 @@ import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
 
 import de.gamezock.metacraft.data.Map;
+import de.gamezock.metacraft.data.TestMap;
 
 public class Main implements GLEventListener {
   private Renderer renderer = new Renderer(this);
   
 	private Frame frame = new Frame("metacraft");
 	private GLCanvas canvas;
-	
 	private GLU glu = new GLU();
 	
-	private Map currentMap = new Map();
+	private Map currentMap = new TestMap();
+	
 	
 	public Main() {
 	  GLCapabilities caps = new GLCapabilities(GLProfile.get(GLProfile.GL2));
@@ -56,27 +57,6 @@ public class Main implements GLEventListener {
 
 		frame.setVisible(true);
 		canvas.requestFocusInWindow();
-
-		try {
-		  Thread.sleep(500);
-		} catch (InterruptedException e) {
-		}
-
-		new Thread(new Runnable() {
-
-		  @Override
-		  public void run() {
-		    while(true) {
-		      try {
-		        Thread.sleep(10);
-		      } catch (InterruptedException e) {
-		      }
-
-		      canvas.display();
-		    }
-		  }
-
-		}).start();
 	}
 	
 	Map getCurrentMap() {
@@ -117,6 +97,22 @@ public class Main implements GLEventListener {
     gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_POSITION, new float[] {10, 10, 10, 1}, 0);
     
     gl.glMaterialfv(GL.GL_FRONT, GL2.GL_SPECULAR, new float[] {0, 0, 0, 0}, 0);
+    
+    new Thread(new Runnable() {
+
+      @Override
+      public void run() {
+        while(true) {
+          canvas.display();
+          
+          try {
+            Thread.sleep(10);
+          } catch (InterruptedException e) {
+          }          
+        }
+      }
+
+    }).start();
   }
 
   @Override
-- 
cgit v1.2.3