summaryrefslogtreecommitdiff
path: root/progs/glsl/CH11-toyball.frag.txt
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-10-29 13:24:27 -0700
committerEric Anholt <eric@anholt.net>2007-10-29 13:24:27 -0700
commitb0edb9c38a6c63175e4fafdbb54102c4f4a94e2c (patch)
tree7dfa294a9c9f40f5f2e81a95dfd0d59cd4d6fbea /progs/glsl/CH11-toyball.frag.txt
parent919f617d08a34d01dd916b08ca4f315bae84f21c (diff)
parentad8ee7db3b406b23136873fc8c87a22e4d8b94de (diff)
Merge branch 'origin'
Diffstat (limited to 'progs/glsl/CH11-toyball.frag.txt')
-rw-r--r--progs/glsl/CH11-toyball.frag.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/progs/glsl/CH11-toyball.frag.txt b/progs/glsl/CH11-toyball.frag.txt
index 90ec1c27fc..f3cac62fb3 100644
--- a/progs/glsl/CH11-toyball.frag.txt
+++ b/progs/glsl/CH11-toyball.frag.txt
@@ -49,14 +49,15 @@ void main()
inorout += dot(distance, vec4(1.0));
distance.x = dot(p, HalfSpace4);
- distance.y = StripeWidth - abs(p.z);
+// distance.y = StripeWidth - abs(p.z);
+ distance.y = StripeWidth - abs(p.y);
distance = smoothstep(-FWidth, FWidth, distance);
inorout += distance.x;
inorout = clamp(inorout, 0.0, 1.0);
- surfColor = mix(Yellow, Red, inorout);
- surfColor = mix(surfColor, Blue, distance.y);
+ surfColor = mix(Yellow, Blue, distance.y);
+ surfColor = mix(surfColor, Red, inorout);
// normal = point on surface for sphere at (0,0,0)
normal = p;