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

Timestamp:

07/05/06 20:18:06 (18 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry

Files:

• GTGeometry.suo (modified) (previous)
• GTGeometry.vcproj (modified) (2 diffs)
• include/GeoLodStripsLibrary.h (modified) (4 diffs)
• include/GeoLodTreeLibrary.h (modified) (3 diffs)
• include/GeoMeshLoader.h (added)
• include/GeoMeshSaver.h (added)
• src/GeoLodStripsLibrary.cpp (modified) (10 diffs)
• src/GeoLodTreeLibrary.cpp (modified) (1 diff)
• src/GeoMeshLoader.cpp (added)
• src/GeoMeshSaver.cpp (added)
• src/libs/leaves/foliage.cpp (modified) (2 diffs)
• src/libs/leaves/foliage.h (modified) (2 diffs)

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

@@ -130 +130 @@
                         </File>
                         <File
+                                RelativePath=".\src\GeoMeshLoader.cpp">
+                        </File>
+                        <File
+                                RelativePath=".\src\GeoMeshSaver.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\src\GeoMeshSimplifier.cpp">
                         </File>
@@ -370 +376 @@
                         <File
                                 RelativePath=".\include\GeoMesh.h">
+                        </File>
+                        <File
+                                RelativePath=".\include\GeoMeshLoader.h">
+                        </File>
+                        <File
+                                RelativePath=".\include\GeoMeshSaver.h">
                         </File>
                         <File

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

@@ -133 +133 @@
 
                         //      Loads Mesh.
-                        void    LoadStripMesh(const LodStripsLibraryData &, Mesh *geomesh);
+                        void    LoadStripMesh(const LodStripsLibraryData *, Mesh *geomesh);
 
                         Geometry::CREATEINDEXDATAFUNC create_index_data_func;
@@ -139 +139 @@
                         //      Strips vector.
                         SmallIntVector  *mStrips;
+                        int *indices_x_submesh;
+                        int *offsets_x_submesh;
 
                         void UpdateDataRetrievalInterface(void);                        
@@ -149 +151 @@
                          *      including the multiresolution object.
                         */
-                        LodStripsLibrary(const LodStripsLibraryData &, Mesh *geomesh, CREATEINDEXDATAFUNC idfun=NULL);
+                        LodStripsLibrary(const LodStripsLibraryData *, Mesh *geomesh, CREATEINDEXDATAFUNC idfun=NULL);
 
                         /// Destructor.
@@ -173 +175 @@
                         uint32  MinVertices();
 
-                        int *indices_x_submesh;
+                        uint32 GetValidIndexCount(int submeshid) const { return indices_x_submesh[submeshid]; }
+                        uint32 GetValidOffset(int submeshid) const { return offsets_x_submesh[submeshid]; }
         };
 }

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

@@ -22 +22 @@
 /*              LodTreeLibrary( const LodTreeLibrary &);
                 LodTreeLibrary(LodTreeLibrary*);*/
-                LodTreeLibrary( const LodStripsLibraryData &,
-                                                const TreeSimplificationSequence &,
+                LodTreeLibrary( const LodStripsLibraryData *,
+                                                const TreeSimplificationSequence *,
                                                 Geometry::Mesh *treeGeoMesh,
                                                 uint32 leafSubMeshID
@@ -57 +57 @@
 /*              const VertexData* Get_Trunk_VertexData(void) const;*/
                 const IndexData* CurrentLOD_Trunk_Indices(void) const;
+                uint32 GetValidTrunkIndexCount(int isubmesh) const { return trunk->GetValidIndexCount(isubmesh); }
+                uint32 GetValidTrunkOffset(int isubmesh) const { return trunk->GetValidOffset(isubmesh); }
 
 //              uint32 Get_Foliage_VertexCount(void) const;
@@ -64 +66 @@
                 const VertexData* Get_Foliage_VertexData(void) const;
 
-//              Geometry::IndexData *trunk_all_indices;
-//              unsigned int *indices_offsets;
-
-//              const Geometry::SmallIntVector & GetStrip(uint32 istrip) const { return trunk->mStrips[istrip]; }
-                Geometry::LodStripsLibrary *trunk;
-
         private:
                 Foliage *foliage;
-
+                Geometry::LodStripsLibrary *trunk;
         };
 }

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

@@ -17 +17 @@
 //      Constructors.
 //-----------------------------------------------------------------------------
-LodStripsLibrary::LodStripsLibrary(const LodStripsLibraryData &lodstripsdata, Mesh *geomesh, CREATEINDEXDATAFUNC idfun)
+LodStripsLibrary::LodStripsLibrary(const LodStripsLibraryData *lodstripsdata, Mesh *geomesh, CREATEINDEXDATAFUNC idfun)
 :create_index_data_func(idfun?idfun:DefaultIndexDataCreator)
 {
@@ -33 +33 @@
         dataRetrievalInterface=NULL;
         indices_x_submesh = NULL;
+        offsets_x_submesh = NULL;
         
         //      Loads the Level Of Detail file.
@@ -58 +59 @@
         if (indices_x_submesh)
                 delete[] indices_x_submesh;
+        if (offsets_x_submesh)
+                delete[] offsets_x_submesh;
 }
 
@@ -430 +433 @@
 //      LoadStripMesh
 //-----------------------------------------------------------------------------
