Changeset 2089

Timestamp:

02/05/07 13:29:28 (17 years ago)

Author:

gumbau

Message:

 

File:

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

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

@@ -537 +537 @@
 
         //      Copy pair.
-<<<<<<< .mine
         v0      =       new Vertex(     (*pair->v0)[X],
                                                                                 (*pair->v0)[Y],
@@ -543 +542 @@
 
         v0->vID = pair->v0->vID;
-=======
-        v0      =       new Vertex(     pair->v0->operator[](0),
-                                                                                pair->v0->operator[](1),
-                                                                                pair->v0->operator[](2));
-        v0->vID = pair->v0->vID;
-        v0->uniqID = pair->v0->uniqID;
->>>>>>> .r2086
         
         v1      =       new Vertex(     (*pair->v1)[X],
                                                                                 (*pair->v1)[Y],
                                                                                 (*pair->v1)[Z]);
-        v1->vID = pair->v1->vID;
+
         v1->vID = pair->v1->vID;
 
@@ -716 +708 @@
                                 vertex_added.bonefrom   =       take_bone_from_vert->vID;
 
-<<<<<<< .mine
                                 vertex_added.position   =       Vector3(candidate[X],
                                                                                                                                                                 candidate[Y],
                                                                                                                                                                 candidate[Z]);
-=======
-                //      If a twin edge has been found.
-                if (twin_found)
-                {
-                        heap->kill(i);
->>>>>>> .r2086
 
                                 simplif::Vec2 tc                        = m.texcoord(new_vert->vID);