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

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/GTGeometry/src

Files:

• GeoLodStripsConstructor.cpp (modified) (2 diffs)
• GeoLodStripsLibrary.cpp (modified) (5 diffs)
• GeoLodTreeLibrary.cpp (modified) (2 diffs)
• GeoTreeSimpSequence.cpp (modified) (2 diffs)

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);