Changeset 1018 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodStripsConstructor.cpp

Timestamp:

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

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodStripsConstructor.cpp (modified) (7 diffs)

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

@@ -42 +42 @@
         long            int                                                     totalRegs       =       0;
         long            int                                                     RegsCambios;
-        ObjList<ObjList<int> >                  TiraOriginal;
+        std::vector<std::vector<int> >                  TiraOriginal;
         LODData                                                                 regLOD;
         //LODChanges                                                    listaCambios;
-        ObjList<LODData>                                                listaCambios;
+        std::vector<LODData>                                            listaCambios;
         float                                                                           percent;
         float                                                                           increment;
@@ -89 +89 @@
                 {
 
-                        ObjList<int> & cStripsT = this->cStrips[t];
+                        std::vector<int> & cStripsT = this->cStrips[t];
 
                         //      Initialize.
@@ -138 +138 @@
                                         }
                                         
-                                        cStripsT.eraseAtPos(i);
-                                        //this->cStrips[t].erase(this->cStrips[t].begin()+i);
+                                        //cStripsT.eraseAtPos(i);
+                                        cStripsT.erase(this->cStrips[t].begin()+i);
                                         i--;
                                         r++;
@@ -198 +198 @@
                                         }
                                         
-                                        cStripsT.eraseAtPos(i);
-                                        //this->cStrips[t].erase(this->cStrips[t].begin()+i);
-                                        cStripsT.eraseAtPos(i);
-                                        //this->cStrips[t].erase(this->cStrips[t].begin()+i);
+                                        //cStripsT.eraseAtPos(i);
+                                        cStripsT.erase(this->cStrips[t].begin()+i);
+                                        //cStripsT.eraseAtPos(i);
+                                        cStripsT.erase(this->cStrips[t].begin()+i);
                                         r++;
                                         
@@ -274 +274 @@
         long int k;
         VECTORVERTEX                            Vertices;
-        ObjList<tipoVertice>            NuevosVerts;
+        std::vector<tipoVertice>                NuevosVerts;
         //vector        <VECTORINT>     NuevasTiras;
-        ObjList<ObjList<int> > NuevasTiras;
+        std::vector<std::vector<int> > NuevasTiras;
 //      VECTORINT                                               tira;
-        ObjList<int> tira;
+        std::vector<int> tira;
         vector  <Index>                 mV1Aux;
         tipoOrden                                               Orden;
@@ -480 +480 @@
                 for(t = 0; t < cStrips.size(); t++)
                 {
-                        ObjList<int> & thisStrip = cStrips[t];                  
-                        ObjList<int> & NuevasTirasT = NuevasTiras[t];
+                        std::vector<int> & thisStrip = cStrips[t];                      
+                        std::vector<int> & NuevasTirasT = NuevasTiras[t];
                         int cStripsSizeT = thisStrip.size();
                         for(i = 0; i < cStripsSizeT; i++)
@@ -975 +975 @@
 {
         tipoVertice     vAux;
-        ObjList<int>            tira;
+        std::vector<int>                tira;
         size_t                  i;
         size_t                  j;