Changeset 10621 for OpenSceneGraph/trunk/examples/osgvertexattributes/osgvertexattributes.cpp

Timestamp:

10/09/09 15:39:11 (4 years ago)

Author:

robert

Message:

Introduced new uniforms for tracking the modelview and project matrices in shaders using non built-ins.

Files:

• OpenSceneGraph/trunk/examples/osgvertexattributes/osgvertexattributes.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgvertexattributes/osgvertexattributes.cpp

@@ -52 +52 @@
         }
 
-        void replaceAndBind(osg::Program& program, std::string& source, const std::string& originalStr, const AttributeAlias& alias, const std::string& declarationPrefix)
+        void replaceAndBindAttrib(osg::Program& program, std::string& source, const std::string& originalStr, const AttributeAlias& alias, const std::string& declarationPrefix)
         {
             if (replace(source, originalStr, alias.second))
@@ -61 +61 @@
         }
 
+        void replaceBuiltInUniform(std::string& source, const std::string& originalStr, const std::string& newStr, const std::string& declarationPrefix)
+        {
+            if (replace(source, originalStr, newStr))
+            {
+                source.insert(0, declarationPrefix + newStr + std::string(";\n"));
+            }
+        }
+
         void convertVertexShader(osg::Program& program, osg::Shader& shader)
         {
@@ -68 +76 @@
             replace(source, "ftransform()", "gl_ModelViewProjectionMatrix * gl_Vertex");
 
-            replaceAndBind(program, source, "gl_Normal", _normalAlias, "attribute vec3 ");
-            replaceAndBind(program, source, "gl_Vertex", _vertexAlias, "attribute vec4 ");
-            replaceAndBind(program, source, "gl_Color", _colorAlias, "attribute vec4 ");
-            replaceAndBind(program, source, "gl_SecondaryColor", _secondaryColorAlias, "attribute vec4 ");
-            replaceAndBind(program, source, "gl_FogCoord", _fogCoordAlias, "attribute float ");
-
-            replaceAndBind(program, source, "gl_MultiTexCoord0", _texCoordAlias[0], "attribute vec4 ");
-            replaceAndBind(program, source, "gl_MultiTexCoord1", _texCoordAlias[1], "attribute vec4 ");
-            replaceAndBind(program, source, "gl_MultiTexCoord2", _texCoordAlias[2], "attribute vec4 ");
-            replaceAndBind(program, source, "gl_MultiTexCoord3", _texCoordAlias[3], "attribute vec4 ");
-            replaceAndBind(program, source, "gl_MultiTexCoord4", _texCoordAlias[4], "attribute vec4 ");
-            replaceAndBind(program, source, "gl_MultiTexCoord5", _texCoordAlias[5], "attribute vec4 ");
-            replaceAndBind(program, source, "gl_MultiTexCoord6", _texCoordAlias[6], "attribute vec4 ");
-            replaceAndBind(program, source, "gl_MultiTexCoord7", _texCoordAlias[7], "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_Normal", _normalAlias, "attribute vec3 ");
+            replaceAndBindAttrib(program, source, "gl_Vertex", _vertexAlias, "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_Color", _colorAlias, "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_SecondaryColor", _secondaryColorAlias, "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_FogCoord", _fogCoordAlias, "attribute float ");
+
+            replaceAndBindAttrib(program, source, "gl_MultiTexCoord0", _texCoordAlias[0], "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_MultiTexCoord1", _texCoordAlias[1], "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_MultiTexCoord2", _texCoordAlias[2], "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_MultiTexCoord3", _texCoordAlias[3], "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_MultiTexCoord4", _texCoordAlias[4], "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_MultiTexCoord5", _texCoordAlias[5], "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_MultiTexCoord6", _texCoordAlias[6], "attribute vec4 ");
+            replaceAndBindAttrib(program, source, "gl_MultiTexCoord7", _texCoordAlias[7], "attribute vec4 ");
 
 
@@ -89 +97 @@
             replace(source, "gl_ModelViewProjectionMatrix", "osg_ModelViewProjectionMatrix");
             replace(source, "gl_ProjectionMatrix", "osg_ProjectionMatrix");
+#else
+            // replace built in uniform
+            replaceBuiltInUniform(source, "gl_ModelViewMatrix", "osg_ModeViewMatrix", "uniform mat4 ");
+            replaceBuiltInUniform(source, "gl_ModelViewProjectionMatrix", "osg_ModelViewProjectionMatrix", "uniform mat4 ");
+            replaceBuiltInUniform(source, "gl_ProjectionMatrix", "osg_ProjectionMatrix", "uniform mat4 ");
 #endif
             shader.setShaderSource(source);