Changeset 1024 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs

Timestamp:

06/20/06 13:02:00 (19 years ago)

Author:

gumbau

Message:

 

Location:

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

Files:

• include/change.h (modified) (2 diffs)
• src/change.cpp (modified) (1 diff)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/include/change.h

@@ -4 +4 @@
 #include        "mesh.h"
 #include        <vector>
+#include        <map>
 
 namespace       VMI
 {
+        typedef std::vector<int> INTVECTOR;
+
         typedef struct change
         {
@@ -63 +66 @@
         //      Save simplification sequence in Geometry Game Tools format.
         extern void     saveSimplificationSequence(Change       *c);
+
+        extern std::map<int, INTVECTOR> inversemap;
 }
 

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

@@ -332 +332 @@
 }
 
+namespace VMI{
+std::map<int, INTVECTOR> inversemap;
+}
+
 //      Save simplification sequence in Geometry Game Tools format.
 extern void     VMI::saveSimplificationSequence(Change  *c)
 {
-        vmiStep step;
-        step.mV0        =       c->u;
-        step.mV1        =       c->v;
-
-        //      If only one triangle has been deleted.
-        if (c->numDel == 1)
-        {
-                step.mT0        =       c->deleted[0].id;
-                step.mT1        =       c->deleted[0].id;
-        }
-        //      If two triangles have been deleted.
-        else
-        {
-                step.mT0        =       c->deleted[0].id;
-                step.mT1        =       c->deleted[1].id;
-        }
-
-        step.x  =       0.0;
-        step.y  =       0.0;
-        step.z  =       0.0;
-
-        //      Write obligatory field.
-        step.obligatory =       0;
-
-        //      List of new triangles.
-        //      For each modified triangle.
-        for (int        i = 0;  i < c->numMod;  i++)
-        {
-                step.mModfaces.push_back(c->modified[i].id);
-        }
-
-        //      Add step to list of changes.
-        mVMISteps.push_back(step);
-}
-
+
+        int stepnum= 1;
+        for(INTVECTOR::iterator it= inversemap[c->u].begin(); it!=inversemap[c->u].end(); it++)
+        {
+                vmiStep step;
+                step.mV0        =       *it;
+                step.mV1        =       c->v;
+
+                //      If only one triangle has been deleted.
+                if (c->numDel == 1)
+                {
+                        step.mT0        =       c->deleted[0].id;
+                        step.mT1        =       c->deleted[0].id;
+                }
+                //      If two triangles have been deleted.
+                else
+                {
+                        step.mT0        =       c->deleted[0].id;
+                        step.mT1        =       c->deleted[1].id;
+                }
+
+                step.x  =       0.0;
+                step.y  =       0.0;
+                step.z  =       0.0;
+
+                //      Write obligatory field.
+                if (stepnum==inversemap[c->u].size())
+                        step.obligatory =       0;
+                else
+                        step.obligatory =       1;
+                stepnum++;
+
+                //      List of new triangles.
+                //      For each modified triangle.
+                for (int        i = 0;  i < c->numMod;  i++)
+                {
+                        step.mModfaces.push_back(c->modified[i].id);
+                }
+
+                //      Add step to list of changes.
+                mVMISteps.push_back(step);
+        }
+}