Changeset 10777 for OpenSceneGraph/trunk/src/osgUtil/DelaunayTriangulator.cpp

Timestamp:

11/19/09 12:16:58 (4 years ago)

Author:

robert

Message:

From Fabien Lavignotte, "I have used the osgUtil::DelaunayTriangulator? to insert roads into a
terrain. The triangulator is quite tricky to use properly but works
quite well, constraint triangulation is not an easy task... I have
encounter some crash during the development that the following patch
fix.
The two fixes are :

• Fix in removeVerticesInside() : needs to take into account UByte and
  

UShort version of DrawElements? to avoid a crash later

• Fix a crash in triangulate() : detect degenerate adjacency case to
  

exit early form the adjacent triangle traversal loop to avoid a crash
later"

Files:

• OpenSceneGraph/trunk/src/osgUtil/DelaunayTriangulator.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgUtil/DelaunayTriangulator.cpp

@@ -614 +614 @@
 }
 
+template <typename TVector>
+void removeIndices( TVector& elements, unsigned int index )
+{
+    typename TVector::iterator itr = elements.begin();
+    while ( itr != elements.end() )
+    {
+        if ( (*itr)==index )
+        { // remove entirely
+            itr = elements.erase(itr);
+        }
+        else
+        {
+            if ((*itr)>index) --(*itr); // move indices down 1
+            ++itr; // next index
+        }
+    }
+ }
+
 void DelaunayConstraint::removeVerticesInside(const DelaunayConstraint *dco)
 {    /** remove vertices from this which are internal to dco.
@@ -632 +650 @@
                 {
                     osg::PrimitiveSet* prset=getPrimitiveSet(ipr);
-                    osg::DrawElementsUShort *dsup=dynamic_cast<osg::DrawElementsUShort *>(prset);
-                    if (dsup) {
-                        for (osg::DrawElementsUShort::iterator usitr=dsup->begin(); usitr!=dsup->end(); )
-                        {
-                            if ((*usitr)==idx)
-                            { // remove entirely
-                                usitr=dsup->erase(usitr);
-                            }
-                            else
-                            {
-                                if ((*usitr)>idx) (*usitr)--; // move indices down 1
-                                usitr++; // next index
-                            }
-                        }
-                    }
-                    else
+                    switch (prset->getType())
                     {
+                    case osg::PrimitiveSet::DrawElementsUBytePrimitiveType:
+                        removeIndices( *static_cast<osg::DrawElementsUByte *>(prset), idx );
+                        break;
+                    case osg::PrimitiveSet::DrawElementsUShortPrimitiveType:
+                        removeIndices( *static_cast<osg::DrawElementsUShort *>(prset), idx );
+                        break;
+                    case osg::PrimitiveSet::DrawElementsUIntPrimitiveType:
+                        removeIndices( *static_cast<osg::DrawElementsUInt *>(prset), idx );
+                        break;
+                    default:
                         osg::notify(osg::WARN) << "Invalid prset " <<ipr<< " tp " << prset->getType() << " types PrimitiveType,DrawArraysPrimitiveType=1 etc" << std::endl;
+                        break;
                     }
                 }
@@ -1038 +1052 @@
                                                     if (!tradj->usesVertex(ip2)) osg::notify(osg::WARN) << "tradj error " << tradj->a()<<  " , " << tradj->b()<<  " , " << tradj->c()<< std::endl;
                                                 }
+                                                const Triangle *previousTradj = tradj;
                                                 tradj=getTriangleWithEdge(e2,e1, &triangles);
+                                                if (tradj == previousTradj) {
+                                                    tradj = 0;
+                                                }
                                             }
                                             if (trisToDelete.size()>=900) {