Changeset 1600

Timestamp:

10/10/06 16:04:06 (18 years ago)

Author:

gumbau

Message:

Fixed simplification bug when simplifying to extremely a low factor

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry/src

Files:

• GeoLodStripsConstructor.cpp (modified) (2 diffs)
• libs/AdjPrims.h (modified) (1 diff)
• libs/SimplificationMethod.cpp (modified) (1 diff)
• libs/gfx/tools/Heap.h (modified) (1 diff)
• libs/gfx/tools/heap.cxx (modified) (1 diff)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodStripsConstructor.cpp

@@ -1257 +1257 @@
 
         //      Copy new vertices.
+        std::vector<VertexBoneAssignment> newbones;
         for (unsigned   int     i       =       0;      i < mGeoMeshSQ->mNewVertices.size();    i++)
         {
@@ -1273 +1274 @@
                                 vba.vertexIndex = mGeoMeshSQ->mNewVertices[i].id;
                                 vba.weight = it->weight;
-                                mGeoMesh->mBones.push_back(vba);
-                        }
-                }
-        }
+                                newbones.push_back(vba);
+                        }
+                }
+        }
+
+        for (std::vector<VertexBoneAssignment>::iterator it = newbones.begin(); it != newbones.end(); it++)
+                mGeoMesh->mBones.push_back(*it);
+
 
         //      For each submesh.

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/AdjPrims.h

@@ -93 +93 @@
 
                 // SUS
-                int vID; // this can be -1 when the vertex becomes non-valid
+                int vID;
         };
 

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/SimplificationMethod.cpp

@@ -684 +684 @@
                 if (twin_found)
                 {
-                        //      Extract twin edge from heap.
-                        top             =       heap->extract(i);
-                        pair    =       (simplif::pair_info *)top->obj;
+                        heap->kill(i);
 
                         //      Copy candidate.

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/gfx/tools/Heap.h

@@ -67 +67 @@
                 heap_node *extract();
 
-                //      Overhead method.
-                heap_node *extract(int i);
-
                 heap_node *top() { return size<1 ? (heap_node *)NULL : &ref(0); }
                 heap_node *kill(int i);

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/gfx/tools/heap.cxx

@@ -100 +100 @@
 }
 
-//      Overhead method.
-heap_node *Heap::extract(int i)
-{
-        if( size<1 ) return 0;
-
-        swap(i,size-1);
-        size--;
-
-        downheap(i);
-
-        ref(size).obj->notInHeap();
-
-        return &ref(size);
-}
-
 heap_node *Heap::kill(int i)
 {