Changeset 10730

Timestamp:

11/10/09 12:36:07 (4 years ago)

Author:

robert

Message:

Added support for mapping GL_QUADS, GL_QUAD_STRIP and GL_POLYGONS to GL_TRIANGLE equivalents.

Location:

OpenSceneGraph/trunk

Files:

• include/osg/GLBeginEndAdapter (modified) (1 diff)
• src/osg/GLBeginEndAdapter.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/GLBeginEndAdapter

@@ -158 +158 @@
         VertexArrayList                     _texCoordsList;
         VertexArrayList                     _vertexAttribsList;
+
+        typedef std::vector<unsigned short> UShortArray;
+        UShortArray                         _indexArray;
 };
 

OpenSceneGraph/trunk/src/osg/GLBeginEndAdapter.cpp

@@ -281 +281 @@
     _state->applyDisablingOfVertexAttributes();
 
-    glDrawArrays(_primitiveMode, 0, _vertices->size());
-}
+    if (_primitiveMode==GL_QUADS) 
+    {
+        unsigned int numQuads = _vertices->size()/4;
+        unsigned int numIndices = numQuads * 6;
+        if (numIndices > _indexArray.size())
+        {
+            // we need to expand the _indexArray to be big enough to cope with all the quads required.
+            unsigned int numExistingQuads = _indexArray.size()/6;
+            _indexArray.reserve(numIndices);
+            for(unsigned int i=numExistingQuads; i<numQuads; ++i)
+            {
+                unsigned int base = i*4;
+                _indexArray.push_back(base);
+                _indexArray.push_back(base+2);
+                _indexArray.push_back(base+1);
+                
+                _indexArray.push_back(base);
+                _indexArray.push_back(base+3);
+                _indexArray.push_back(base+2);
+            }
+        }
+
+        glDrawElements(GL_TRIANGLES, numQuads*6, GL_UNSIGNED_SHORT, &(_indexArray.front()));
+    }
+    else if (_primitiveMode==GL_QUAD_STRIP)
+    {
+        // will the winding be wrong? Do we need to swap it?
+        glDrawArrays(GL_TRIANGLE_STRIP, 0, _vertices->size());
+    }
+    else if (_primitiveMode==GL_POLYGON) glDrawArrays(GL_TRIANGLE_FAN, 0, _vertices->size());
+    else glDrawArrays(_primitiveMode, 0, _vertices->size());
+}