Changeset 1026

Timestamp:

06/20/06 13:30:48 (18 years ago)

Author:

gumbau

Message:

Sinconnización

Location:

GTP/trunk/Lib/Geom/shared

Files:

• GTGeometry/GTGeometry.ncb (deleted)
• GTGeometry/GTGeometry.vcproj (modified) (1 diff)
• GTGeometry/src/libs/leaves/Leaf.cpp (moved) (moved from GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/leaves/Hoja.cpp)
• GeoTool/GeoTool.ncb (deleted)
• GeoTool/GeoTool.suo (deleted)
• GeoTool/src/GeoMeshViewUI.cpp (modified) (4 diffs)

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

@@ -263 +263 @@
                                 </File>
                                 <File
-                                        RelativePath=".\src\libs\leaves\Hoja.cpp">
-                                        <FileConfiguration
-                                                Name="Debug|Win32">
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Release|Win32">
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                        ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-                                        </FileConfiguration>
+                                        RelativePath=".\src\libs\leaves\Leaf.cpp">
                                 </File>
                                 <File

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

@@ -1002 +1002 @@
 }
 
+VertexBuffer *origSubMeshVB=NULL;
+int orig_numindices=0;
+Index *orig_indices=NULL;
+
 //---------------------------------------------------------------------------
 //      Button Process Callback
@@ -1014 +1018 @@
         mProcessBar->position(0);
 
+        origSubMeshVB=NULL;
+    
         //      Initialize error flag.
         error   =       false;
@@ -1079 +1085 @@
                                 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();
@@ -1323 +1335 @@
                                                 file_name[strlen(file_name) - 4]        =       '\0';
                                                 
-                                                mesh_saver->save(       mGeoMesh,
-                                                                                                                        strcat(file_name,".mesh"));
+                                                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"));
                                                 
                                                 delete  mesh_saver;