Changeset 10894

Timestamp:

12/15/09 13:37:49 (3 years ago)

Author:

robert

Message:

From Tanguy Fautre and Robert Osfield, updated tristripper code to use the latest tristripper_r94 code.

Location:

OpenSceneGraph/trunk/src/osgUtil

Files:

• CMakeLists.txt (modified) (2 diffs)
• TriStripVisitor.cpp (modified) (9 diffs)
• TriStrip_graph_array.h (deleted)
• TriStrip_heap_array.h (deleted)
• TriStrip_tri_stripper.cpp (deleted)
• TriStrip_tri_stripper.h (deleted)
• tristripper (added)
• tristripper/include (added)
• tristripper/include/detail (added)
• tristripper/include/detail/cache_simulator.h (added)
• tristripper/include/detail/connectivity_graph.h (added)
• tristripper/include/detail/graph_array.h (added)
• tristripper/include/detail/heap_array.h (added)
• tristripper/include/detail/policy.h (added)
• tristripper/include/detail/types.h (added)
• tristripper/include/public_types.h (added)
• tristripper/include/tri_stripper.h (added)
• tristripper/src (added)
• tristripper/src/connectivity_graph.cpp (added)
• tristripper/src/policy.cpp (added)
• tristripper/src/tri_stripper.cpp (added)

OpenSceneGraph/trunk/src/osgUtil/CMakeLists.txt

@@ -88 +88 @@
     TransformAttributeFunctor.cpp
     TransformCallback.cpp
-    TriStrip_graph_array.h
-    TriStrip_heap_array.h
-    TriStrip_tri_stripper.cpp
-    TriStrip_tri_stripper.h
+
+    tristripper/include/detail/graph_array.h
+    tristripper/include/detail/types.h
+    tristripper/include/detail/cache_simulator.h
+    tristripper/include/detail/policy.h
+    tristripper/include/detail/heap_array.h
+    tristripper/include/detail/connectivity_graph.h
+    tristripper/include/tri_stripper.h
+    tristripper/include/public_types.h
+    tristripper/src/tri_stripper.cpp
+    tristripper/src/policy.cpp
+    tristripper/src/connectivity_graph.cpp
+
     TriStripVisitor.cpp
     UpdateVisitor.cpp
@@ -97 +106 @@
     ${OPENSCENEGRAPH_VERSIONINFO_RC}
 )
