Changeset 1083 for GTP/trunk/Lib/Geom/shared/GeoTool

Timestamp:

07/05/06 20:18:06 (18 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared/GeoTool

Files:

• GeoTool.vcproj (modified) (2 diffs)
• include/GeoMeshLoader.h (deleted)
• include/GeoMeshSaver.h (deleted)
• include/GeoMeshViewUI.h (modified) (1 diff)
• src/GeoMeshLoader.cpp (deleted)
• src/GeoMeshSaver.cpp (deleted)
• src/GeoMeshView.cpp (modified) (6 diffs)
• src/GeoMeshViewUI.cpp (modified) (7 diffs)

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

@@ -141 +141 @@
                         </File>
                         <File
-                                RelativePath=".\src\GeoMeshLoader.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\src\GeoMeshSaver.cpp">
-                        </File>
-                        <File
                                 RelativePath=".\src\GeoMeshView.cpp">
                         </File>
@@ -165 +159 @@
                         <File
                                 RelativePath=".\include\GeoMaterialLoader.h">
-                        </File>
-                        <File
-                                RelativePath=".\include\GeoMeshLoader.h">
-                        </File>
-                        <File
-                                RelativePath=".\include\GeoMeshSaver.h">
                         </File>
                         <File

GTP/trunk/Lib/Geom/shared/GeoTool/include/GeoMeshViewUI.h

@@ -372 +372 @@
 
         //      Initialize the lodstripslibrary for visualization.
-        void    setLodStripsLibrary(const Geometry::LodStripsLibraryData &, Mesh        *geomesh);
+        void    setLodStripsLibrary(const Geometry::LodStripsLibraryData *, Mesh        *geomesh);
         //      Initialize the lodtreelibrary for visualization.
-        void    setLodTreesLibrary(const Geometry::LodStripsLibraryData &, const Geometry::TreeSimplificationSequence &, Mesh   *geomesh, uint32 ileafSubMesh);
+        void    setLodTreesLibrary(const Geometry::LodStripsLibraryData *, const Geometry::TreeSimplificationSequence *, Mesh   *geomesh, uint32 ileafSubMesh);
 
         // Indentify the mesh of leaves.

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

@@ -892 +892 @@
         current_strip = 0;
 
-        int begin_index = 0;
-
         //      For each submesh.
         for (int submesh = 0; submesh < geoMesh->mSubMeshCount; submesh++)
@@ -968 +966 @@
                 }*/
 
-                int indices_to_render = lodStripsLib->indices_x_submesh[submesh];
-
+                int indices_to_render = lodStripsLib->GetValidIndexCount(submesh);
+                int offset = lodStripsLib->GetValidOffset(submesh);
 
                 glBegin(GL_TRIANGLE_STRIP);
                 //for (int index = 0; index < lodStripsLib->dataRetrievalInterface->GetNumValidIndices(); index ++)
-                for (int index = begin_index; index < indices_to_render+begin_index; index ++)
+                for (int index = offset; index < indices_to_render+offset; index ++)
                 {
                         position = lodStripsLib->dataRetrievalInterface->GetIndex(index);
@@ -1007 +1005 @@
                 }
                 glEnd();
-                begin_index += indices_to_render;
 
         }
@@ -1032 +1029 @@
 
         // DRAW THE TRUNK AS A LODSTRIP OBJECT
-
-        int begin_index = 0;
-
         //      For each submesh.
         for (int submesh = 0; submesh < geoMesh->mSubMeshCount; submesh++)
@@ -1112 +1106 @@
                 }*/
         
-                int indices_to_render = lodTreeLib->trunk->indices_x_submesh[submesh];
+//              int indices_to_render = lodTreeLib->trunk->GetValidIndexCount(submesh);
+                int indices_to_render = lodTreeLib->GetValidTrunkIndexCount(submesh);
+                int begin_index = lodTreeLib->GetValidTrunkOffset(submesh);
                         
                 glBegin(GL_TRIANGLE_STRIP);
-                for (int index = begin_index; index < lodTreeLib->trunk->indices_x_submesh[submesh]; index ++)
+                for (int index = begin_index; index < indices_to_render+begin_index; index ++)
                 {
                         position = lodTreeLib->CurrentLOD_Trunk_Indices()->GetIndex(index);
@@ -1149 +1145 @@
                 }
                 glEnd();
-                begin_index += indices_to_render;
-
         }
 

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

