Fixes to the Optimizer's handling of merging of osg::Geometry

2003-05-22 15:29:20 +00:00
parent 23569ac5db
commit efa16a34c5
3 changed files with 42 additions and 12 deletions
--- a/include/osgUtil/Optimizer
+++ b/include/osgUtil/Optimizer
@@ -42,10 +42,12 @@ class OSGUTIL_EXPORT Optimizer
            REMOVE_REDUNDANT_NODES = 0x2,
            COMBINE_ADJACENT_LODS = 0x4,
            SHARE_DUPLICATE_STATE = 0x8,
+            MERGE_GEOMETRY = 0x10,
            ALL_OPTIMIZATIONS = FLATTEN_STATIC_TRANSFORMS |
                                REMOVE_REDUNDANT_NODES |
                                COMBINE_ADJACENT_LODS |
-                                SHARE_DUPLICATE_STATE
+                                SHARE_DUPLICATE_STATE |
+                                MERGE_GEOMETRY
        };

        /** traverse the node and its subgraph with a series of optimization