Changeset 10627

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.
"

Location:

OpenSceneGraph/trunk

Files:

• include/osg/PrimitiveSet (modified) (1 diff)
• src/osgPlugins/glsl/ReaderWriterGLSL.cpp (modified) (2 diffs)
• src/osgPlugins/osg/Geometry.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osg/PrimitiveSet

@@ -173 +173 @@
             QUADS = GL_QUADS,
             QUAD_STRIP = GL_QUAD_STRIP,
-            POLYGON = GL_POLYGON
+            POLYGON = GL_POLYGON,
+            LINES_ADJACENCY = GL_LINES_ADJACENCY_EXT, 
+            LINE_STRIP_ADJACENCY = GL_LINE_STRIP_ADJACENCY_EXT, 
+            TRIANGLES_ADJACENCY = GL_TRIANGLES_ADJACENCY_EXT, 
+            TRIANGLE_STRIP_ADJECENCY = GL_TRIANGLE_STRIP_ADJACENCY_EXT,
         };
 

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);
                 }
             }

OpenSceneGraph/trunk/src/osgPlugins/osg/Geometry.cpp

@@ -1442 +1442 @@
     else if (strcmp(str,"QUAD_STRIP")==0)       mode = PrimitiveSet::QUAD_STRIP;
     else if (strcmp(str,"POLYGON")==0)          mode = PrimitiveSet::POLYGON;
+    else if (strcmp(str,"LINES_ADJACENCY")==0)          mode = PrimitiveSet::LINES_ADJACENCY;
+    else if (strcmp(str,"LINE_STRIP_ADJACENCY")==0)     mode = PrimitiveSet::LINE_STRIP_ADJACENCY;
+    else if (strcmp(str,"TRIANGLES_ADJACENCY")==0)      mode = PrimitiveSet::TRIANGLES_ADJACENCY;
+    else if (strcmp(str,"TRIANGLE_STRIP_ADJECENCY")==0) mode = PrimitiveSet::TRIANGLE_STRIP_ADJECENCY;
     else return false;
     return true;
@@ -1461 +1465 @@
         case (PrimitiveSet::QUAD_STRIP)        : return "QUAD_STRIP";
         case (PrimitiveSet::POLYGON)           : return "POLYGON";
+        case (PrimitiveSet::LINES_ADJACENCY)            : return "LINES_ADJACENCY";
+        case (PrimitiveSet::LINE_STRIP_ADJACENCY)       : return "LINE_STRIP_ADJACENCY";
+        case (PrimitiveSet::TRIANGLES_ADJACENCY)        : return "TRIANGLES_ADJACENCY";
+        case (PrimitiveSet::TRIANGLE_STRIP_ADJECENCY)   : return "TRIANGLE_STRIP_ADJECENCY";
         default                                : return "UnknownPrimitveType";
     }