diff options
author | Matthias Schiffer <matthias@gamezock.de> | 2010-01-18 21:18:07 +0100 |
---|---|---|
committer | Matthias Schiffer <matthias@gamezock.de> | 2010-01-18 21:18:07 +0100 |
commit | 9cb41d127063297432f768f7cb0f466b76921103 (patch) | |
tree | 02864d0ba3d970c040f95384ac0170d7ecbe4635 /src/de/gamezock/metacraft/ui/Main.java | |
parent | 32117d0bf27e0a72165707fe4e56d231136e734b (diff) | |
download | metacraft-9cb41d127063297432f768f7cb0f466b76921103.tar metacraft-9cb41d127063297432f768f7cb0f466b76921103.zip |
Give up tile based maps; maps look much better now
Diffstat (limited to 'src/de/gamezock/metacraft/ui/Main.java')
-rw-r--r-- | src/de/gamezock/metacraft/ui/Main.java | 42 |
1 files changed, 19 insertions, 23 deletions
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 |