2 files changed, 55 insertions, 82 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();
 	}
 }
diff --git a/src/de/gamezock/metacraft/ui/Renderer.java b/src/de/gamezock/metacraft/ui/Renderer.java
index cea0480..3213a53 100644
--- a/src/de/gamezock/metacraft/ui/Renderer.java
+++ b/src/de/gamezock/metacraft/ui/Renderer.java
@@ -6,7 +6,7 @@ import javax.vecmath.Point3f;
 import javax.vecmath.Vector3f;
 
 import de.gamezock.metacraft.data.Map;
-import de.gamezock.metacraft.data.Tile;
+import de.gamezock.metacraft.data.Triangle;
 
 public class Renderer {
   private Main main;
@@ -15,52 +15,14 @@ public class Renderer {
     this.main = main;
   }
   
-  private void renderTileQuad(GL2 gl, Tile tile, int x, int y) {
-    float[][] heightmap = tile.getData().getHeightmap();
-    
-    float[] h = new float[4];
-    h[0] = heightmap[x][y];
-    h[1] = heightmap[x+1][y];
-    h[2] = heightmap[x+1][y+1];
-    h[3] = heightmap[x][y+1];
-    
-    float center = (h[0] + h[1] + h[2] + h[3]) / 4;
-    
-    for(int i = 0; i < 4; ++i) {
-      int i_1 = (i+1)%4;
-      int i_2 = (i+2)%4;
-      
-      Point3f v1 = new Point3f(x + i_1/2, y + i/2, h[i]);
-      Point3f v2 = new Point3f(x+0.5f, y+0.5f, center);
-      Point3f v3 = new Point3f(x + i_2/2, y + i_1/2, h[i_1]);
-      
-      Vector3f edge1 = new Vector3f(), edge2 = new Vector3f();
+  private void renderTriangle(GL2 gl, Triangle t) {
+    for(int i = 0; i < 3; ++i) {
+      Point3f v = t.getVertex(i);
+      Vector3f n = t.getNormal(i);
       
-      edge1.sub(v1, v2);
-      edge2.sub(v3, v2);
-      
-      Vector3f normal = new Vector3f();
-      normal.cross(edge1, edge2);
-      normal.normalize();
-      
-      gl.glColor3f(1, 1, 1);
-      gl.glNormal3f(normal.x, normal.y, normal.z);
-      gl.glVertex3f(v1.x, v1.y, v1.z);
-      gl.glVertex3f(v2.x, v2.y, v2.z);
-      gl.glVertex3f(v3.x, v3.y, v3.z);
-    }
-  }
-  
-  private void renderTile(GL2 gl, Tile tile) {
-    gl.glBegin(GL.GL_TRIANGLES);
-    
-    for(int i = 0; i < tile.getData().getSize(); ++i) {
-      for(int j = 0; j < tile.getData().getSize(); ++j) {
-        renderTileQuad(gl, tile, i, j);
-      }
+      gl.glNormal3f(n.x, n.y, n.z);
+      gl.glVertex3f(v.x, v.y, v.z);
     }
-    
-    gl.glEnd();
   }
   
   public void render(GL2 gl) {
@@ -69,20 +31,19 @@ public class Renderer {
     Map currentMap = main.getCurrentMap();
     
     gl.glPushMatrix();
-    gl.glRotatef((System.currentTimeMillis()%3600)/10.0f, 0, 0, 1);
+    gl.glRotatef((System.currentTimeMillis()%9000)/25.0f, 0, 0, 1);
+    gl.glTranslatef(-20, -20, 0);
+    
+    gl.glBegin(GL.GL_TRIANGLES);
+    
+    gl.glColor3f(1, 1, 1);
     
-    for(int i = 0; i < currentMap.getWidth(); ++i) {
-      for(int j = 0; j < currentMap.getHeight(); ++j) {
-        gl.glPushMatrix();
-        gl.glTranslatef(i*currentMap.getTileSize(), j*currentMap.getTileSize(), currentMap.getTileHeight(i, j));
-        
-        renderTile(gl, currentMap.getTile(i, j));
-        
-        gl.glPopMatrix();
-      }
+    for(Triangle t : currentMap.getTriangleData()) {
+      renderTriangle(gl, t);
     }
     
+    gl.glEnd();
+    
     gl.glPopMatrix();
   }
-
 }