From 0a021cf04f134a5cfe87a48319e34d3e5b84867c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 22 Jun 2005 11:26:56 +0000 Subject: [PATCH] From Mike Weiblen, fixes to shaders to correct modification of varying types --- examples/osgparametric/osgparametric.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/osgparametric/osgparametric.cpp b/examples/osgparametric/osgparametric.cpp index 174652922..f56ff88fb 100644 --- a/examples/osgparametric/osgparametric.cpp +++ b/examples/osgparametric/osgparametric.cpp @@ -26,9 +26,10 @@ char vertexShaderSource_simple[] = "{ \n" "\n" " gl_TexCoord[0] = gl_Vertex; \n" - " gl_Vertex.z = gl_Vertex.x*coeff[0] + gl_Vertex.x*gl_Vertex.x* coeff[1] + \n" - " gl_Vertex.y*coeff[2] + gl_Vertex.y*gl_Vertex.y* coeff[3]; \n" - " gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" + " vec4 vert = gl_Vertex; \n" + " vert.z = gl_Vertex.x*coeff[0] + gl_Vertex.x*gl_Vertex.x* coeff[1] + \n" + " gl_Vertex.y*coeff[2] + gl_Vertex.y*gl_Vertex.y* coeff[3]; \n" + " gl_Position = gl_ModelViewProjectionMatrix * vert;\n" "}\n"; @@ -55,8 +56,9 @@ char vertexShaderSource_texture[] = "{ \n" "\n" " gl_TexCoord[0] = gl_Vertex; \n" - " gl_Vertex.z = texture2D( vertexTexture, gl_TexCoord[0].xy).x*0.0001; \n" - " gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n" + " vec4 vert = gl_Vertex; \n" + " vert.z = texture2D( vertexTexture, gl_TexCoord[0].xy).x*0.0001; \n" + " gl_Position = gl_ModelViewProjectionMatrix * vert;\n" "}\n";