summaryrefslogtreecommitdiffstats
path: root/src/GLSLShaderTest/dimple.vert
diff options
context:
space:
mode:
authorjada <jada@28c7f869-5b4e-e670-f602-82bfaf57f300>2005-10-25 23:17:51 +0000
committerjada <jada@28c7f869-5b4e-e670-f602-82bfaf57f300>2005-10-25 23:17:51 +0000
commit514fe3f6240041c178ff9262d0b91e838fad1d3b (patch)
treeae8d882295043676419b6430f70b4641215a7d4f /src/GLSLShaderTest/dimple.vert
parent4325f75ac43540221ba95d7ac925a1c9dc566152 (diff)
1) GLSLShaderTest :
Added new GLSL shader example program. No exit when exception is encountered. 2) PickTest : Update PickTest.java to use the new pickfast utility.
Diffstat (limited to 'src/GLSLShaderTest/dimple.vert')
-rw-r--r--src/GLSLShaderTest/dimple.vert9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/GLSLShaderTest/dimple.vert b/src/GLSLShaderTest/dimple.vert
index 0707d71..e45796b 100644
--- a/src/GLSLShaderTest/dimple.vert
+++ b/src/GLSLShaderTest/dimple.vert
@@ -11,9 +11,9 @@ varying vec3 LightDir;
varying vec3 EyeDir;
varying vec3 Normal;
-//uniform vec3 LightPosition;
-//uniform float Scale;
-vec3 LightPosition = vec3(0.0, 0.0, 5.0);
+uniform vec3 LightPosition;
+// uniform float Scale;
+// vec3 LightPosition = vec3(0.0, 0.0, 5.0);
float Scale = 1.0;
void main(void)
@@ -23,7 +23,8 @@ void main(void)
vec3 eyeDir = vec3(pos);
// gl_TexCoord[0] = gl_MultiTexCoord0;
gl_TexCoord[0] = gl_Vertex;
-
+ gl_FrontColor = gl_Color;
+
vec3 n = normalize(gl_NormalMatrix * gl_Normal);
vec3 t = normalize(cross(vec3(1.141, 2.78, 3.14), n));
vec3 b = cross(n, t);