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

Timestamp:

03/06/07 14:26:14 (18 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/SimplificationMethod.cpp (modified) (11 diffs)

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

@@ -230 +230 @@
 //      Contract a given pair
 //-------------------------------------------------------------------------
-void SimplificationMethod::do_contract( simplif::Model& m,
-                                                                                                                                                                simplif::pair_info *auxpair)
+void SimplificationMethod::do_contract( simplif::Model                  &m,
+                                                                                                                                                                simplif::pair_info      *auxpair,
+                                                                                                                                                                int                                                                     obligatory)
 {
         simplif::Vertex                 *v0                     = auxpair->v0;
@@ -243 +244 @@
         vertex_map_str                  lb;
         vertex_map_str                  ub;
+
+        //      Stores the simplification step.
+        MeshSimplificationSequence::Step simplifstep;
         
         // V0 must be always the alive vertex
@@ -338 +342 @@
 
         int del_index   =       0;
+
+        //      Initialize deleted triangles.
+        simplifstep.mT0 =       -1;
+        simplifstep.mT1 =       -1;
+
+        //      Sets obligatory flag.
+        simplifstep.obligatory  =       obligatory;
 
         //      Clears faces list.
@@ -519 +530 @@
                                 (vertexMultimap.find(f0) != vertexMultimap.end())
                                 &&
-                                (vertexMultimap.find(f1) != vertexMultimap.end()))
+                                (vertexMultimap.find(f1) != vertexMultimap.end())
+                                &&
+                                ((*pair->v0) != (*pair->v1)))
                 {
                         break;
@@ -551 +564 @@
         candidate       =       pair->candidate;
 
-        //      First contract.
-        simplifstep.obligatory  =       0;
-
         //      Debug.
         cout    <<      "Contracting... "
@@ -559 +569 @@
 
         //      Contract main pair.
-        do_contract(m, pair);
-
-        //      Twin contract and lonely vertex contract.
-        simplifstep.obligatory  =       1;
+        do_contract(m, pair, 0);
 
         //      Attempt to maintain valid vertex information.
@@ -600 +607 @@
         float                                                           x,y,z;
 
+        /*
         if ((*v0) != (*v1))
         {
+        */
                 //      Gets the vertex that is not the candidate.
                 if ((*v1) == candidate)
@@ -621 +630 @@
                         lonely_vert     =       m.vertex((*it).second);
 
+                        //      Debug.
+                        if ((*it).second == 10988)
+                        {
+                                cout    <<      "Lonely: "
+                                                        <<      lonely_vert->vID
+                                                        <<      endl;
+                        }
+                        
                         for (int        i       =       0;      i < lonely_vert->edgeUses().length();   i++)
                         {
@@ -671 +688 @@
 
                                 //      Contract twin pair.
-                                do_contract(m, pair);
+                                do_contract(m, pair, 1);
                                 M0.validVertCount--;
                         }
@@ -686 +703 @@
                                 z       =       (*new_vert)[Z];
 
+                                simplif::Vertex *v;
+
+                                //      Debug.
+                                if (new_vert->vID == 10988)
+                                {
+                                        cout    <<      "["
+                                                                <<      x
+                                                                <<      ","
+                                                                <<      y
+                                                                <<      ","
+                                                                <<      z
+                                                                <<      "]"
+                                                                <<      endl;
+
+                                        
+                                        v       =       m.vertex(10988);
+                                }
+
                                 //      Adds new vertex to multimap.
                                 vertexMultimap.insert(vertex_pair(_float3_(x,y,z),new_vert->vID));
@@ -724 +759 @@
                                 pair->notInHeap();
 
+                                //      Debug.
+                                cout    <<      "new: "
+                                                        <<      new_vert->vID
+                                                        <<      "("
+                                                        <<      (*new_vert)[X]
+                                                        <<      ","
+                                                        <<      (*new_vert)[Y]
+                                                        <<      ","
+                                                        <<      (*new_vert)[Z]
+                                                        <<      ") lonely: "
+                                                        <<      lonely_vert->vID
+                                                        <<      "("
+                                                        <<      (*lonely_vert)[X]
+                                                        <<      ","
+                                                        <<      (*lonely_vert)[Y]
+                                                        <<      ","
+                                                        <<      (*lonely_vert)[Z]
+                                                        <<      ")"
+                                                        <<      endl;
+
                                 //      Contract new pair.
-                                do_contract(m, pair);
+                                do_contract(m, pair, 1);
                                 M0.validVertCount--;
                         }
                 }
-        }
+        /*
+        }
+        */
 }