@@ -795 +795 @@
 inline void GeoMeshViewUI::cb_menuLodStripsVisualize_i(fltk::Item*, void*)
 {
-        fltk::FileChooser *fcho;
-        const   char                            *lod_file;
-        
         //      Sets menus application state to NONE.
         mApplicationState       =       NONE;
@@ -811 +808 @@
         if (mGeoMesh != NULL)
         {
-/*              fcho    =       new fltk::FileChooser("",
-                                "*.lod",
-                                fltk::FileChooser::CREATE,
-                                "Open Lod file");
-
-                fcho->exec();
-
-                //      If a file was selected.
-                if (fcho->value())
-                {*/
+                if (geoMeshLoader->GetLodStripsData())
+                {
                         //      Build lod strips library.
-                        setLodStripsLibrary(geoMeshLoader->lodstripsdata, mGeoMesh);
+                        setLodStripsLibrary(geoMeshLoader->GetLodStripsData(), mGeoMesh);
 
                         //      Sets the aplication mode.
                         mApplicationState       =       VISUALIZE_LODSTRIPS;
-        /*      }
-
-                //      Free memory.
-                delete  fcho;*/
-
-                //      Hide the right panel.
-                hideRightPanel();
-
-                //      Show title.
-                mProcessTitle->label("Visualize LodStrips");
-
-                //      Show the Visulize LodStrips panel.
-                showLodStripSlider();
-
-                //      Repaint the window.
-                mMainWindow->redraw();
-
+                
+                        //      Hide the right panel.
+                        hideRightPanel();
+
+                        //      Show title.
+                        mProcessTitle->label("Visualize LodStrips");
+
+                        //      Show the Visulize LodStrips panel.
+                        showLodStripSlider();
+
+                        //      Repaint the window.
+                        mMainWindow->redraw();
+                }
+                else
+                {
+                        fltk::alert("The loaded mesh does not contain LOD information.\nNothing will be done.");
+                }
         }
 }
@@ -848 +837 @@
 inline void GeoMeshViewUI::cb_menuLodTreesVisualize_i(fltk::Item*, void*)
 {
-        fltk::FileChooser *fcho;
-        const   char                            *lod_file;
-
         //      Sets menus application state to NONE.
         mApplicationState       =       NONE;
@@ -861 +847 @@
         openMeshFile();
 
-        /*if (geoMeshView->getLeavesSubmesh()==-1)
-                {
-                fltk::alert("No se ha seleccionado el submesh de hojas!");
-                return;
-                }*/
-
         //      If an object is loaded.
         if (mGeoMesh != NULL)
         {
-                // 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 (geoMeshLoader->GetTreeSimpSeq() && geoMeshLoader->GetLodStripsData())
                 {
-                        if (mGeoMesh->mSubMesh[i].mType==GEO_TRIANGLE_LIST)
+                        // select the first triangle-list submesh as leaves submesh
+                        int leafsSubMeshID = -1;
+
+                        for (int i=0; i<mGeoMesh->mSubMeshCount; i++)
                         {
-                                leafsSubMeshID=i;
-                                break;
+                                if (mGeoMesh->mSubMesh[i].mType==GEO_TRIANGLE_LIST)
+                                {
+                                        leafsSubMeshID=i;
+                                        break;
+                                }
                         }
-                }
-
-                //      If an object is loaded.
-/*              if (mGeoMesh != NULL)
-                {
-                        fcho    =       new fltk::FileChooser("",
-                                        "*.mesh",
-                                        fltk::FileChooser::CREATE,
-                                        "Open Lod file");
-
-                        fcho->exec();
-
-                        //      If a file was selected.
-                        if (fcho->value())
-                        {
-                                //      Build lod strips library.
-
-                                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);
-                                        setLodTreesLibrary(geoMeshLoader->lodstripsdata, geoMeshLoader->treesimpseq, mGeoMesh, leafsSubMeshID);
-
-                                        //      Sets the aplication mode.
-                                        mApplicationState       =       VISUALIZE_LODTREES;
-/*                              }
-                        }
-
-                        //      Free memory.
-                        delete  fcho;
-*/
+
+                        setLodTreesLibrary(geoMeshLoader->GetLodStripsData(), geoMeshLoader->GetTreeSimpSeq(), mGeoMesh, leafsSubMeshID);
+
+                        //      Sets the aplication mode.
+                        mApplicationState       =       VISUALIZE_LODTREES;
+
                         //      Hide the right panel.
                         hideRightPanel();
@@ -933 +881 @@
                         //      Repaint the window.
                         mMainWindow->redraw();
-/*              }*/
+                }
+                else
+                        fltk::alert("The loaded mesh does not contain LOD information.\nNothing will be done.");
         }
 }
@@ -2367 +2317 @@
 //      Initialize the lodstripslibrary for visualization.
 //---------------------------------------------------------------------------
-void    GeoMeshViewUI::setLodStripsLibrary(const Geometry::LodStripsLibraryData &loddata, Mesh  *geomesh)
+void    GeoMeshViewUI::setLodStripsLibrary(const Geometry::LodStripsLibraryData *loddata, Mesh  *geomesh)
 {
         //      If there is no lod strips object.
@@ -2392 +2342 @@
 //      Initialize the lodTreelibrary for visualization.
 //---------------------------------------------------------------------------
-void    GeoMeshViewUI::setLodTreesLibrary(const LodStripsLibraryData &lodstripsdata, const TreeSimplificationSequence &treesimpseq, Mesh *geomesh, uint32 ileafSubMesh)
+void    GeoMeshViewUI::setLodTreesLibrary(const LodStripsLibraryData *lodstripsdata, const TreeSimplificationSequence *treesimpseq, Mesh *geomesh, uint32 ileafSubMesh)
 {
         //      If there is no lod strips object.
         if (lodTreeLib)
-        {
                 delete  lodTreeLib;
-        }
 
         //      New lod strips object.