diff options
author | Matthias Schiffer <matthias@gamezock.de> | 2010-01-19 01:09:01 +0100 |
---|---|---|
committer | Matthias Schiffer <matthias@gamezock.de> | 2010-01-19 01:09:01 +0100 |
commit | c7030ae2b41fc2e559304737a54d6f927cf3d740 (patch) | |
tree | a301bfc4e19a5198bafafdb6083ec9667c95abfb /src/de/gamezock/metacraft/ui/Main.java | |
parent | 9cb41d127063297432f768f7cb0f466b76921103 (diff) | |
download | metacraft-c7030ae2b41fc2e559304737a54d6f927cf3d740.tar metacraft-c7030ae2b41fc2e559304737a54d6f927cf3d740.zip |
Added shader loader (and default shaders)
Diffstat (limited to 'src/de/gamezock/metacraft/ui/Main.java')
-rw-r--r-- | src/de/gamezock/metacraft/ui/Main.java | 17 |
1 files changed, 15 insertions, 2 deletions
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) { - } + } } } |