Changeset 1090 for GTP/trunk

Timestamp:

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

Author:

gumbau

Message:

LodTreeLibrary? constructor now has 3 parameters.
The leaves submesh is calculated inside the constructor.

Location:

GTP/trunk/Lib/Geom/shared

Files:

• GTGeometry/GTGeometry.suo (modified) (previous)
• GTGeometry/GTGeometry.vcproj (modified) (1 diff)
• GTGeometry/include/GeoLodStripsLibrary.h (modified) (2 diffs)
• GTGeometry/include/GeoLodTreeLibrary.h (modified) (2 diffs)
• GTGeometry/src/GeoLodStripsConstructor.cpp (modified) (2 diffs)
• GTGeometry/src/GeoLodStripsLibrary.cpp (modified) (5 diffs)
• GTGeometry/src/GeoLodTreeLibrary.cpp (modified) (2 diffs)
• GTGeometry/src/GeoTreeSimpSequence.cpp (modified) (2 diffs)
• GeoTool/include/GeoMeshViewUI.h (modified) (1 diff)
• GeoTool/src/GeoMeshView.cpp (modified) (1 diff)
• GeoTool/src/GeoMeshViewUI.cpp (modified) (4 diffs)

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

@@ -77 +77 @@
                         <Tool
                                 Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/GTGeometry.lib"/>
+                                OutputFile="$(OutDir)/GTGeometry.lib"
+                                IgnoreAllDefaultLibraries="TRUE"
+                                IgnoreDefaultLibraryNames="LIBC"/>
                         <Tool
                                 Name="VCMIDLTool"/>

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

@@ -144 +144 @@
                         void UpdateDataRetrievalInterface(void);                        
 
+                        //Number of strips in each submesh
+                        int* mStripsSubmesh;
+
                 public:
 
@@ -177 +180 @@
                         uint32 GetValidIndexCount(int submeshid) const { return indices_x_submesh[submeshid]; }
                         uint32 GetValidOffset(int submeshid) const { return offsets_x_submesh[submeshid]; }
+                        uint32 GetTotalStripCount(void) const { return mTotalStrips; }
+                        uint32 GetSubMeshtripCount(int submeshid) const { return mStripsSubmesh[submeshid]; }
         };
 }

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

