Changeset 1526 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoMeshLoader.cpp

Timestamp:

09/28/06 17:49:37 (18 years ago)

Author:

gumbau

Message:

Updated modules to the new interface and the new simplification algorithm improvements.

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoMeshLoader.cpp (modified) (11 diffs)

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

@@ -681 +681 @@
                         {
                                 case 0xabcd:
+                                        
+                                        //      Debug.
                                         cout << "LODSTRIPS_Chunk" << endl;
+                                        
                                         lodstripsdata = new Geometry::LodStripsLibraryData;
 
-                                        int                             aux,v,c;
+                                        int                                                     aux,v,c;
                                         LODRegisterType lod_register;
-                                        LODData                 dataaux;
-                                        int                             tam;
+                                        LODData                                 dataaux;
+                                        int                                                     tam;
 
                                         fread(&tam, sizeof(int), 1, f);
+                                        
                                         lodstripsdata->mFileVertices.clear();
-                                        for (v=0; v<tam; v++)
+                                        
+                                        for (v  =       0; v < tam; v++)
                                         {
                                                 fread(&aux, sizeof(int), 1, f);
@@ -698 +703 @@
 
                                         lodstripsdata->mFileChangesLOD.clear();
+                                        
                                         fread(&tam, sizeof(int), 1, f);
-                                        for (c=0; c<tam; c++)
+                                        
+                                        for (c  =       0; c < tam; c++)
                                         {
                                                 fread(&dataaux, sizeof(LODData), 1, f);
@@ -706 +713 @@
                                                 lod_register.vertexRepetition= dataaux.nL1;
                                                 lod_register.edgeRepetition= dataaux.nL2;
-                                                //lod_register.obligatory=false;
-                                                //lod_register.obligatory= dataaux.obligatory;
+                                                lod_register.obligatory=dataaux.obligatory;
 
                                                 lodstripsdata->mFileChangesLOD.push_back(lod_register);
@@ -713 +719 @@
                                         
                                         lodstripsdata->mData.clear();
+                                        
                                         fread(&tam, sizeof(int), 1, f);
-                                        for (int b=0; b<tam; b++)
+                                        
+                                        for (int        b       =       0; b < tam; b++)
                                         {
                                                 fread(&aux, sizeof(int), 1, f);
@@ -721 +729 @@
 
                                         lodstripsdata->p_changes.clear();
+                                        
                                         fread(&tam, sizeof(int), 1, f);
-                                        for (int p=0; p<tam; p++)
+                                        
+                                        for (int        p       =       0; p < tam; p++)
                                         {
                                                 fread(&aux, sizeof(int), 1, f);
                                                 lodstripsdata->p_changes.push_back(aux);
-                                        }                                       
+                                        }
 
                                         break;
@@ -1146 +1156 @@
                                 cout    <<      version <<      endl;
 
-                                if (strcmp(version,"[MeshSerializer_v1.30]\n"))
+                                /*if (strcmp(version,"[MeshSerializer_v1.30]\n"))
                                 {
                                         //      Debug.
@@ -1156 +1166 @@
                                         //      Error.
                                         mError  =       true;
-                                }
+                                }*/
 
                                 while(!feof(pFile))
@@ -1423 +1433 @@
 //      Read bones of the submesh.
 //---------------------------------------------------------------------------
-void GeoMeshLoader::readSubMeshBoneAssignment(FILE* f,
-                                                                                                                                                                                        SubMesh* geoSubMesh,
-                                                                                                                                                                                        int option)
+void GeoMeshLoader::readSubMeshBoneAssignment(FILE              *f,
+                                                                                                                                                                                        SubMesh *geoSubMesh,
+                                                                                                                                                                                        int                     option)
 {
         if (option == GEOMESH_BUILD)
@@ -1445 +1455 @@
 //      Read bones of the main mesh.
 //---------------------------------------------------------------------------
-void GeoMeshLoader::readMeshBoneAssignment(FILE* f, Mesh* geoMesh,int option)
+void GeoMeshLoader::readMeshBoneAssignment(FILE *f, Mesh        *geoMesh,       int option)
 {
         if (option == GEOMESH_BUILD)
@@ -1465 +1475 @@
 //      Read skeleton link.
 //---------------------------------------------------------------------------
-void GeoMeshLoader::readSkeletonLink(FILE* f, Mesh* geoMesh,int option)
+void GeoMeshLoader::readSkeletonLink(FILE       *f, Mesh        *geoMesh,       int option)
 {
         if (option == GEOMESH_BUILD)
@@ -1829 +1839 @@
                 const std::vector<face_t> & vecfaces = faces[i];
                 std::vector<Geometry::Index> aux_indices;
+                
                 submesh->mSharedVertexBuffer = true;
                 submesh->mIndexCount = vecfaces.size()*3;