summaryrefslogtreecommitdiffstats
path: root/shader
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-12-15 22:42:49 +0100
committerMatthias Schiffer <matthias@gamezock.de>2009-12-15 22:42:49 +0100
commita407f8b9edbc7a6e865b2daf65b2a6cd10edd2d7 (patch)
treec8b206f234b6a8f9070fc9b2a149aa5b9745883c /shader
parentd9f44af7aee41a111a3d7427d8735bc821f1824f (diff)
downloadzoom++-a407f8b9edbc7a6e865b2daf65b2a6cd10edd2d7.tar
zoom++-a407f8b9edbc7a6e865b2daf65b2a6cd10edd2d7.zip
Added movement controls
Diffstat (limited to 'shader')
-rw-r--r--shader/default.frag1
-rw-r--r--shader/default.vert8
2 files changed, 0 insertions, 9 deletions
diff --git a/shader/default.frag b/shader/default.frag
index b39b46d..e2acad0 100644
--- a/shader/default.frag
+++ b/shader/default.frag
@@ -2,7 +2,6 @@ uniform sampler2D tex;
varying vec4 diffuse, ambientGlobal, ambient;
varying vec3 normal, pos;
-/*varying vec3 normal, lightVector, reflectVector, eyeVector;*/
void main() {
diff --git a/shader/default.vert b/shader/default.vert
index 133c871..00b8118 100644
--- a/shader/default.vert
+++ b/shader/default.vert
@@ -1,22 +1,14 @@
varying vec4 diffuse, ambientGlobal, ambient;
varying vec3 normal, pos;
-/*varying vec3 normal, lightVector, reflectVector, eyeVector;*/
void main() {
normal = normalize(gl_NormalMatrix * gl_Normal);
pos = vec3(gl_ModelViewMatrix * gl_Vertex);
- /*lightVector = vec3(gl_LightSource[0].position - ecPos);
- reflectVector = normalize(reflect(-lightVector, normal));
- eyeVector = vec3(-ecPos);*/
-
- /* Compute the diffuse, ambient and globalAmbient terms */
diffuse = gl_FrontMaterial.diffuse * gl_LightSource[0].diffuse;
- /* The ambient terms have been separated since one of them */
- /* suffers attenuation */
ambient = gl_FrontMaterial.ambient * gl_LightSource[0].ambient;
ambientGlobal = gl_LightModel.ambient * gl_FrontMaterial.ambient;