From c7030ae2b41fc2e559304737a54d6f927cf3d740 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Tue, 19 Jan 2010 01:09:01 +0100
Subject: Added shader loader (and default shaders)

---
 src/de/gamezock/metacraft/ui/Main.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 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 287af22..bfdde1c 100644
--- a/src/de/gamezock/metacraft/ui/Main.java
+++ b/src/de/gamezock/metacraft/ui/Main.java
@@ -95,20 +95,33 @@ public class Main implements GLEventListener {
     gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_DIFFUSE, new float[] {0.5f, 0.5f, 0.5f, 1}, 0);
     gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_SPECULAR, new float[] {0, 0, 0, 0}, 0);
     gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_POSITION, new float[] {10, 10, 10, 1}, 0);
+    gl.glLightf(GL2.GL_LIGHT0, GL2.GL_QUADRATIC_ATTENUATION, 0.01f);
     
     gl.glMaterialfv(GL.GL_FRONT, GL2.GL_SPECULAR, new float[] {0, 0, 0, 0}, 0);
     
+    ShaderLoader.load(gl, "default.vert", "default.frag");
+    
     new Thread(new Runnable() {
 
       @Override
       public void run() {
+        long time = System.currentTimeMillis();
+        int frames = 0;
+        
         while(true) {
           canvas.display();
+          ++frames;
+          
+          if(System.currentTimeMillis() - time >= 1000) {
+            System.err.println(frames + " fps");
+            frames = 0;
+            time += 1000;
+          }
           
           try {
-            Thread.sleep(10);
+            Thread.sleep(5);
           } catch (InterruptedException e) {
-          }          
+          }         
         }
       }
 
-- 
cgit v1.2.3