@@ -24 +24 @@
                 LodTreeLibrary( const LodStripsLibraryData *,
                                                 const TreeSimplificationSequence *,
-                                                Geometry::Mesh *treeGeoMesh,
+                                                Geometry::Mesh *treeGeoMesh/*,
                                                 uint32 leafSubMeshID
                                                 /*std::string foliage_verts,
@@ -65 +65 @@
                 const IndexData* CurrentLOD_Foliage_Indices(void) const;
                 const VertexData* Get_Foliage_VertexData(void) const;
+                uint32 GetLeavesSubMesh(void) const { return mLeavesSubMesh; }
 
         private:
                 Foliage *foliage;
                 Geometry::LodStripsLibrary *trunk;
+                uint32 mLeavesSubMesh;
         };
 }

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

@@ -3 +3 @@
 #include <time.h>
 #include "GeoLodStripsConstructor.h"
+#include "GeoMeshLoader.h"
 
 using namespace Geometry;
@@ -619 +620 @@
         int dataCount = this->cDatos.size();
         int cambiosCount = this->TOTALCAMBIOS;
-        int size= dataCount*sizeof(LODData) + (vertexCount + changesCount + cambiosCount + 4)*sizeof(int);
+        int size =      changesCount*sizeof(LODData) + 
+                                (vertexCount + dataCount + cambiosCount + 4)*sizeof(int) +
+                                CHUNK_OVERHEAD_SIZE;
 
         FILE *f = fopen(filename.c_str(),"ab");

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

@@ -34 +34 @@
         indices_x_submesh = NULL;
         offsets_x_submesh = NULL;
+        mStripsSubmesh = NULL;
         
         //      Loads the Level Of Detail file.
@@ -61 +62 @@
         if (offsets_x_submesh)
                 delete[] offsets_x_submesh;
+        if (mStripsSubmesh)
+                delete[] mStripsSubmesh;
 }
 
@@ -573 +576 @@
         mData = lodstripsdata->mData;
         p_changes = lodstripsdata->p_changes;
-                
-                
-                //      Max / Min values for LOD.
-                mLods                                                                                   =       int(p_changes.size());
-                mMaxLod                                                                         =       0;
-                mMinLod                                                                         =       mLods;
-
-                mPChanges                       =       new SmallInt[mLods];
-                
-                for (unsigned int i = 0; i < mLods; i++)
-                {
-                        mPChanges[i] = p_changes[i];
-                }
-
-                mTotalVertices          =       int(mFileVertices.size());
-                mMaxVerticesLOD         =       mTotalVertices;
-                mTotalStrips                    =       int(mFileStrips.size());
-                mTotalChanges                   =       int(mFileChangesLOD.size());
-
-                //Copy the data to the structure we will use
-                CopyVectors2Arrays();
+
+        mStripsSubmesh = new int [geomesh->mSubMeshCount];
+        for (int submesh = 0; submesh < geomesh->mSubMeshCount; submesh++)
+        {       
+                mStripsSubmesh[submesh]=0;
+        }
+
+                        
+        //      Max / Min values for LOD.
+        mLods                                                                                   =       int(p_changes.size());
+        mMaxLod                                                                         =       0;
+        mMinLod                                                                         =       mLods;
+
+        mPChanges                       =       new SmallInt[mLods];
+        
+        for (unsigned int i = 0; i < mLods; i++)
+        {
+                mPChanges[i] = p_changes[i];
+        }
+
+        mTotalVertices          =       int(mFileVertices.size());
+        mMaxVerticesLOD         =       mTotalVertices;
+        mTotalStrips                    =       int(mFileStrips.size());
+        mTotalChanges                   =       int(mFileChangesLOD.size());
+
+        //Copy the data to the structure we will use
+        CopyVectors2Arrays();
 //      }
 }
@@ -618 +627 @@
 
                         counter = 0;
+                        mStripsSubmesh[target_submesh] = strip_count;
                         strip_count = 0;
                         target_submesh++;
@@ -655 +665 @@
 
                 counter = 0;
+                mStripsSubmesh[target_submesh] = strip_count;
                 strip_count = 0;
                 target_submesh++;

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

@@ -7 +7 @@
 Geometry::LodTreeLibrary::LodTreeLibrary(const LodStripsLibraryData *lodstripsdata,
                                                                                  const TreeSimplificationSequence *simpseq,
-                                                                                 Geometry::Mesh *treeGeoMesh,
-                                                                                 uint32 leafSubMeshID/*
+                                                                                 Geometry::Mesh *treeGeoMesh/*,
+                                                                                 uint32 leafSubMeshID,
                                                            CREATEVERTEXDATAFUNC vdfun,
                                                            CREATEINDEXDATAFUNC idfun,
@@ -16 +16 @@
         trunk = new LodStripsLibrary(lodstripsdata,treeGeoMesh);
 
+        // select the first triangle-list submesh as leaves submesh
+        mLeavesSubMesh = -1;
+        for (int i=0; i<treeGeoMesh->mSubMeshCount; i++)
+        {
+                if (treeGeoMesh->mSubMesh[i].mType==GEO_TRIANGLE_LIST)
+                {
+                        mLeavesSubMesh=i;
+                        break;
+                }
+        }       
+
         // Cargar la copa del árbol
-        Geometry::SubMesh * leafsSubMesh = &(treeGeoMesh->mSubMesh[leafSubMeshID]);
+        Geometry::SubMesh * leafsSubMesh = &(treeGeoMesh->mSubMesh[mLeavesSubMesh]);
         foliage = new Foliage(leafsSubMesh,simpseq);
         GoToFoliageLod(1.0f);

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

@@ -2 +2 @@
 #include <iostream>
 #include <fstream>
+#include "GeoMeshLoader.h"
 
 using namespace Geometry;
@@ -68 +69 @@
         unsigned short chunkid = 0xdcba;
         s.WriteData(&chunkid,sizeof(unsigned short),1);
-        unsigned long size = mSteps.size()*8*sizeof(int);
+        unsigned long size = mSteps.size()*8*sizeof(int) + CHUNK_OVERHEAD_SIZE;
         s.WriteData(&size,sizeof(unsigned long),1);
 

GTP/trunk/Lib/Geom/shared/GeoTool/include/GeoMeshViewUI.h

@@ -374 +374 @@
         void    setLodStripsLibrary(const Geometry::LodStripsLibraryData *, Mesh        *geomesh);
         //      Initialize the lodtreelibrary for visualization.
-        void    setLodTreesLibrary(const Geometry::LodStripsLibraryData *, const Geometry::TreeSimplificationSequence *, Mesh   *geomesh, uint32 ileafSubMesh);
+        void    setLodTreesLibrary(const Geometry::LodStripsLibraryData *, const Geometry::TreeSimplificationSequence *, Mesh   *geomesh/*, uint32 ileafSubMesh*/);
 
         // Indentify the mesh of leaves.

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshView.cpp

@@ -1032 +1032 @@
         for (int submesh = 0; submesh < geoMesh->mSubMeshCount; submesh++)
         {
-                if (submesh==leavesSubMesh)
+                //if (submesh==leavesSubMesh)
+                if (submesh == lodTreeLib->GetLeavesSubMesh())
                         continue;
 

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshViewUI.cpp

@@ -852 +852 @@
                 if (geoMeshLoader->GetTreeSimpSeq() && geoMeshLoader->GetLodStripsData())
                 {
-                        // select the first triangle-list submesh as leaves submesh
+/*                      // select the first triangle-list submesh as leaves submesh
                         int leafsSubMeshID = -1;
 
@@ -862 +862 @@
                                         break;
                                 }
-                        }
-
-                        setLodTreesLibrary(geoMeshLoader->GetLodStripsData(), geoMeshLoader->GetTreeSimpSeq(), mGeoMesh, leafsSubMeshID);
+                        }*/
+
+                        setLodTreesLibrary(geoMeshLoader->GetLodStripsData(), geoMeshLoader->GetTreeSimpSeq(), mGeoMesh/*, leafsSubMeshID*/);
 
                         //      Sets the aplication mode.
@@ -2342 +2342 @@
 //      Initialize the lodTreelibrary for visualization.
 //---------------------------------------------------------------------------
-void    GeoMeshViewUI::setLodTreesLibrary(const LodStripsLibraryData *lodstripsdata, const TreeSimplificationSequence *treesimpseq, Mesh *geomesh, uint32 ileafSubMesh)
+void    GeoMeshViewUI::setLodTreesLibrary(const LodStripsLibraryData *lodstripsdata, const TreeSimplificationSequence *treesimpseq, Mesh *geomesh/*, uint32 ileafSubMesh*/)
 {
         //      If there is no lod strips object.
@@ -2350 +2350 @@
         //      New lod strips object.
 
-        lodTreeLib = new Geometry::LodTreeLibrary(lodstripsdata,treesimpseq,geomesh,ileafSubMesh);
+        lodTreeLib = new Geometry::LodTreeLibrary(lodstripsdata,treesimpseq,geomesh/*,ileafSubMesh*/);
 
         //      Sets the slider range.