-void LodStripsLibrary::LoadStripMesh(const LodStripsLibraryData &lodstripsdata, Mesh *geomesh)
+void LodStripsLibrary::LoadStripMesh(const LodStripsLibraryData *lodstripsdata, Mesh *geomesh)
 {
         FILE                                                                                                                    *fp;
@@ -451 +454 @@
         //      For each one of the submeshes.
         indices_x_submesh = new int[geomesh->mSubMeshCount];
+        offsets_x_submesh = new int[geomesh->mSubMeshCount];
         for (unsigned int submesh       =       0; submesh < geomesh->mSubMeshCount; submesh++)
         {
@@ -492 +496 @@
                         i       = 0;
                         indices_x_submesh[submesh] = 0;
+                        if (submesh==0)
+                                offsets_x_submesh[submesh] = 0;
+                        else
+                                offsets_x_submesh[submesh] = indices_x_submesh[submesh-1];
+
                         //      For each index of the strip.
                         for (index = indexBegin; index < indexEnd; index++)
@@ -498 +507 @@
                                 indices_x_submesh[submesh]++;
                                 i++;
-                        }
+                        }                       
                 }
         }
@@ -559 +568 @@
                 fclose(fp);*/
 
-        mFileVertices = lodstripsdata.mFileVertices;
-        mFileChangesLOD = lodstripsdata.mFileChangesLOD;
-        mData = lodstripsdata.mData;
-        p_changes = lodstripsdata.p_changes;
+        mFileVertices = lodstripsdata->mFileVertices;
+        mFileChangesLOD = lodstripsdata->mFileChangesLOD;
+        mData = lodstripsdata->mData;
+        p_changes = lodstripsdata->p_changes;
                 
                 
@@ -602 +611 @@
                 {
                         indices_x_submesh[target_submesh] = counter;
+                        if (target_submesh==0)
+                                offsets_x_submesh[target_submesh] = 0;
+                        else
+                                offsets_x_submesh[target_submesh] = indices_x_submesh[target_submesh-1] + offsets_x_submesh[target_submesh-1];
+
                         counter = 0;
                         strip_count = 0;
@@ -617 +631 @@
         {
                 indices_x_submesh[target_submesh] = counter;
+                if (target_submesh==0)
+                        offsets_x_submesh[target_submesh] = 0;
+                else
+                        offsets_x_submesh[target_submesh] = indices_x_submesh[target_submesh-1] + offsets_x_submesh[target_submesh-1];
+
                 counter = 0;
                 strip_count = 0;

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

@@ -5 +5 @@
 using namespace Geometry;
 
-Geometry::LodTreeLibrary::LodTreeLibrary(const LodStripsLibraryData &lodstripsdata,
-                                                                                 const TreeSimplificationSequence &simpseq,
+Geometry::LodTreeLibrary::LodTreeLibrary(const LodStripsLibraryData *lodstripsdata,
+                                                                                 const TreeSimplificationSequence *simpseq,
                                                                                  Geometry::Mesh *treeGeoMesh,
                                                                                  uint32 leafSubMeshID/*

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

@@ -10 +10 @@
 // Parameters --> None
 //--------------------------------------------------------------------------------------------------------------------------------
-Foliage::Foliage(const Geometry::SubMesh *leavesSubMesh, const Geometry::TreeSimplificationSequence & simpSeq, Geometry::CREATEVERTEXDATAFUNC vdfun, Geometry::CREATEINDEXDATAFUNC idfun): 
+Foliage::Foliage(const Geometry::SubMesh *leavesSubMesh, const Geometry::TreeSimplificationSequence * simpSeq, Geometry::CREATEVERTEXDATAFUNC vdfun, Geometry::CREATEINDEXDATAFUNC idfun): 
 Acth(NULL),
 create_vertex_data_func(vdfun==NULL?Geometry::DefaultVertexDataCreator:vdfun),
@@ -304 +304 @@
 
 /// returns the number of total leafs
-bool Foliage::ReadSimpSeq(const Geometry::TreeSimplificationSequence & simpSeq)
+bool Foliage::ReadSimpSeq(const Geometry::TreeSimplificationSequence * simpSeq)
 {
         int tn, tv1,tv2, e=0;
 
         tn = leafCount;
-        for (std::vector<Geometry::TreeSimplificationSequence::Step>::const_iterator it = simpSeq.mSteps.begin(); it != simpSeq.mSteps.end(); it++)
+        for (std::vector<Geometry::TreeSimplificationSequence::Step>::const_iterator it = simpSeq->mSteps.begin(); it != simpSeq->mSteps.end(); it++)
         {
                 Leaves[tn].vertsLeaf[0] = it->mNewQuad[0];

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/leaves/foliage.h

@@ -27 +27 @@
                 int active_leaf_count;
 
-                Foliage (const Geometry::SubMesh *, const Geometry::TreeSimplificationSequence &, Geometry::CREATEVERTEXDATAFUNC vdfun=NULL, Geometry::CREATEINDEXDATAFUNC idfun=NULL);
+                Foliage (const Geometry::SubMesh *, const Geometry::TreeSimplificationSequence *, Geometry::CREATEVERTEXDATAFUNC vdfun=NULL, Geometry::CREATEINDEXDATAFUNC idfun=NULL);
                 Foliage (const Foliage *);
                 virtual ~Foliage (void); // Destructor
@@ -57 +57 @@
                 void ReadLeafs(const Geometry::SubMesh *);
                 void ReadVertices(const Geometry::SubMesh *);
-                bool ReadSimpSeq(const Geometry::TreeSimplificationSequence &); /// returns true when successful
+                bool ReadSimpSeq(const Geometry::TreeSimplificationSequence *); /// returns true when successful
                 void FillRoot(void);