Changeset 2103 for GTP/trunk/Lib/Geom/shared/GTGeometry/src

Timestamp:

02/08/07 12:18:57 (17 years ago)

Author:

gumbau

Message:

 

Location:

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

Files:

• GeoMeshSimplifier.cpp (modified) (6 diffs)
• libs/vmi/src/simplify.cpp (modified) (2 diffs)

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

@@ -137 +137 @@
 
 //-------------------------------------------------------------------------
-//      Destroyer.
+//      Destructor.
 //-------------------------------------------------------------------------
 GeometryBasedSimplifier::~GeometryBasedSimplifier()
@@ -247 +247 @@
         VMI::vTexCoords =       vTexCoords;
 
+        
+
         mGeoMesh        =       new Mesh();
 
@@ -288 +290 @@
         // Free memory
         VMI::freeMemory();
+
+        delete  VMI::mSequence;
+        VMI::mSequence  =       NULL;
 }
 
@@ -375 +380 @@
         msimpsequence->mSteps                           =       VMI::mSequence->mSteps;
         msimpsequence->mNewVertices     =       VMI::mSequence->mNewVertices;
+
+        cout    <<      "Steps of simplification: "
+                                <<      msimpsequence->mSteps.size()
+                                <<      " Number of new vertices: "
+                                <<      msimpsequence->mNewVertices.size()
+                                <<      endl;
 }
 
@@ -871 +882 @@
 EdgesMultimap::EdgesMultimap()
 {
+}
+
+//-------------------------------------------------------------------------
+//      Destructor.
+//-------------------------------------------------------------------------
+EdgesMultimap::~EdgesMultimap()
+{
         edges.clear();
 }
@@ -1005 +1023 @@
 {
         delete  mGeoMesh;
+        delete  mEdges;
 }
 

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/simplify.cpp

@@ -764 +764 @@
         mSequence->mSteps.clear();
 
+        //      Debug.
+        cout    <<      "Simplification steps: "
+                                <<      steps.size()
+                                <<      " new vertices: "
+                                <<      mSequence->mNewVertices.size()
+                                <<      endl;
+
         for     (size_t i       =       0;      i < steps.size(); i++)
         {
@@ -843 +850 @@
                                                 <<      endl;
         
-                        // Collapse new edge.
+                        //      Collapse new edge.
                         doChange(mesh, c); // the mesh has been updated.
 
-                        // Write Simplification sequence.
+                        //      Write Simplification sequence.
                         saveSimplificationSequence(c,0);