Changeset 3327

Timestamp:

08/27/04 10:03:26 (9 years ago)

Author:

robert

Message:

Added handling of short (<=4 points) polygons as tri fans and the rest
as polygons which are tesselated, to improve load and build time, yet
still resselating the large polygons that need it.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/obj/ReaderWriterOBJ.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgPlugins/obj/ReaderWriterOBJ.cpp

@@ -269 +269 @@
     }
 
+    // #define USE_DRAWARRAYLENGTHS
+
     if (numPolygonElements>0)
     {
         unsigned int startPos = vertices->size();
-        osg::DrawArrayLengths* drawArrayLengths = new osg::DrawArrayLengths(GL_POLYGON,startPos);
+        
+        #ifdef USE_DRAWARRAYLENGTHS
+            osg::DrawArrayLengths* drawArrayLengths = new osg::DrawArrayLengths(GL_POLYGON,startPos);
+            geometry->addPrimitiveSet(drawArrayLengths);
+        #endif
 
         for(itr=elementList.begin();
@@ -281 +287 @@
             if (element.dataType==obj::Element::POLYGON)
             {
-                drawArrayLengths->push_back(element.vertexIndices.size());
+
+                #ifdef USE_DRAWARRAYLENGTHS
+                    drawArrayLengths->push_back(element.vertexIndices.size());
+                #else
+                    if (element.vertexIndices.size()>4)
+                    {
+                        osg::DrawArrays* drawArrays = new osg::DrawArrays(GL_POLYGON,startPos,element.vertexIndices.size());
+                        startPos += element.vertexIndices.size();
+                        geometry->addPrimitiveSet(drawArrays);
+                    }
+                    else
+                    {
+                        osg::DrawArrays* drawArrays = new osg::DrawArrays(GL_TRIANGLE_FAN,startPos,element.vertexIndices.size());
+                        startPos += element.vertexIndices.size();
+                        geometry->addPrimitiveSet(drawArrays);
+                    }
+                #endif
+
             
                 if (model.needReverse(element))
@@ -342 +365 @@
         }
 
-        geometry->addPrimitiveSet(drawArrayLengths);
 
     }
@@ -376 +398 @@
             osg::StateSet* stateset = materialToSetSetMap[es.materialName].get();
             geometry->setStateSet(stateset);
-
-//            osgUtil::Tesselator tesselator;
-//            tesselator.retesselatePolygons(*geometry);
-
+        
+            // tesseleate any large polygons
+            osgUtil::Tesselator tesselator;
+            tesselator.retesselatePolygons(*geometry);
+
+            // tri strip polygons to improve graphics peformance
             osgUtil::TriStripVisitor tsv;
             tsv.stripify(*geometry);
 
+            // if no normals present add them.
             if (!geometry->getNormalArray() || geometry->getNormalArray()->getNumElements()==0)
             {