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

Timestamp:

05/04/06 13:18:08 (19 years ago)

Author:

gumbau

Message:

Working LODTree constructor and visualizer

Location:

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

Files:

• GeoMeshView.cpp (modified) (6 diffs)
• GeoMeshViewUI.cpp (modified) (29 diffs)

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

@@ -1 +1 @@
 #include "GeoMeshView.h"
+#include <VertexData.h>
 
 using   namespace       Geometry;
@@ -413 +414 @@
                 mPan                                                    =       false;
                 mLodStrip                                       =       false;
+                mLodTree                                        =       false;
                 mIdVisualList                   =       0;
                 mSubMeshCount                   =       0;
@@ -913 +915 @@
         current_strip   =       0;
 
+
+        // DRAW THE TRUNK AS A LODSTRIP OBJECT
+
         //      For each submesh.
         for (int submesh = 0; submesh < geoMesh->mSubMeshCount; submesh++)
@@ -976 +981 @@
                 }
         }
+
+        // DRAW THE LEAVES AS A TRIANGLE SOUP
+        glColor3f(0,1,1);
+        glDisable(GL_LIGHTING);
+        glBegin(GL_TRIANGLES);
+        const Geometry::VertexData *foliage_verts = lodTreeLib->Get_Foliage_VertexData();
+        const Geometry::IndexData *foliage_inds = lodTreeLib->CurrentLOD_Foliage_Indices();
+        for (int j=0; j<lodTreeLib->CurrentLOD_Foliage_IndexCount(); j++)
+        {
+                float vx,vy,vz;
+                foliage_verts->GetVertexCoord(foliage_inds->GetIndex(j),vx,vy,vz);
+                glVertex3f(vx,vy,vz);
+        }
+        glEnd();
+
+        glEnable(GL_LIGHTING);
+        glColor3f(1,1,1);
         
 }//End drawTriangleStrip.
@@ -1002 +1024 @@
 //      Change de Level of detail of the object.
 //---------------------------------------------------------------------------
-void    GeoMeshView::GoToLod(unsigned int       lod)
+void    GeoMeshView::GoToLod_LodStrip(unsigned int      lod)
 {
         if (mLodStrip)
@@ -1010 +1032 @@
         draw();
 }
+
+//---------------------------------------------------------------------------
+//      Change de Level of detail of the object.
+//---------------------------------------------------------------------------
+void    GeoMeshView::GoToLod_LodTree(unsigned int       lod)
+{
+        if (mLodTree)
+                lodTreeLib->GoToFoliageLod(lod);
+        draw();
+}
+
 
 //---------------------------------------------------------------------------

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

@@ -3 +3 @@
 #include "GeoMeshViewUI.h"
 #include "resource.h"
+#include "GeoLodTreeConstructor.h"
 
 using   namespace       Geometry;
@@ -65 +66 @@
 
                 //      Save the file mesh.
-                mesh_saver->save(       mGeoMesh,
-                                mFileName);
+                mesh_saver->save(mGeoMesh, mFileName);
 
                 //      Free memory.
@@ -100 +100 @@
                 {
                         mesh_saver      =       new     GeoMeshSaver(mMeshBounds);
-
-                        mesh_saver->save(       mGeoMesh,
-                                        filename_name(fcho->value()));
-
+                        mesh_saver->save(mGeoMesh,filename_name(fcho->value()));
                         delete  mesh_saver;
                 }
@@ -151 +148 @@
   
         //      Open file chooser dialog.
