Changeset 10627 for OpenSceneGraph/trunk/src/osgPlugins/glsl/ReaderWriterGLSL.cpp

Timestamp:

10/10/09 11:41:28 (4 years ago)

Author:

robert

Message:

From Stephane Lamoliatte, "Here is a patch wich improves the support for geometry shaders in OpenSceneGraph.
It adds new PrimitiveSet? constants for the specific geometry shader primitive types :

• LINES_ADJACENCY
  
• LINE_STRIP_ADJACENCY
  
• TRIANGLES_ADJACENCY
  
• TRIANGLE_STRIP_ADJACENCY
  

It also adds some missing features to the glsl reader plug'in.
"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/glsl/ReaderWriterGLSL.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/glsl/ReaderWriterGLSL.cpp

@@ -18 +18 @@
             supportsExtension("frag","OpenGL Shader Language format");
             supportsExtension("vert","OpenGL Shader Language format");
+            supportsExtension("geom","OpenGL Shader Language format");
             supportsExtension("glsl","OpenGL Shader Language format");
         }
@@ -72 +73 @@
                     if (ext == "frag") shader->setType(osg::Shader::FRAGMENT);
                     if (ext == "vert") shader->setType(osg::Shader::VERTEX);
+                    if (ext == "geom") shader->setType(osg::Shader::GEOMETRY);
                 }
             }