Changeset 9886 for OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

Timestamp:

03/10/09 15:15:59 (4 years ago)

Author:

robert

Message:

From Roland Smeenk, "While working on the Collada plugin I noticed that all geometry created by the dae reader result in slow path geometry.
Because there already exists the option to convert slow path geometry to the fast path by computing an internal fast path alternative, I added a new optimizer option that automatically does this. To check the results I also made some changes to the statistics gathering and rendering.

Somewhat unrelated, but also part of the optimizer I disabled removal of CameraView? nodes during RemoveRedundantNodes? optimization.
As discussed on the ML, CameraViews? were removed from the scenegraph. This solves that issue.

Summary:
-Geometry::areFastPathsUsed now also looks at internalOptimizedGeometry
-Added Optimize option to make all slow path geometry compute their internal fast path alternative
-Added fast geometry counter to the statistics
-Disabled removel of CameraViews? in optimizer
"

Files:

• OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

@@ -22 +22 @@
 #include <osg/LOD>
 #include <osg/Billboard>
+#include <osg/CameraView>
 #include <osg/Geometry>
 #include <osg/Notify>
@@ -110 +111 @@
         if(str.find("~CHECK_GEOMETRY")!=std::string::npos) options ^= CHECK_GEOMETRY;
         else if(str.find("CHECK_GEOMETRY")!=std::string::npos) options |= CHECK_GEOMETRY;
+
+        if(str.find("~MAKE_FAST_GEOMETRY")!=std::string::npos) options ^= MAKE_FAST_GEOMETRY;
+        else if(str.find("MAKE_FAST_GEOMETRY")!=std::string::npos) options |= MAKE_FAST_GEOMETRY;
         
         if(str.find("~FLATTEN_BILLBOARDS")!=std::string::npos) options ^= FLATTEN_BILLBOARDS;
@@ -277 +281 @@
 
         CheckGeometryVisitor mgv(this);
+        node->accept(mgv);
+    }
+
+    if (options & MAKE_FAST_GEOMETRY)
+    {
+        osg::notify(osg::INFO)<<"Optimizer::optimize() doing MAKE_FAST_GEOMETRY"<<std::endl;
+
+        MakeFastGeometryVisitor mgv(this);
         node->accept(mgv);
     }
@@ -1309 +1321 @@
         // only remove empty groups, but not empty occluders.
         if (group.getNumChildren()==0 && isOperationPermissibleForObject(&group) && 
-            (typeid(group)==typeid(osg::Group) || dynamic_cast<osg::Transform*>(&group)))
+            (typeid(group)==typeid(osg::Group) || (dynamic_cast<osg::Transform*>(&group) && !dynamic_cast<osg::CameraView*>(&group))))
         {
             _redundantNodeList.insert(&group);
@@ -1781 +1793 @@
             {
                 geom->computeCorrectBindingsAndArraySizes();
+            }
+        }
+    }
+}
+
+void Optimizer::MakeFastGeometryVisitor::checkGeode(osg::Geode& geode)
+{
+    if (isOperationPermissibleForObject(&geode))
+    {
+        for(unsigned int i=0;i<geode.getNumDrawables();++i)
+        {
+            osg::Geometry* geom = geode.getDrawable(i)->asGeometry();
+            if (geom && isOperationPermissibleForObject(geom))
+            {
+                if (!geom->areFastPathsUsed() && !geom->getInternalOptimizedGeometry())
+                {
+                    geom->computeInternalOptimizedGeometry();
+                }
             }
         }