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

Timestamp:

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

Author:

gumbau

Message:

 

Location:

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

Files:

• GeoLodStripsConstructor.cpp (modified) (7 diffs)
• GeoLodStripsLibrary.cpp (modified) (13 diffs)
• GeoLodTreeLibrary.cpp (modified) (3 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;

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

@@ -17 +17 @@
 //      Constructors.
 //-----------------------------------------------------------------------------
-LodStripsLibrary::LodStripsLibrary(     std::string     name,
-                                                                                                                                                Mesh                            *geomesh)
+LodStripsLibrary::LodStripsLibrary(     std::string     name, Mesh *geomesh, CREATEMULTIINDEXDATAFUNC midfun)
+:create_multi_index_data_func(midfun?midfun:DefaultMultiIndexDataCreator)
 {
         const   char    *name_of_file;
@@ -30 +30 @@
         //      Sets the global mesh.
         mGeoMesh = geomesh;
+
+        dataRetrievalInterface=NULL;
         
         //      Loads the Level Of Detail file.
@@ -41 +43 @@
 {
         delete  [] mStrips;
+        if (dataRetrievalInterface)
+                delete dataRetrievalInterface;
 }
 
@@ -220 +224 @@
         }
 
+        UpdateDataRetrievalInterface();
         return  return_value;
 }
@@ -321 +326 @@
         mMaxLod =       maxLod;
 }
-
+/*
 //-----------------------------------------------------------------------------
 //      Get strip count.
@@ -337 +342 @@
         return (uint32) mStrips[istrip].size();
 }
-
+*/
 //-----------------------------------------------------------------------------
 //      Private.
@@ -364 +369 @@
         max                                     =       0;
         mTotalFaces     =       0;
-        
+
+        unsigned int * strip_sizes = new unsigned int[mFileStrips.size()];
         for (i = 0; i < mFileStrips.size(); i++)
         {
-                t       =       int(mFileStrips[i].size());
-                
+                strip_sizes[i] = t = int(mFileStrips[i].size());
                 if (t>max)
-                {
                         max     =       t;
-                }
-
                 mTotalFaces     +=      t - 2;
         }
@@ -388 +390 @@
         
         //      Copy strips.
+        dataRetrievalInterface=create_multi_index_data_func(mFileStrips.size(),strip_sizes);
+        dataRetrievalInterface->Begin();
         for (i = 0; i < mFileStrips.size(); i++)
         {
@@ -393 +397 @@
                 {
                         mStrips[i].push_back(mFileStrips[i][j]);
+                        dataRetrievalInterface->SetIndex(i,j,mFileStrips[i][j]);
                 }
                 
@@ -398 +403 @@
                 mStripsChanges[i]       =       0;
         }
+        dataRetrievalInterface->End();
 
         for (i = 0; i < mData.size(); i++)
@@ -411 +417 @@
                 mVertex[i]      =       mFileVertices[i];
         }
+
+        delete[] strip_sizes;
 }
 
@@ -435 +443 @@
         SubMesh                                                                                                         *geoSubMesh;
 
+
+
         //      For each one of the submeshes.
         for (unsigned int submesh       =       0; submesh < geomesh->mSubMeshCount; submesh++)
@@ -563 +573 @@
 }
 
+
+void LodStripsLibrary::UpdateDataRetrievalInterface(void)
+{
+        dataRetrievalInterface->Begin();
+        for (int i=0; i<mTotalStrips; i++)
+        {
+                unsigned int j=0;
+                for (SmallIntVector::iterator it=mStrips[i].begin(); it!=mStrips[i].end(); it++, j++)
+                        dataRetrievalInterface->SetIndex(i,j,*it);
+                dataRetrievalInterface->SetNumValidIndices(i,j);
+        }
+        dataRetrievalInterface->End();
+}

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

@@ -65 +65 @@
         assert(trunk);
 //      return trunk->TOTALTIRAS;
-        return trunk->GetStripCount();
+        return trunk->dataRetrievalInterface->GetNumPrims();
 }
 
@@ -73 +73 @@
         assert(trunk);
 //      return trunk->lStripsV[istrip].size();
-        return trunk->GetIndexCountByStrip(istrip);
+//      return trunk->GetIndexCountByStrip(istrip);
+        return trunk->dataRetrievalInterface->GetNumValidIndices(istrip);
 }
 /*
@@ -168 +169 @@
 { 
         return trunk->vertices; 
-}
+}*/
 const MultiIndexData* LodTreeLibrary::CurrentLOD_Trunk_Indices(void) const 
 { 
 //      return (uint32*)trunk->vStrips[istrip]; 
 //      return trunk->indices_x_tira[istrip];
-        return trunk->indices;
-}*/
+        return trunk->dataRetrievalInterface;
+}