summaryrefslogtreecommitdiff
path: root/progs/glsl
diff options
context:
space:
mode:
authorZou Nan hai <nanhai.zou@intel.com>2007-07-17 11:25:37 +0800
committerZou Nan hai <nanhai.zou@intel.com>2007-07-17 11:25:37 +0800
commit24e7acd5e4f1e7e71909f94fd1f075abd268d086 (patch)
treea25e8816afebf46757bad80923aab6e56d6ed4e0 /progs/glsl
parent719cf0b7958d0dedf8727c97eaddb6a1f31977e1 (diff)
bumpmap sample is correct now
Diffstat (limited to 'progs/glsl')
-rw-r--r--progs/glsl/CH11-bumpmap.frag.txt2
-rw-r--r--progs/glsl/CH11-bumpmap.vert.txt9
2 files changed, 5 insertions, 6 deletions
diff --git a/progs/glsl/CH11-bumpmap.frag.txt b/progs/glsl/CH11-bumpmap.frag.txt
index 1467f767ec..063576f5a3 100644
--- a/progs/glsl/CH11-bumpmap.frag.txt
+++ b/progs/glsl/CH11-bumpmap.frag.txt
@@ -33,7 +33,7 @@ void main()
litColor = SurfaceColor * max(dot(normDelta, LightDir), 0.0);
vec3 reflectDir = reflect(LightDir, normDelta);
- float spec = max(dot(normalize(EyeDir), reflectDir), 0.0);
+ float spec = max(dot(EyeDir, reflectDir), 0.0);
spec *= SpecularFactor;
litColor = min(litColor + spec, vec3(1.0));
diff --git a/progs/glsl/CH11-bumpmap.vert.txt b/progs/glsl/CH11-bumpmap.vert.txt
index 55cf43ba7d..d3d19f62ac 100644
--- a/progs/glsl/CH11-bumpmap.vert.txt
+++ b/progs/glsl/CH11-bumpmap.vert.txt
@@ -31,9 +31,8 @@ void main()
v.z = dot(LightPosition, n);
LightDir = normalize(v);
-/* v.x = dot(EyeDir, t);
- v.y = dot(EyeDir, b);
- v.z = dot(EyeDir, n);
- EyeDir = normalize(EyeDir);
-*/
+ v.x = dot(EyeDir, t);
+ v.y = dot(EyeDir, b);
+ v.z = dot(EyeDir, n);
+ EyeDir = normalize(v);
}