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

Timestamp:

04/27/06 12:01:26 (19 years ago)

Author:

gumbau

Message:

 

Location:

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

Files:

• GeoMeshView.cpp (modified) (1 diff)
• GeoMeshViewUI.cpp (modified) (16 diffs)

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

@@ -586 +586 @@
                         drawLodStrip();
                 }
-                else if (mLodTree)
-                {
-                        drawLodTree();
-                }
+                //else if (mLodTree)
+                //{
+                //      drawLodTree();
+                //}
                 else
                 {

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

@@ -881 +881 @@
                                 else
                                 {
-
                                         //      Simplify the mesh object.
                                         simplifyEdgeCollapse();
@@ -893 +892 @@
                                 simplifyLeavesCollapse();
 
+                                //      Create the leaves simplification sequence.
+                                createLeavesSequence();
+                                
                                 break;
 
@@ -905 +907 @@
                                 else
                                 {
-
                                         //      Transform NoSV Mesh to a SV Mesh.
                                         mesh_aux        =       mGeoMesh->toSharedVertex();
@@ -992 +993 @@
 
                                 // Builder
-
                                 //      Open file chooser dialog.
                                 file_name       =       fltk::file_chooser(     "Build LOD",
@@ -1022 +1022 @@
                                                 oLodStrip               =       new LodStripsConstructor(       mGeoMesh,
                                                                 oMeshSimpSequence,
+                                                                idMeshLeaves,
                                                                 progress_function);
 
@@ -1027 +1028 @@
                                                                 Serializer::Mode::WRITE);
 
-                                                oLodStrip->LodStripsConstructor::Save(*oSerializer);
+                                                oLodStrip->Save(*oSerializer);
 
                                                 //      Close file.
@@ -1695 +1696 @@
         simplificacionState     =       QSLIM;
 
-        ms = new ImageBasedSimplifier(mGeoMesh, progress_function);
-
-        ms->setMeshLeaves(idMeshLeaves);
+        mMeshSimplifier = new ImageBasedSimplifier(mGeoMesh,    progress_function);
+
+        mMeshSimplifier->setMeshLeaves(idMeshLeaves);
 
         if (mPercent->value() == true)
@@ -1708 +1709 @@
 
                         // Simplifica el geomesh -> Parámetro es un factor LOD [0,1].
-                        ms->Simplify(percent);
+                        mMeshSimplifier->Simplify(percent);
 
                         //      Deletes the previous mesh.
@@ -1720 +1721 @@
                         delete  mGeoMesh;
 
-                        mGeoMesh        =       ms->GetMesh();
+                        mGeoMesh        =       mMeshSimplifier->GetMesh();
 
                         //      Visualize mesh.
@@ -1737 +1738 @@
 
                 // Simplifica el geomesh -> Parámetro es un factor LOD [0,1].
-                ms->Simplify(v);
+                mMeshSimplifier->Simplify(v);
 
                 //      Deletes the previous mesh.
@@ -1749 +1750 @@
                 delete  mGeoMesh;
 
-                mGeoMesh        =       ms->GetMesh();
+                mGeoMesh        =       mMeshSimplifier->GetMesh();
 
                 //      Visualize the mesh.
@@ -1773 +1774 @@
                 simplificacionState     =       HOJAS;
                 
-                mts     =       new TreeSimplifier(mGeoMesh, progress_function);
+                mTreeSimplifier =       new TreeSimplifier(mGeoMesh, progress_function);
                 vi      =       (uint32)mMeshReduction->fvalue();
 
@@ -1780 +1781 @@
                 {
                         // Simplify
-                        mts->Simplify(vi, idMeshLeaves);
+                        mTreeSimplifier->Simplify(vi, idMeshLeaves);
 
                         //      Deletes the previous mesh.
@@ -1792 +1793 @@
                         delete  mGeoMesh;
 
-                        mGeoMesh        =       mts->GetMesh();
+                        mGeoMesh        =       mTreeSimplifier->GetMesh();
                         
                         geoMeshView->setMesh(mGeoMesh);
@@ -1810 +1811 @@
         MeshSimplificationSequence      *secsimpl;
         
-        secsimpl        =       ms->GetSimplificationSequence();
+        secsimpl        =       mMeshSimplifier->GetSimplificationSequence();
         
         secsimpl->putMeshName(nombremesh); // Nombre del mesh para guardar la secuencia de simplificación
@@ -1816 +1817 @@
 
         delete  secsimpl;
+}
+
+//---------------------------------------------------------------------------
+//      Create a simplification sequence of the leaves.
+//---------------------------------------------------------------------------
+void    GeoMeshViewUI::createLeavesSequence()
+{
+        TreeSimplificationSequence      *tree_sequencer;
+        
+        tree_sequencer  =       mTreeSimplifier->GetSimplificationSequence();
+        
+        tree_sequencer->putMeshName(nombremesh); 
+        tree_sequencer->Save(Serializer("leavesSequence.txt",Serializer::WRITE));
+
+        delete  tree_sequencer;
 }