summaryrefslogtreecommitdiff
path: root/progs/glsl/CH11-toyball.vert.txt
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-12-04 18:44:40 -0700
committerBrian <brian.paul@tungstengraphics.com>2007-12-04 18:44:40 -0700
commit5b91ee27c0f6e6379a9dc0bb41f4aef2f66b6346 (patch)
tree12999af841b26778b6dae8c97d8550a2470e190e /progs/glsl/CH11-toyball.vert.txt
parent02afd45d3b2eccff5d566cdeb32b3211803bd500 (diff)
Undo changes made to the toyball shaders in commit d19d0596daf004b56d80f78fa1a329b43c2ebf94
This demo produces the expected results again.
Diffstat (limited to 'progs/glsl/CH11-toyball.vert.txt')
-rw-r--r--progs/glsl/CH11-toyball.vert.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/progs/glsl/CH11-toyball.vert.txt b/progs/glsl/CH11-toyball.vert.txt
index a3ee1b0377..b7da3ac839 100644
--- a/progs/glsl/CH11-toyball.vert.txt
+++ b/progs/glsl/CH11-toyball.vert.txt
@@ -14,11 +14,10 @@ uniform vec4 BallCenter; // ball center in modelling coordinates
void main()
{
- ECposition = gl_ModelViewMatrix * gl_Vertex;
+//orig: ECposition = gl_ModelViewMatrix * gl_Vertex;
-// ECposition = gl_TextureMatrix[0] * gl_Vertex;
-// ECposition = gl_MultiTexCoord0 * gl_Vertex;
-// ECposition = gl_ModelViewMatrix * ECposition;
+ ECposition = gl_TextureMatrix[0] * gl_Vertex;
+ ECposition = gl_ModelViewMatrix * ECposition;
ECballCenter = gl_ModelViewMatrix * BallCenter;
gl_Position = ftransform();