+
+INCLUDE_DIRECTORIES("tristripper/include")
 
 LINK_INTERNAL(${LIB_NAME}     

OpenSceneGraph/trunk/src/osgUtil/TriStripVisitor.cpp

@@ -23 +23 @@
 #include <iterator>
 
-#include "TriStrip_tri_stripper.h"
+#include "tristripper/include/tri_stripper.h"
 
 using namespace osg;
@@ -183 +183 @@
 
     IndexList                                _remapIndices;
-    triangle_stripper::tri_stripper::indices _in_indices;
+    triangle_stripper::indices _in_indices;
 
     inline void operator()(unsigned int p1, unsigned int p2, unsigned int p3)
@@ -391 +391 @@
 
         unsigned int in_numVertices = 0;
-        for(triangle_stripper::tri_stripper::indices::iterator itr=taf._in_indices.begin();
+        for(triangle_stripper::indices::iterator itr=taf._in_indices.begin();
             itr!=taf._in_indices.end();
             ++itr)
@@ -409 +409 @@
         stripifier.SetMinStripSize(_minStripSize);
 
-        triangle_stripper::tri_stripper::primitives_vector outPrimitives;
-        if (!stripifier.Strip(&outPrimitives)) 
+        triangle_stripper::primitive_vector outPrimitives;
+        stripifier.Strip(&outPrimitives);
+        if (outPrimitives.empty())
         {
             osg::notify(osg::WARN)<<"Error: TriStripVisitor::stripify(Geometry& geom) failed."<<std::endl;
@@ -416 +417 @@
         }
 
-        triangle_stripper::tri_stripper::primitives_vector::iterator pitr;
+        triangle_stripper::primitive_vector::iterator pitr;
         if (_generateFourPointPrimitivesQuads)
         {
             osg::notify(osg::INFO)<<"Collecting all quads"<<std::endl;
 
-            typedef triangle_stripper::tri_stripper::primitives_vector::iterator prim_iterator;
+            typedef triangle_stripper::primitive_vector::iterator prim_iterator;
             typedef std::multimap<unsigned int,prim_iterator> QuadMap;
             QuadMap quadMap;
@@ -430 +431 @@
                 ++pitr)
             {
-                if (pitr->m_Indices.size()==4)
-                {
-                    std::swap(pitr->m_Indices[2],pitr->m_Indices[3]);
-                    unsigned int minValue = *(std::max_element(pitr->m_Indices.begin(),pitr->m_Indices.end()));
+                if (pitr->Indices.size()==4)
+                {
+                    std::swap(pitr->Indices[2],pitr->Indices[3]);
+                    unsigned int minValue = *(std::max_element(pitr->Indices.begin(),pitr->Indices.end()));
                     quadMap.insert(QuadMap::value_type(minValue,pitr));
                 }
@@ -456 +457 @@
                     for(i=1;i<4;++i)
                     {
-                        if (pitr->m_Indices[min_pos]>pitr->m_Indices[i]) 
+                        if (pitr->Indices[min_pos]>pitr->Indices[i])
                             min_pos = i;
                     }
-                    indices.push_back(pitr->m_Indices[min_pos]);
-                    indices.push_back(pitr->m_Indices[(min_pos+1)%4]);
-                    indices.push_back(pitr->m_Indices[(min_pos+2)%4]);
-                    indices.push_back(pitr->m_Indices[(min_pos+3)%4]);
+                    indices.push_back(pitr->Indices[min_pos]);
+                    indices.push_back(pitr->Indices[(min_pos+1)%4]);
+                    indices.push_back(pitr->Indices[(min_pos+2)%4]);
+                    indices.push_back(pitr->Indices[(min_pos+3)%4]);
                 }            
 
@@ -505 +506 @@
             ++pitr)
         {
-            if (!_generateFourPointPrimitivesQuads || pitr->m_Indices.size()!=4)
+            if (!_generateFourPointPrimitivesQuads || pitr->Indices.size()!=4)
             {
                 bool inOrder = true;
-                unsigned int previousValue = pitr->m_Indices.front();
-                for(triangle_stripper::tri_stripper::indices::iterator qi_itr=pitr->m_Indices.begin()+1;
-                    qi_itr!=pitr->m_Indices.end() && inOrder;
+                unsigned int previousValue = pitr->Indices.front();
+                for(triangle_stripper::indices::iterator qi_itr=pitr->Indices.begin()+1;
+                    qi_itr!=pitr->Indices.end() && inOrder;
                     ++qi_itr)
                 {
@@ -519 +520 @@
                 if (inOrder)
                 {
-                    new_primitives.push_back(new osg::DrawArrays(pitr->m_Type,pitr->m_Indices.front(),pitr->m_Indices.size()));
+                    new_primitives.push_back(new osg::DrawArrays(pitr->Type,pitr->Indices.front(),pitr->Indices.size()));
                 }
                 else
                 {
-                    unsigned int maxValue = *(std::max_element(pitr->m_Indices.begin(),pitr->m_Indices.end()));
+                    unsigned int maxValue = *(std::max_element(pitr->Indices.begin(),pitr->Indices.end()));
                     if (maxValue>=65536)
                     {
-                        osg::DrawElementsUInt* elements = new osg::DrawElementsUInt(pitr->m_Type);
-                        elements->reserve(pitr->m_Indices.size());
-                        std::copy(pitr->m_Indices.begin(),pitr->m_Indices.end(),std::back_inserter(*elements));
+                        osg::DrawElementsUInt* elements = new osg::DrawElementsUInt(pitr->Type);
+                        elements->reserve(pitr->Indices.size());
+                        std::copy(pitr->Indices.begin(),pitr->Indices.end(),std::back_inserter(*elements));
                         new_primitives.push_back(elements);
                     }
                     else
                     {
-                        osg::DrawElementsUShort* elements = new osg::DrawElementsUShort(pitr->m_Type);
-                        elements->reserve(pitr->m_Indices.size());
-                        std::copy(pitr->m_Indices.begin(),pitr->m_Indices.end(),std::back_inserter(*elements));
+                        osg::DrawElementsUShort* elements = new osg::DrawElementsUShort(pitr->Type);
+                        elements->reserve(pitr->Indices.size());
+                        std::copy(pitr->Indices.begin(),pitr->Indices.end(),std::back_inserter(*elements));
                         new_primitives.push_back(elements);
                     }