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

Timestamp:

10/16/09 18:26:27 (4 years ago)

Author:

robert

Message:

Ported osg::Geometry across to supporting the aliasing of vertex, color and normal etc. calls to Vertex Attributes.

Added support for automatic aliasing of vertex, normal, color etc. arrays to Vertex Attribute equivelants.

Added new osg::GLBeginEndAdapter class for runtime conversion from glBegin/glEnd codes to vertex arrray equivelants.

Added automatic shader source conversion from gl_ to osg_ builtins.

Files:

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

OpenSceneGraph/trunk/examples/osgvertexattributes/osgvertexattributes.cpp

@@ -32 +32 @@
             osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
         {
+            _manualVertexAliasing = false;
+
             // mappings taken from http://www.opengl.org/registry/specs/NV/vertex_program.txt
             _vertexAlias = AttributeAlias(0, "osg_Vertex");
@@ -58 +60 @@
             {
                 source.insert(0, declarationPrefix + alias.second + std::string(";\n"));
-                bindAttribute(program, alias);
+                if (_manualVertexAliasing) bindAttribute(program, alias);
             }
         }
@@ -77 +79 @@
             replace(source, "ftransform()", "gl_ModelViewProjectionMatrix * gl_Vertex");
 
+#if 1
             replaceAndBindAttrib(program, source, "gl_Normal", _normalAlias, "attribute vec3 ");
             replaceAndBindAttrib(program, source, "gl_Vertex", _vertexAlias, "attribute vec4 ");
@@ -91 +94 @@
             replaceAndBindAttrib(program, source, "gl_MultiTexCoord6", _texCoordAlias[6], "attribute vec4 ");
             replaceAndBindAttrib(program, source, "gl_MultiTexCoord7", _texCoordAlias[7], "attribute vec4 ");
-
-
-#if 0
-            // replace the modelview and project matrices
-            replace(source, "gl_ModelViewMatrix", "osg_ModeViewMatrix");
-            replace(source, "gl_ModelViewProjectionMatrix", "osg_ModelViewProjectionMatrix");
-            replace(source, "gl_ProjectionMatrix", "osg_ProjectionMatrix");
-#else
+#endif
+
+#if 1
             // replace built in uniform
             replaceBuiltInUniform(source, "gl_ModelViewMatrix", "osg_ModeViewMatrix", "uniform mat4 ");
@@ -187 +185 @@
             _visited.insert(&stateset);
 
+            return;
+
             osg::notify(osg::NOTICE)<<"Found stateset "<<&stateset<<std::endl;
             osg::Program* program = dynamic_cast<osg::Program*>(stateset.getAttribute(osg::StateAttribute::PROGRAM));
@@ -204 +204 @@
             geom.setUseDisplayList(false);
 
+            if (!_manualVertexAliasing) return;
+
             osg::notify(osg::NOTICE)<<"Found geometry "<<&geom<<std::endl;
             if (geom.getVertexArray())
@@ -213 +215 @@
             if (geom.getNormalArray())
             {
-                setVertexAttrib(geom, _normalAlias, geom.getNormalArray(), false, geom.getNormalBinding());
+                setVertexAttrib(geom, _normalAlias, geom.getNormalArray(), true, geom.getNormalBinding());
                 geom.setNormalArray(0);
             }
@@ -232 +234 @@
             {
                 // should we normalize the FogCoord array? Don't think so...
-                setVertexAttrib(geom, _fogCoordAlias, geom.getFogCoordArray(), false, geom.getSecondaryColorBinding());
+                setVertexAttrib(geom, _fogCoordAlias, geom.getFogCoordArray(), false, geom.getFogCoordBinding());
                 geom.setFogCoordArray(0);
             }
@@ -272 +274 @@
         Visited         _visited;
 
+        bool           _manualVertexAliasing;
         AttributeAlias _vertexAlias;
         AttributeAlias _normalAlias;
@@ -335 +338 @@
     viewer.realize();
 
-    // switch on the uniforms that track the modelview and projection matrices
-    osgViewer::Viewer::Windows windows;
-    viewer.getWindows(windows);
-    for(osgViewer::Viewer::Windows::iterator itr = windows.begin();
-        itr != windows.end();
-        ++itr)
-    {
-        (*itr)->getState()->setUseModelViewAndProjectionUniforms(true);
+
+    if (runConvertToVertexAttributes)
+    {
+        // switch on the uniforms that track the modelview and projection matrices
+        osgViewer::Viewer::Windows windows;
+        viewer.getWindows(windows);
+        for(osgViewer::Viewer::Windows::iterator itr = windows.begin();
+            itr != windows.end();
+            ++itr)
+        {
+            (*itr)->getState()->setUseModelViewAndProjectionUniforms(true);
+            (*itr)->getState()->setUseVertexAttributeAliasing(true);
+        }
     }