Changeset 9886 for OpenSceneGraph/trunk/include/osgUtil/Optimizer

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/include/osgUtil/Optimizer (modified) (4 diffs)

OpenSceneGraph/trunk/include/osgUtil/Optimizer

@@ -75 +75 @@
             MERGE_GEOMETRY =            (1 << 5),
             CHECK_GEOMETRY =            (1 << 6),
-            SPATIALIZE_GROUPS =         (1 << 7),
-            COPY_SHARED_NODES =         (1 << 8),
-            TRISTRIP_GEOMETRY =         (1 << 9),
-            TESSELLATE_GEOMETRY =       (1 << 10),
-            OPTIMIZE_TEXTURE_SETTINGS = (1 << 11),
-            MERGE_GEODES =              (1 << 12),
-            FLATTEN_BILLBOARDS =        (1 << 13),
-            TEXTURE_ATLAS_BUILDER =     (1 << 14),
-            STATIC_OBJECT_DETECTION =   (1 << 15),
-            FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS = (1 << 16),
+            MAKE_FAST_GEOMETRY =        (1 << 7),
+            SPATIALIZE_GROUPS =         (1 << 8),
+            COPY_SHARED_NODES =         (1 << 9),
+            TRISTRIP_GEOMETRY =         (1 << 10),
+            TESSELLATE_GEOMETRY =       (1 << 11),
+            OPTIMIZE_TEXTURE_SETTINGS = (1 << 12),
+            MERGE_GEODES =              (1 << 13),
+            FLATTEN_BILLBOARDS =        (1 << 14),
+            TEXTURE_ATLAS_BUILDER =     (1 << 15),
+            STATIC_OBJECT_DETECTION =   (1 << 16),
+            FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS = (1 << 17),
             DEFAULT_OPTIMIZATIONS = FLATTEN_STATIC_TRANSFORMS |
                                 REMOVE_REDUNDANT_NODES |
@@ -91 +92 @@
                                 SHARE_DUPLICATE_STATE |
                                 MERGE_GEOMETRY |
+                                MAKE_FAST_GEOMETRY |
                                 CHECK_GEOMETRY |
                                 OPTIMIZE_TEXTURE_SETTINGS |
@@ -101 +103 @@
                                 MERGE_GEODES |
                                 MERGE_GEOMETRY |
+                                MAKE_FAST_GEOMETRY |
                                 CHECK_GEOMETRY |
                                 SPATIALIZE_GROUPS |
@@ -507 +510 @@
         };
         
+        class OSGUTIL_EXPORT MakeFastGeometryVisitor : public BaseOptimizerVisitor
+        {
+            public:
+
+                /// default to traversing all children.
+                MakeFastGeometryVisitor(Optimizer* optimizer=0):
+                    BaseOptimizerVisitor(optimizer, MAKE_FAST_GEOMETRY) {}
+
+                virtual void apply(osg::Geode& geode) { checkGeode(geode); }
+
+                void checkGeode(osg::Geode& geode);
+                
+        };        
+        
         class OSGUTIL_EXPORT MergeGeometryVisitor : public BaseOptimizerVisitor
         {