Ok since I didn't hear anything I committed the indexing changes I made
authorKent Mein <mein@cs.umn.edu>
Fri, 1 Nov 2002 13:54:50 +0000 (13:54 +0000)
committerKent Mein <mein@cs.umn.edu>
Fri, 1 Nov 2002 13:54:50 +0000 (13:54 +0000)
to these two files.
Basically change edge_set.begin() to &edge_set[0] etc...

mein@cs.umn.edu

intern/bsp/intern/BSP_CSGHelper.cpp
intern/decimation/intern/LOD_QSDecimator.cpp

index 72ad30b6f0f2ae249f39ef4f1974737ee5b614d8..b47cdfa76e8688e539fe9b8dbbdf24585c67c150 100644 (file)
@@ -408,7 +408,7 @@ DuplicateMesh(
                        // duplicate the face data for this face.
                        o_f_data.Duplicate(i_f_data[*f_faces_it]);
 
-                       output.AddSubTriangle(dup_face,triangle_indices.begin() + i); 
+                       output.AddSubTriangle(dup_face,&triangle_indices[i]); 
                }
        }
 
index 6620fa15ad31df272304feafcccc8d32612e071c..bf08de8e9de42cf814d1f00d875962b7a2cacba6 100644 (file)
@@ -183,9 +183,9 @@ CollapseEdge(
        } else {
                // the edge could not be collapsed at the moment - so
                // we adjust it's priority and add it back to the heap.
-               m_heap->Remove(edges.begin(),0);
+               m_heap->Remove(&edges[0],0);
                edges[heap_top].HeapKey() = - MT_INFINITY;
-               m_heap->Insert(edges.begin(),heap_top);
+               m_heap->Insert(&edges[0],heap_top);
        }
 
        //clear all the temporary buffers
@@ -274,7 +274,7 @@ BuildHeap(
                heap_vector.push_back(i);
        }
        
-       m_heap->MakeHeap(edge_set.begin());
+       m_heap->MakeHeap(&edge_set[0]);
 
        return true;
 }
@@ -304,7 +304,7 @@ UpdateHeap(
        // inser the new elements into the heap
 
        for (; edge_it != end_it; ++edge_it) {          
-               m_heap->Insert(edge_set.begin(),*edge_it);
+               m_heap->Insert(&edge_set[0],*edge_it);
        }
 
 
@@ -315,7 +315,7 @@ UpdateHeap(
 
        for (; edge_it != end_it; ++edge_it) {
                LOD_Edge &e = edge_set[*edge_it];
-               m_heap->Remove(edge_set.begin(),e.HeapPos());
+               m_heap->Remove(&edge_set[0],e.HeapPos());
 
                e.HeapPos() = 0xffffffff;