summaryrefslogtreecommitdiffstats
path: root/src/de/gamezock/metacraft/ui/Main.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/gamezock/metacraft/ui/Main.java')
-rw-r--r--src/de/gamezock/metacraft/ui/Main.java42
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