Changeset 1024 for GTP/trunk/Lib/Geom/shared/GeoTool/src

Timestamp:

06/20/06 13:02:00 (19 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared/GeoTool/src

Files:

• GeoMaterialLoader.cpp (added)
• GeoMeshLoader.cpp (modified) (1 diff)
• GeoMeshSaver.cpp (modified) (1 diff)
• GeoMeshViewUI.cpp (modified) (7 diffs)

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

@@ -427 +427 @@
         //      Gets material name.
         fgets(materialName,255,f);
+        materialName[strlen(materialName) - 1]  =       '\0';
 
         fread(&useSharedVertices,sizeof(bool),1,f);

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

@@ -215 +215 @@
 
         // Material Name.
+        strcat(geoSubMesh->mMaterialName,"\n");
         mSerializer->WriteData(geoSubMesh->mMaterialName);
 

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

@@ -25 +25 @@
         geoMeshView->deactiveLodTree();
 
-        geoMeshView->resetTextures();
         BuildLoadTextureSubMeshMenu();
 
@@ -1003 +1002 @@
 }
 
-VertexBuffer *origSubMeshVB=NULL;
-int orig_numindices=0;
-Index *orig_indices=NULL;
-
 //---------------------------------------------------------------------------
 //      Button Process Callback
@@ -1018 +1013 @@
         progressBarType =       PROCESS;
         mProcessBar->position(0);
-
-        origSubMeshVB=NULL;
 
         //      Initialize error flag.
@@ -1086 +1079 @@
                                 else
                                 {
-                                        origSubMeshVB=mGeoMesh->mSubMesh[idMeshLeaves].mVertexBuffer->Clone();
-                                        orig_numindices=mGeoMesh->mSubMesh[idMeshLeaves].mIndexCount;
-                                        orig_indices=new Index[orig_numindices];
-                                        for (int i=0; i<orig_numindices; i++)
-                                                orig_indices[i]=mGeoMesh->mSubMesh[idMeshLeaves].mIndex[i];
-
                                         std::cout << "Simplificando hojas...";
                                         simplifyLeavesCollapse();
@@ -1336 +1323 @@
                                                 file_name[strlen(file_name) - 4]        =       '\0';
                                                 
-                                                mesh_saver->leavesSubMesh=idMeshLeaves;
-                                                mesh_saver->leavesVB=origSubMeshVB;
-                                                mesh_saver->numindices=orig_numindices;
-                                                mesh_saver->indices=orig_indices;
                                                 mesh_saver->save(       mGeoMesh,
                                                                                                                         strcat(file_name,".mesh"));
@@ -2502 +2485 @@
                         //      Visualize mesh.
                         geoMeshView->setMesh(mGeoMesh);
+                        
+                        //      Set textures.
+                        geoMeshView->resetTextures();
+                        setTextures();
 
                         //      Hide right panel.
@@ -2544 +2531 @@
         //      Free memory.
         delete  fcho;
+}
+
+//      Set textures to mesh model.
+void GeoMeshViewUI::setTextures()
+{
+        GeoMaterialLoader       *loader;
+        string                                          filename;
+        string                                          material;
+        
+        loader  = new   GeoMaterialLoader();
+
+        //      For each submesh.
+        for (int submesh = 0; submesh < mGeoMesh->mSubMeshCount; submesh++)
+        {
+                material        = string(mGeoMesh->mSubMesh[submesh].mMaterialName);
+                                
+                if (loader->existsMaterial(material))
+                {
+                        //      Debug.
+                        cout    <<      "Material "
+                                                <<      material
+                                                <<      " found."
+                                                <<      endl;
+                        
+                        filename        =       loader->getTextureFileName(material);
+
+                        //      Debug.
+                        cout    <<      "File: "
+                                                <<      filename.c_str()
+                                                <<      endl;
+                        
+                        geoMeshView->LoadTextureSubMesh(submesh,        filename.c_str());
+                }
+        }
 }