Changeset 1069 for GTP/trunk/Lib/Geom/shared/GTGeometry

Timestamp:

06/28/06 17:50:02 (18 years ago)

Author:

gumbau

Message:

MultiIndexData? replaced by IndexData?

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry

Files:

• GTGeometry.vcproj (modified) (2 diffs)
• include/GeoLodManager.h (added)
• include/GeoLodStripsLibrary.h (modified) (2 diffs)
• include/GeoLodTreeLibrary.h (modified) (1 diff)
• include/VertexData.h (modified) (5 diffs)
• src/GeoLodManager.cpp (added)
• src/GeoLodStripsLibrary.cpp (modified) (6 diffs)
• src/GeoLodTreeLibrary.cpp (modified) (3 diffs)
• src/libs/leaves/VertexData.cpp (modified) (2 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/GTGeometry.vcproj

@@ -112 +112 @@
                         </File>
                         <File
+                                RelativePath=".\src\GeoLodManager.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\src\GeoLodStripsConstructor.cpp">
                         </File>
@@ -349 +352 @@
                         <File
                                 RelativePath=".\include\GeoBase.h">
+                        </File>
+                        <File
+                                RelativePath=".\include\GeoLodManager.h">
                         </File>
                         <File

GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoLodStripsLibrary.h

@@ -127 +127 @@
                         void    LoadStripMesh(char *name, Mesh *geomesh);
 
-                        Geometry::CREATEMULTIINDEXDATAFUNC create_multi_index_data_func;
+                        Geometry::CREATEINDEXDATAFUNC create_index_data_func;
 
                         //      Strips vector.
@@ -136 +136 @@
                 public:
 
-                        MultiIndexData *dataRetrievalInterface;
+                        IndexData *dataRetrievalInterface;
                         
                         /**     Constructor, receives as a parameter the name of the file
                          *      including the multiresolution object.
                         */
-                        LodStripsLibrary(std::string, Mesh *geomesh, CREATEMULTIINDEXDATAFUNC midfun=NULL);
+                        LodStripsLibrary(std::string, Mesh *geomesh, CREATEINDEXDATAFUNC idfun=NULL);
 
                         /// Destructor.
                         ~LodStripsLibrary(void);
-
-                        /// Returns the highest LOD.
-                        uint32  MaxLod();
-
-                        /// Returns the lowest LOD.
-                        uint32  MinLod();
 
                         /// Returns de current LOD and changes to the specified LOD.

GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoLodTreeLibrary.h

@@ -51 +51 @@
 //              uint32 Get_Trunk_VertexCount(void) const;
 //              uint32 Get_Trunk_MaxIndexCount(uint32 istrip) const;
-                uint32 CurrentLOD_Trunk_StripCount(void) const;
+//              uint32 CurrentLOD_Trunk_StripCount(void) const;
 //              uint32 CurrentLOD_Trunk_IndexCount(void) const;
-                uint32 CurrentLOD_Trunk_IndexCountByStrip(uint32 istrip) const;
+//              uint32 CurrentLOD_Trunk_IndexCountByStrip(uint32 istrip) const;
 /*              const VertexData* Get_Trunk_VertexData(void) const;*/
-                const MultiIndexData* CurrentLOD_Trunk_Indices(void) const;
+                const IndexData* CurrentLOD_Trunk_Indices(void) const;
 
 //              uint32 Get_Foliage_VertexCount(void) const;

GTP/trunk/Lib/Geom/shared/GTGeometry/include/VertexData.h

@@ -45 +45 @@
         };
 
-        class MultiIndexData
+/*      class MultiIndexData
         {
         private:
@@ -76 +76 @@
                 void SetNumValidIndices(unsigned int iprim, unsigned int valid){ num_valid_inds[iprim]=valid; }
                 unsigned int GetNumPrims(void) const { return num_prims; }
-        };
+        };*/
 
         typedef VertexData* CreateVertexDataFunc(unsigned int numv);
@@ -82 +82 @@
         typedef IndexData* CreateIndexDataFunc(unsigned int numi);
         typedef CreateIndexDataFunc* CREATEINDEXDATAFUNC;
-        typedef MultiIndexData* CreateMultiIndexDataFunc(unsigned int numprims, unsigned int *numi);
-        typedef CreateMultiIndexDataFunc* CREATEMULTIINDEXDATAFUNC;
+/*      typedef MultiIndexData* CreateMultiIndexDataFunc(unsigned int numprims, unsigned int *numi);
+        typedef CreateMultiIndexDataFunc* CREATEMULTIINDEXDATAFUNC;*/
 
         class DefaultVertexData : public VertexData
@@ -138 +138 @@
         IndexData *DefaultIndexDataCreator(unsigned int numi);
 
-        class DefaultMultiIndexData : public MultiIndexData
+/*      class DefaultMultiIndexData : public MultiIndexData
         {
         private:
@@ -158 +158 @@
         };
         MultiIndexData *DefaultMultiIndexDataCreator(unsigned int numprims, unsigned int *numi);
-
+*/
 }
 

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

@@ -17 +17 @@
 //      Constructors.
 //-----------------------------------------------------------------------------
