Changeset 11204

Timestamp:

03/11/10 19:15:20 (3 years ago)

Author:

robert

Message:

From Time Moore, "This submission implements 3 optimizations for meshes. INDEX_MESH turns DrawArrays? style geometry into DrawElements?, uniquifying the vertices in the process. This is useful for certain loaders, like ac3d, which just spit out DrawArrays?. VERTEX_POSTTRANSFORM and VERTEX_PRETRANSFORM optimize mesh triangle and vertex order for the caches on a modern GPU, using Tom Forsyth's algorithm. I describe this and the big difference it makes (38% improvement on a very large mesh) in my blog,
http://shiny-dynamics.blogspot.com/2010/03/vertex-cache-optimization-for-osg.html."

Location:

OpenSceneGraph/trunk

Files:

• include/osgUtil/MeshOptimizers (added)
• include/osgUtil/Optimizer (modified) (1 diff)
• src/osgUtil/CMakeLists.txt (modified) (2 diffs)
• src/osgUtil/MeshOptimizers.cpp (added)
• src/osgUtil/Optimizer.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/include/osgUtil/Optimizer

@@ -86 +86 @@
             STATIC_OBJECT_DETECTION =   (1 << 16),
             FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS = (1 << 17),
+            INDEX_MESH =                (1 << 18),
+            VERTEX_POSTTRANSFORM =      (1 << 19),
+            VERTEX_PRETRANSFORM =       (1 << 20),
             DEFAULT_OPTIMIZATIONS = FLATTEN_STATIC_TRANSFORMS |
                                 REMOVE_REDUNDANT_NODES |

OpenSceneGraph/trunk/src/osgUtil/CMakeLists.txt

@@ -25 +25 @@
     ${HEADER_PATH}/IncrementalCompileOperation
     ${HEADER_PATH}/LineSegmentIntersector
+    ${HEADER_PATH}/MeshOptimizers
     ${HEADER_PATH}/OperationArrayFunctor
     ${HEADER_PATH}/Optimizer
@@ -68 +69 @@
     IncrementalCompileOperation.cpp
     LineSegmentIntersector.cpp
+    MeshOptimizers.cpp
     Optimizer.cpp
     PlaneIntersector.cpp

OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

@@ -40 +40 @@
 #include <osgUtil/Tessellator>
 #include <osgUtil/Statistics>
+#include <osgUtil/MeshOptimizers>
 
 #include <typeinfo>
@@ -55 +56 @@
 }
 
-static osg::ApplicationUsageProxy Optimizer_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_OPTIMIZER \"<type> [<type>]\"","OFF | DEFAULT | FLATTEN_STATIC_TRANSFORMS | FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS | REMOVE_REDUNDANT_NODES | COMBINE_ADJACENT_LODS | SHARE_DUPLICATE_STATE | MERGE_GEOMETRY | MERGE_GEODES | SPATIALIZE_GROUPS  | COPY_SHARED_NODES  | TRISTRIP_GEOMETRY | OPTIMIZE_TEXTURE_SETTINGS | REMOVE_LOADED_PROXY_NODES | TESSELLATE_GEOMETRY | CHECK_GEOMETRY |  FLATTEN_BILLBOARDS | TEXTURE_ATLAS_BUILDER | STATIC_OBJECT_DETECTION");
+static osg::ApplicationUsageProxy Optimizer_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_OPTIMIZER \"<type> [<type>]\"","OFF | DEFAULT | FLATTEN_STATIC_TRANSFORMS | FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS | REMOVE_REDUNDANT_NODES | COMBINE_ADJACENT_LODS | SHARE_DUPLICATE_STATE | MERGE_GEOMETRY | MERGE_GEODES | SPATIALIZE_GROUPS  | COPY_SHARED_NODES  | TRISTRIP_GEOMETRY | OPTIMIZE_TEXTURE_SETTINGS | REMOVE_LOADED_PROXY_NODES | TESSELLATE_GEOMETRY | CHECK_GEOMETRY |  FLATTEN_BILLBOARDS | TEXTURE_ATLAS_BUILDER | STATIC_OBJECT_DETECTION | INDEX_MESH | VERTEX_POSTTRANSFORM | VERTEX_PRETRANSFORM");
 
 void Optimizer::optimize(osg::Node* node)
@@ -126 +127 @@
         else if(str.find("STATIC_OBJECT_DETECTION")!=std::string::npos) options |= STATIC_OBJECT_DETECTION;
 
+        if(str.find("~INDEX_MESH")!=std::string::npos) options ^= INDEX_MESH;
+        else if(str.find("INDEX_MESH")!=std::string::npos) options |= INDEX_MESH;
+
+        if(str.find("~VERTEX_POSTTRANSFORM")!=std::string::npos) options ^= VERTEX_POSTTRANSFORM;
+        else if(str.find("VERTEX_POSTTRANSFORM")!=std::string::npos) options |= VERTEX_POSTTRANSFORM;
+
+        if(str.find("~VERTEX_PRETRANSFORM")!=std::string::npos) options ^= VERTEX_PRETRANSFORM;
+        else if(str.find("VERTEX_PRETRANSFORM")!=std::string::npos) options |= VERTEX_PRETRANSFORM;
+
     }
     else
@@ -346 +356 @@
         node->accept(sv);
         sv.divide();
+    }
+
+    if (options & INDEX_MESH)
+    {
+        OSG_NOTIFY(osg::INFO)<<"Optimizer::optimize() doing INDEX_MESH"<<std::endl;
+        IndexMeshVisitor imv(this);
+        node->accept(imv);
+        imv.makeMesh();
+    }
+
+    if (options & VERTEX_POSTTRANSFORM)
+    {
+        OSG_NOTIFY(osg::INFO)<<"Optimizer::optimize() doing VERTEX_POSTTRANSFORM"<<std::endl;
+        VertexCacheVisitor vcv;
+        node->accept(vcv);
+        vcv.optimizeVertices();
+    }
+
+    if (options & VERTEX_PRETRANSFORM)
+    {
+        OSG_NOTIFY(osg::INFO)<<"Optimizer::optimize() doing VERTEX_PRETRANSFORM"<<std::endl;
+        VertexAccessOrderVisitor vaov;
+        node->accept(vaov);
+        vaov.optimizeOrder();
     }