Changeset 9903

Timestamp:

03/11/09 13:42:44 (4 years ago)

Author:

robert

Message:

From Lionel Lagarde, "the attachment contains a correction of the Optimizer::MergeGeometryVisitor?.
When 2 geometries are merged, the primitive sets of the second geometry
are copied to the first geometry.

The primitive sets were copied with a std::insert into the first geometry
primitive set vector. It doesn't work when the geometry is using VBOs (because
the element buffer object of the primitive set is not updated).

The correction replaces

lhs.getPrimitiveSetList().insert( lhs.getPrimitiveSetList().end(),

rhs.getPrimitiveSetList().begin(),
rhs.getPrimitiveSetList().end() );

by

for( primItr=rhs.getPrimitiveSetList().begin();

primItr!=rhs.getPrimitiveSetList().end();
++primItr )

{

lhs.addPrimitiveSet(primItr->get());

}
"

Files:

• OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgUtil/Optimizer.cpp (modified) (2 diffs, 1 prop)

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgUtil/Optimizer.cpp

@@ -2416 +2416 @@
 
     // shift the indices of the incoming primitives to account for the pre existing geometry.
-    for(osg::Geometry::PrimitiveSetList::iterator primItr=rhs.getPrimitiveSetList().begin();
-        primItr!=rhs.getPrimitiveSetList().end();
-        ++primItr)
+    osg::Geometry::PrimitiveSetList::iterator primItr;
+    for(primItr=rhs.getPrimitiveSetList().begin(); primItr!=rhs.getPrimitiveSetList().end(); ++primItr)
     {
         osg::PrimitiveSet* primitive = primItr->get();
+        
         switch(primitive->getType())
         {
@@ -2487 +2487 @@
             break;
         }
-
-        
-    }
-    
-    lhs.getPrimitiveSetList().insert(lhs.getPrimitiveSetList().end(),
-                                     rhs.getPrimitiveSetList().begin(),rhs.getPrimitiveSetList().end());
+    }
+    
+    for(primItr=rhs.getPrimitiveSetList().begin(); primItr!=rhs.getPrimitiveSetList().end(); ++primItr)
+    {
+        lhs.addPrimitiveSet(primItr->get());
+    }
 
     lhs.dirtyBound();