-LodStripsLibrary::LodStripsLibrary(     std::string     name, Mesh *geomesh, CREATEMULTIINDEXDATAFUNC midfun)
-:create_multi_index_data_func(midfun?midfun:DefaultMultiIndexDataCreator)
+LodStripsLibrary::LodStripsLibrary(std::string  name, Mesh *geomesh, CREATEINDEXDATAFUNC idfun)
+:create_index_data_func(idfun?idfun:DefaultIndexDataCreator)
 {
         const   char    *name_of_file;
@@ -241 +241 @@
 
 //-----------------------------------------------------------------------------
-//      Gets the maximum level of detail.
-//-----------------------------------------------------------------------------
-uint32 LodStripsLibrary::MaxLod()
-{
-        return  mMaxLod;
-}
-
-//-----------------------------------------------------------------------------
-//      Gets the minimum level of detail.
-//-----------------------------------------------------------------------------
-uint32 LodStripsLibrary::MinLod()
-{
-        return  mMinLod;
-}
-
-//-----------------------------------------------------------------------------
 //      Returns the number of vertices of the highest LOD.
 //-----------------------------------------------------------------------------
@@ -386 +370 @@
         mTotalFaces     =       0;
 
-        unsigned int * strip_sizes = new unsigned int[mFileStrips.size()];
+//      unsigned int * strip_sizes = new unsigned int[mFileStrips.size()];
+        unsigned int total_strip_size = 0;
         for (i = 0; i < mFileStrips.size(); i++)
         {
-                strip_sizes[i] = t = int(mFileStrips[i].size());
+                total_strip_size += t = int(mFileStrips[i].size());
                 if (t>max)
                         max     =       t;
@@ -406 +391 @@
         
         //      Copy strips.
-        dataRetrievalInterface=create_multi_index_data_func(mFileStrips.size(),strip_sizes);
-        dataRetrievalInterface->Begin();
-        for (i = 0; i < mFileStrips.size(); i++)
-        {
-                for (j = 0; j < mFileStrips[i].size(); j++)
+        dataRetrievalInterface=create_index_data_func(total_strip_size);
+        dataRetrievalInterface->Begin();        
+        for (int ii = 0, i = 0; i < mFileStrips.size(); i++)
+        {
+                for (j = 0; j < mFileStrips[i].size(); j++,ii++)
                 {
                         mStrips[i].push_back(mFileStrips[i][j]);
-                        dataRetrievalInterface->SetIndex(i,j,mFileStrips[i][j]);
+                        dataRetrievalInterface->SetIndex(ii,mFileStrips[i][j]);
                 }
                 
@@ -434 +419 @@
         }
 
-        delete[] strip_sizes;
+//      delete[] strip_sizes;
 }
 
@@ -593 +578 @@
 {
         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);
+        for (int i=0, ii=0; i<mTotalStrips; i++)
+        {
+                for (SmallIntVector::iterator it=mStrips[i].begin(); it!=mStrips[i].end(); it++, ii++)
+                        dataRetrievalInterface->SetIndex(ii,*it);
+                dataRetrievalInterface->SetNumValidIndices(ii);
         }
         dataRetrievalInterface->End();

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

@@ -48 +48 @@
 //      if (current_foliage_indices) delete[] current_foliage_indices;*/
 }
-
+/*
 uint32 LodTreeLibrary::CurrentLOD_Trunk_StripCount(void) const
 {
         assert(trunk);
-//      return trunk->TOTALTIRAS;
-        return trunk->dataRetrievalInterface->GetNumPrims();
-}
-
-
-uint32 LodTreeLibrary::CurrentLOD_Trunk_IndexCountByStrip(uint32 istrip) const
+        return trunk->TOTAL;
+//      return trunk->dataRetrievalInterface->GetNumPrims();
+}*/
+
+
+/*uint32 LodTreeLibrary::CurrentLOD_Trunk_IndexCountByStrip(uint32 istrip) const
 {
         assert(trunk);
@@ -64 +64 @@
         return trunk->dataRetrievalInterface->GetNumValidIndices(istrip);
 }
-/*
+
 uint32 LodTreeLibrary::CurrentLOD_Trunk_IndexCount(void) const
 {
@@ -146 +146 @@
         return trunk->vertices; 
 }*/
-const MultiIndexData* LodTreeLibrary::CurrentLOD_Trunk_Indices(void) const 
+const IndexData* LodTreeLibrary::CurrentLOD_Trunk_Indices(void) const 
 { 
         return trunk->dataRetrievalInterface;

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/leaves/VertexData.cpp

@@ -35 +35 @@
 
 
-Geometry::DefaultMultiIndexData::DefaultMultiIndexData(unsigned int numprims, unsigned int *numi):Geometry::MultiIndexData(numprims,numi)
+/*Geometry::DefaultMultiIndexData::DefaultMultiIndexData(unsigned int numprims, unsigned int *numi):Geometry::MultiIndexData(numprims,numi)
 {
         indices = new unsigned int*[numprims];  
@@ -52 +52 @@
         return new DefaultMultiIndexData(numprims,numi); 
 }
+*/