1 files changed, 38 insertions, 26 deletions

diff --git a/src/de/gamezock/metacraft/ui/Main.java b/src/de/gamezock/metacraft/ui/Main.java
index a721feb..c26e510 100644
--- a/src/de/gamezock/metacraft/ui/Main.java
+++ b/src/de/gamezock/metacraft/ui/Main.java
@@ -1,6 +1,8 @@
 package de.gamezock.metacraft.ui;
 
 import java.awt.Frame;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
@@ -19,7 +21,7 @@ public class Main implements GLEventListener {
   private Renderer renderer = new Renderer(this);
   
 	private Frame frame = new Frame("metacraft");
-	/*private*/ GLCanvas canvas;
+	private GLCanvas canvas;
 	
 	private GLU glu = new GLU();
 	
@@ -33,17 +35,48 @@ public class Main implements GLEventListener {
 	  canvas = new GLCanvas(caps);
 	  canvas.addGLEventListener(this);
 	  
+	  canvas.addKeyListener(new KeyAdapter() {
+	    
+	    public void keyPressed(KeyEvent e) {
+	      if(e.getKeyCode() == KeyEvent.VK_ESCAPE) {
+	        quit();
+	      }
+	    }
+    });
+	  
 	  frame.add(canvas);
 		frame.setSize(800, 600);
 		frame.setResizable(false);
 		frame.addWindowListener(new WindowAdapter() {
+		  
 			public void windowClosing(WindowEvent e) {
 				quit();
 			}
 		});
-		
+
 		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() {
@@ -75,7 +108,7 @@ public class Main implements GLEventListener {
     gl.glColorMaterial(GL.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE);
     
     gl.glMatrixMode(GL2.GL_MODELVIEW);
-    glu.gluLookAt(0, -10, -25, 0, 0, 0, 0, 1, 0);
+    glu.gluLookAt(0, -25, -10, 0, 0, 0, 0, 1, 0);
     
     gl.glEnable(GL2.GL_LIGHT0);
     gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_AMBIENT, new float[] {0, 0, 0, 1}, 0);
@@ -111,27 +144,6 @@ public class Main implements GLEventListener {
 	 * @param args
 	 */
 	public static void main(String[] args) {
-		final Main main = new Main();
-		
-		try {
-      Thread.sleep(500);
-    } catch (InterruptedException e) {
-    }
-		
-    new Thread(new Runnable() {
-
-      @Override
-      public void run() {
-        while(true) {
-          try {
-            Thread.sleep(10);
-          } catch (InterruptedException e) {
-          }
-          
-          main.canvas.display();
-        }
-      }
-      
-    }).start();
+		new Main();
 	}
 }