-        p       =       fltk::file_chooser(     "Export to OBJ",
-                                                                                                        "*.obj",
-                                                                                                        "");
+        p       =       fltk::file_chooser("Export to OBJ","*.obj","");
         if (p && mGeoMesh)
         {
@@ -667 +662 @@
 
 //---------------------------------------------------------------------------
+//      Auto Generate LodStrips Callback
+//---------------------------------------------------------------------------
+inline void GeoMeshViewUI::cb_menuLodTreesGenerate_i(fltk::Item*, void*)
+{
+        //      Show title.
+        mProcessTitle->label("Generate LodTree");
+        mProcessBar->position(0);
+        mBuildBar->position(0);
+
+        //      Hide the right panel.
+        hideRightPanel();
+
+        //      Show the LodStrips panel.
+        showAutoGenerateLodTrees();
+        
+        //      Sets menus application state to LODSTRIPS_AUTO.
+        mApplicationState       =       LODTREES_AUTO;
+
+        //      Repaint the window.
+        mMainWindow->redraw();
+}
+
+void GeoMeshViewUI::cb_menuLodTreesGenerate(fltk::Item* o, void* v)
+{
+  ((GeoMeshViewUI*)     (o->parent()->parent()->parent()->user_data()))
+                                                                                ->
+                                                                                cb_menuLodTreesGenerate_i(o,v);
+}
+
+
+//---------------------------------------------------------------------------
 //      Visualize LodStrips Callback
 //---------------------------------------------------------------------------
@@ -715 +741 @@
 
         //      Show the Visulize LodStrips panel.
-        showSlider();
+        showLodStripSlider();
         
         //      Repaint the window.
@@ -739 +765 @@
         //      Show title.
         mProcessTitle->label("Visualize LodTrees");
+
+        /*if (geoMeshView->getLeavesSubmesh()==-1)
+        {
+                fltk::alert("No se ha seleccionado el submesh de hojas!");
+                return;
+        }*/
+
+        // POR AHORA SE SELECCIONA EL PRIMER SUBMESH QUE NO ES STRIPS COMO HOJAS
+        int leafsSubMeshID = -1;
+        for (int i=0; i<mGeoMesh->mSubMeshCount; i++)
+                if (mGeoMesh->mSubMesh[i].mType==GEO_TRIANGLE_LIST)
+                {
+                        leafsSubMeshID=i;
+                        break;
+                }
+
+
 
         //      If an object is loaded.
@@ -754 +797 @@
                 {
                         //      Build lod strips library.
-                        setLodTreesLibrary(string(fcho->value()), mGeoMesh);
-
-                        //      Sets the aplication mode.
-                        mApplicationState       =       VISUALIZE_LODTREES;
+
+                        std::string lodstripFile(fcho->value());
+                        delete fcho;
+                        fcho    =       new fltk::FileChooser("",
+                                        "*.leafseq",
+                                        fltk::FileChooser::CREATE,
+                                        "Open LeafSeq file");
+
+                        fcho->exec();
+
+                        if (fcho->value())
+                        {
+                                std::string leafseqFile(fcho->value());
+
+                                setLodTreesLibrary(lodstripFile, leafseqFile, mGeoMesh, leafsSubMeshID);
+
+                                //      Sets the aplication mode.
+                                mApplicationState       =       VISUALIZE_LODTREES;
+                        }
                 }
 
@@ -768 +826 @@
 
         //      Show the Visulize LodTree panel.
-        showSlider();
+        showLodStripSlider();
+        showLodTreeSlider();
         
         //      Repaint the window.
@@ -904 +963 @@
 
                                 //      Create the leaves simplification sequence.
-                                createLeavesSequence();
+                                createLeavesSequence("leavesSimplification.txt");
                                 
                                 break;
 
                                 //      Simplify and generate simplification sequence.
+                        case    LODTREES_AUTO:
+                                if (idMeshLeaves==(unsigned short)-1)
+                                {
+                                        fltk::alert("Leaves submesh not selected!");
+                                }
+                                else
+                                {
+                                        std::cout << "Simplificando hojas...";
+                                        simplifyLeavesCollapse();
+                                        std::cout << "OK!" << std::endl;
+
+//                                      std::cout << "Creando secuencia de simplificacion de hojas...";
+//                                      createLeavesSequence("leavesSimplification.txt");
+//                                      std::cout << "OK!" << std::endl;
+
+                                        undo();
+
+
+                                        std::cout << "Simplificando tronco...";
+                                        std::cout << "OK!" << std::endl;
+
+                                        //      Transform NoSV Mesh to a SV Mesh.
+                                        mesh_aux        =       mGeoMesh->toSharedVertex();
+
+                                        //      Deletes the mesh No Shared Vertex.
+                                        delete  mGeoMesh;
+
+                                        //      Gets the mesh Shared Vertex.
+                                        mGeoMesh        =       mesh_aux;
+
+                                        geoMeshView->setMesh(mGeoMesh);
+
+                                        //      Simplify the mesh object.
+                                        simplifyEdgeCollapse();
+
+                                        //      Create the qslim simplification sequence.
+                                        createQslimSequence();
+
+                                }
+                                
+                                break; 
+
                         case    LODSTRIPS_AUTO:
 
@@ -994 +1095 @@
 inline void GeoMeshViewUI::cb_mButtonBuild_i(fltk::Button*, void*)
 {
-        char                                    *file_name;
+        char                    *file_name=NULL;
         GeoMeshSaver    *mesh_saver;
         Serializer              *oSerializer;
@@ -1011 +1112 @@
                 {
                         //      Build the LOD file.
+                        case    LODTREES_AUTO:                  
+                                
+                                //      Open file chooser dialog.
+                                file_name       =       fltk::file_chooser("Build LOD","*","");
+                                if (!file_name)
+                                        break;
+
+                                std::cout << "Creando secuencia de simplificacion de hojas...";
+                                createLeavesSequence(file_name+std::string(".leafseq"));
+                                std::cout << "OK!" << std::endl;
+
+/*                              TreeSimplificationSequence * auxTreeSimpSequence = new TreeSimplificationSequence();
+                                auxTreeSimpSequence->Load(Serializer("leavesSimplification.txt",Serializer::READ));
+
+                                if (auxTreeSimpSequence && mGeoMesh)
+                                {
+                                        LodTreeConstructor * auxLodTreeConstructor = new LodTreeConstructor(mGeoMesh,auxTreeSimpSequence);
+                                        delete auxLodTreeConstructor;
+                                }
+                                else
+                                {
+                                        fltk::alert("There is no leaf simplification sequence.");
+                                        break;
+                                }
+
+
+                                delete auxTreeSimpSequence;*/
+                                
+
                         case    LODSTRIPS_AUTO:
 
-                                // Builder
-                                //      Open file chooser dialog.
-                                file_name       =       fltk::file_chooser(     "Build LOD",
-                                                "*",
-                                                "");
-
+                                // Builder                                      
+                                if (!file_name)
+                                        file_name       =       fltk::file_chooser("Build LOD","*","");
                                 //      If a file was selected.
                                 if (file_name)
@@ -1035 +1162 @@
 
                                         //      Loads a simplification sequence file.
-                                        oMeshSimpSequence->Load(Serializer(     "mqslimSequence.txt",
-                                                                Serializer::READ));
+                                        oMeshSimpSequence->Load(Serializer("mqslimSequence.txt",Serializer::READ));
 
                                         //      If the simplification sequence and the mesh exist.
@@ -1046 +1172 @@
                                                                 progress_function);
 
-                                                oSerializer     =       new Serializer( strcat(file_name,".lod"),
-                                                                Serializer::Mode::WRITE);
+                                                oSerializer     =       new Serializer(strcat(file_name,".lod"),Serializer::Mode::WRITE);
 
                                                 oLodStrip->Save(*oSerializer);
@@ -1070 +1195 @@
                                                 mesh_saver      =       new     GeoMeshSaver(mMeshBounds);
                                                 file_name[strlen(file_name) - 4]        =       '\0';
-                                                mesh_saver->save(       mGeoMesh,
-                                                                strcat(file_name,".mesh"));
+                                                mesh_saver->save(mGeoMesh, strcat(file_name,".mesh"));
                                                 delete  mesh_saver;
 
@@ -1101 +1225 @@
 //      Lod Slider Callback
 //---------------------------------------------------------------------------
-inline void GeoMeshViewUI::cb_mLodSlider_i(fltk::Slider *o, void        *)
+inline void GeoMeshViewUI::cb_mLodStripSlider_i(fltk::Slider    *o, void        *)
 {
         //      Change the lod.
-        geoMeshView->GoToLod((unsigned int)o->value());
+        geoMeshView->GoToLod_LodStrip((unsigned int)o->value());
 
         //      Refresh data aplication.
@@ -1112 +1236 @@
 }
 
-void GeoMeshViewUI::cb_mLodSlider(fltk::Slider  *o, void        *v)
-{
-  ((GeoMeshViewUI*)     (o->parent()->parent()->parent()->user_data()))
-                                                                                ->
-                                                                                cb_mLodSlider_i(o,v);
-}
+void GeoMeshViewUI::cb_mLodStripSlider(fltk::Slider     *o, void        *v)
+{
+  ((GeoMeshViewUI*)     (o->parent()->parent()->parent()->user_data()))
+                                                                                ->
+                                                                                cb_mLodStripSlider_i(o,v);
+}
+
+
+//---------------------------------------------------------------------------
+//      Lod Slider Callback for the foliage
+//---------------------------------------------------------------------------
+inline void GeoMeshViewUI::cb_mLodTreeSlider_i(fltk::Slider     *o, void        *)
+{
+        //      Change the lod.
+        geoMeshView->GoToLod_LodTree((unsigned int)o->value());
+
+        //      Refresh data aplication.
+        refreshApplicationBar();
+                
+        mMainWindow->flush();
+}
+
+void GeoMeshViewUI::cb_mLodTreeSlider(fltk::Slider      *o, void        *v)
+{
+  ((GeoMeshViewUI*)     (o->parent()->parent()->parent()->user_data()))
+                                                                                ->
+                                                                                cb_mLodTreeSlider_i(o,v);
+}
+
+
 
 //---------------------------------------------------------------------------
@@ -1418 +1566 @@
         mBuildBar->activate();
 }
+//---------------------------------------------------------------------------
+//      Shows the auto generate LodStrips panel
+//---------------------------------------------------------------------------
+void    GeoMeshViewUI::showAutoGenerateLodTrees()
+{
+        //      Shows the simplify panel.
+        showEdgeCollapse();
+
+        mButtonBuild->set_visible();
+        mButtonBuild->activate();
+
+        mBuildBar->set_visible();
+        mBuildBar->activate();
+}
 
 //---------------------------------------------------------------------------
 //      Show the LodStrips visulization panel
 //---------------------------------------------------------------------------
-void    GeoMeshViewUI::showSlider()
-{
-        mLodSlider->set_visible();
-        mLodSlider->activate();
+void    GeoMeshViewUI::showLodStripSlider()
+{
+        mLodStripSlider->set_visible();
+        mLodStripSlider->activate();
 }
 
@@ -1431 +1593 @@
 //      Hide the LodStrips visualization panel
 //---------------------------------------------------------------------------
-void    GeoMeshViewUI::hideSlider()
-{
-        mLodSlider->hide();
-        mLodSlider->deactivate();
+void    GeoMeshViewUI::hideLodStripSlider()
+{
+        mLodStripSlider->hide();
+        mLodStripSlider->deactivate();
+}
+
+//---------------------------------------------------------------------------
+//      Show the LodTree visulization panel
+//---------------------------------------------------------------------------
+void    GeoMeshViewUI::showLodTreeSlider()
+{
+        mLodTreeSlider->set_visible();
+        mLodTreeSlider->activate();
+}
+
+//---------------------------------------------------------------------------
+//      Hide the LodTree visualization panel
+//---------------------------------------------------------------------------
+void    GeoMeshViewUI::hideLodTreeSlider()
+{
+        mLodTreeSlider->hide();
+        mLodTreeSlider->deactivate();
 }
 
@@ -1580 +1760 @@
         hideOpenMeshSimplification();
         hideOpenLeavesSimplification();
-        hideSlider();
+        hideLodStripSlider();
+        hideLodTreeSlider();
         hideMeshInfo();
 }
@@ -1858 +2039 @@
 //      Create a simplification sequence of the leaves.
 //---------------------------------------------------------------------------
-void    GeoMeshViewUI::createLeavesSequence()
+void    GeoMeshViewUI::createLeavesSequence(const std::string &filename)
 {
         TreeSimplificationSequence      *tree_sequencer;
@@ -1865 +2046 @@
         
         tree_sequencer->putMeshName(nombremesh); 
-        tree_sequencer->Save(Serializer("leavesSequence.txt",Serializer::WRITE));
+        tree_sequencer->Save(Serializer(filename,Serializer::WRITE));
 
         delete  tree_sequencer;
@@ -2032 +2213 @@
 
         //      Sets the slider range.
-        mLodSlider->range(lodStripsLib->MaxLod(),
+        mLodStripSlider->range(lodStripsLib->MaxLod(),
                                                                                 lodStripsLib->MinLod());
 
@@ -2039 +2220 @@
         
         //      Puts the slider in the max position.
-        mLodSlider->value(lodStripsLib->MinLod());
+        mLodStripSlider->value(lodStripsLib->MinLod());
 }
 
@@ -2045 +2226 @@
 //      Initialize the lodTreelibrary for visualization.
 //---------------------------------------------------------------------------
-void    GeoMeshViewUI::setLodTreesLibrary(std::string lodfile, Mesh     *geomesh)
+//void  GeoMeshViewUI::setLodTreesLibrary(std::string lodfile, Mesh     *geomesh)
+void    GeoMeshViewUI::setLodTreesLibrary(std::string lodfile, std::string leafseqfile, Mesh *geomesh, uint32 ileafSubMesh)
+
 {
         //      If there is no lod strips object.
@@ -2054 +2237 @@
 
         //      New lod strips object.
-        lodTreeLib      =       new     Geometry::LodTreeLibrary(lodfile, geomesh,"\\\\quake\\home\\\Modelos\\betula_populifolia\\vertices.obj",
+/*      lodTreeLib      =       new     Geometry::LodTreeLibrary(lodfile, geomesh,"\\\\quake\\home\\\Modelos\\betula_populifolia\\vertices.obj",
                                                                                 "\\\\quake\\home\\\Modelos\\betula_populifolia\\hojas.obj",
-                                                                                "\\\\quake\\home\\\Modelos\\betula_populifolia\\simplifica.obj");
+                                                                                "\\\\quake\\home\\\Modelos\\betula_populifolia\\simplifica.obj");*/
+
+        lodTreeLib = new Geometry::LodTreeLibrary(lodfile,leafseqfile,geomesh,ileafSubMesh);
 
         //      Sets the slider range.
-        mLodSlider->range(lodTreeLib->MaxTrunkLod(), lodTreeLib->MinTrunkLod());
+        mLodStripSlider->range(lodTreeLib->MaxTrunkLod(), lodTreeLib->MinTrunkLod());
+        mLodTreeSlider->range(lodTreeLib->MaxFoliageLod(), lodTreeLib->MinFoliageLod());
 
         //      Pass to geomeshview the lod strips object.
@@ -2065 +2251 @@
         
         //      Puts the slider in the max position.
-        mLodSlider->value(lodTreeLib->MinTrunkLod());
+        mLodStripSlider->value(lodTreeLib->MinTrunkLod());
+        mLodTreeSlider->value(lodTreeLib->MinFoliageLod());
 }
 
@@ -2289 +2476 @@
                                 {
                                         fltk::Slider* o;
-                                        o = mLodSlider = new fltk::Slider(16, 50, 30, 450);
+                                        o = mLodStripSlider = new fltk::Slider(16, 50, 30, 450);
                                         o->type(fltk::Slider::TICK_BELOW);
                                         o->set_vertical();
-                                        o->callback((fltk::Callback*)cb_mLodSlider);
+                                        o->callback((fltk::Callback*)cb_mLodStripSlider);
+                                        o->hide();
+                                        o->deactivate();
+                                }
+                                {
+                                        fltk::Slider* o;
+                                        o = mLodTreeSlider = new fltk::Slider(46, 50, 30, 450);
+                                        o->type(fltk::Slider::TICK_BELOW);
+                                        o->set_vertical();
+                                        o->callback((fltk::Callback*)cb_mLodTreeSlider);
                                         o->hide();
                                         o->deactivate();
@@ -2609 +2805 @@
                                 {
                                         fltk::Item* o;
-                                        o = menuLodTreesVisualize = new fltk::Item("Visualize Trunk");
+                                        o = menuLodTreesGenerate = new fltk::Item("Generate");
+                                        o->callback((fltk::Callback*)cb_menuLodTreesGenerate);
+                                }
+                                {
+                                        fltk::Item* o;
+                                        o = menuLodTreesVisualize = new fltk::Item("Visualize");
                                         o->callback((fltk::Callback*)cb_menuLodTreesVisualize);
                                 }