Changeset 980 for GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshViewUI.cpp

Timestamp:

05/24/06 10:47:49 (18 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshViewUI.cpp (modified) (27 diffs)

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

@@ -63 +63 @@
         {
                 //      Create a mesh saver with mesh bounds.
-                mesh_saver      =       new     GeoMeshSaver(mMeshBounds);
+                mesh_saver      =       new     GeoMeshSaver();
 
                 //      Save the file mesh.
@@ -99 +99 @@
                 if (fcho->value())
                 {
-                        mesh_saver      =       new     GeoMeshSaver(mMeshBounds);
+                        mesh_saver      =       new     GeoMeshSaver();
                         mesh_saver->save(mGeoMesh,filename_name(fcho->value()));
                         delete  mesh_saver;
@@ -953 +953 @@
                                         //      Simplify the mesh object.
                                         simplifyEdgeCollapse();
+                                        
+                                        delete  mMeshSimplifier;
+                                        geoMeshView->restoreContext();
                                 }
                                 break;
@@ -1043 +1046 @@
                                         //      Create the qslim simplification sequence.
                                         createQslimSequence();
+                                        
+                                        delete  mMeshSimplifier;
+                                        geoMeshView->restoreContext();
                                 }
 
@@ -1053 +1059 @@
 
                                 //      Set the leaves submesh.
-                                geoMeshView->setLeavesSubmesh(idMeshLeaves);
+                                geoMeshView->setLeavesSubMesh(idMeshLeaves);
 
                                 //      Refresh mesh info.
@@ -1193 +1199 @@
                                                 geoMeshView->setMesh(mGeoMesh);
 
-                                                mesh_saver      =       new     GeoMeshSaver(mMeshBounds);
+                                                mesh_saver      =       new     GeoMeshSaver();
                                                 file_name[strlen(file_name) - 4]        =       '\0';
                                                 mesh_saver->save(mGeoMesh, strcat(file_name,".mesh"));
@@ -1354 +1360 @@
         mGeometryBased->set();
 
-        mImageBased->set_visible();
-        mImageBased->activate();
+        mViewPointDriven->set_visible();
+        mViewPointDriven->activate();
 
         /*
@@ -1401 +1407 @@
         mGeometryBased->deactivate();
 
-        mImageBased->hide();
-        mImageBased->deactivate();
+        mViewPointDriven->hide();
+        mViewPointDriven->deactivate();
 
         /*
@@ -1443 +1449 @@
         mGeometryBased->set();
 
-        mImageBased->set_visible();
-        mImageBased->activate();
+        mViewPointDriven->set_visible();
+        mViewPointDriven->activate();
 
         /*
@@ -1486 +1492 @@
         mGeometryBased->deactivate();
 
-        mImageBased->hide();
-        mImageBased->deactivate();
+        mViewPointDriven->hide();
+        mViewPointDriven->deactivate();
 
         /*
@@ -1662 +1668 @@
                         char *cadena=new char[12];
 
-                        if (geoMeshView->getLeavesSubmesh() >= 0)
+                        if (geoMeshView->getLeavesSubMesh() >= 0)
                         {
-                                if (geoMeshView->getLeavesSubmesh() == i)
+                                if (geoMeshView->getLeavesSubMesh() == i)
                                 {
                                         strcpy(type,"(Leaves)");
@@ -1693 +1699 @@
                         }
 
-                        char *cadena2=new char[30];
-                        sprintf(cadena2, "Number of indexes: %d",mGeoMesh->mSubMesh[i].mIndexCount);
-                        fltk::Item *numberIndex = new fltk::Item(cadena2);
+                        //      Adds material name.
+                        char *cadena2=new char[100];
+                        sprintf(cadena2, "Material: %s",mGeoMesh->mSubMesh[i].mMaterialName);
+                        
+                        fltk::Item      *geomaterial    =       new fltk::Item(cadena2);
+                        
+                        char *cadena3=new char[100];
+                        
+                        sprintf(cadena3, "Number of indexes: %d",mGeoMesh->mSubMesh[i].mIndexCount);
+                        fltk::Item *numberIndex = new fltk::Item(cadena3);
                         if (mGeoMesh->mSubMesh[i].mType==Geometry::GEO_TRIANGLE_LIST)
                         {
@@ -1884 +1897 @@
         }
         
-        geoMeshView->setColorSubmeshi(meshNumber);
+        geoMeshView->setSubMeshSelected(meshNumber);
         geoMeshView->redraw();
         
@@ -1897 +1910 @@
         Real    percent;
 
-        simplificacionState     =       QSLIM;
-
-        mMeshSimplifier = new GeometryBasedSimplifier(mGeoMesh, progress_function);
+        //-----------------
+        geoMeshView->saveContext();
+
+        //      Gets simplify option.
+        if (mGeometryBased->value())
+        {
+                simplificationState     =       QSLIM;
+                mMeshSimplifier                 = new GeometryBasedSimplifier(mGeoMesh,
+                                                                                                                                                                                                                        progress_function);
+        }
+        else
+        {
+                simplificationState     =       VIEWPOINTDRIVEN;
+                mMeshSimplifier                 = new ViewPointDrivenSimplifier(mGeoMesh,
+                                                                                                                                                                                                                                progress_function);
+        }
 
         mMeshSimplifier->setMeshLeaves(idMeshLeaves);
 
-        if (mPercent->value() == true)
+        if (mPercent->value())
         {
                 // Simplificación por porcentaje
@@ -1910 +1936 @@
                         percent = mMeshReduction->fvalue();
                         percent =       percent / 100.0;
+                        
 
                         // Simplifica el geomesh -> Parámetro es un factor LOD [0,1].
@@ -1928 +1955 @@
                         //      Visualize mesh.
                         geoMeshView->setMesh(mGeoMesh);
+
                 }
                 else
@@ -1970 +1998 @@
         //      Initialize      error flag.
         error   =       false;
-        
+
         //      Check submeshes for triangles strips.
         for (int i = 0; i < mGeoMesh->mSubMeshCount; i++)
@@ -1980 +2008 @@
                 }
         }
-                                
+
         //      if the mesh is stripified.
         if (error)
@@ -1988 +2016 @@
         //      if the mesh is in triangle list.
         else
-        {                       
-                simplificacionState     =       HOJAS;
+        {
+                simplificationState     =       HOJAS;
                 
                 mTreeSimplifier =       new TreeSimplifier(mGeoMesh, progress_function);
@@ -2308 +2336 @@
                 geoMeshView->setMesh(mGeoMesh);
 
-                //      Get the mesh bounds.
-                mMeshBounds     =       geoMeshView->getBoundingBox();
-
                 //      Hide right panel.
                 hideRightPanel();
@@ -2400 +2425 @@
                         {
                                 fltk::Group* o;
-                                o = MainView = new fltk::Group(0, 0, 600, 500);
+                                o = MainView = new fltk::Group(0, 0, 500, 530);
                                 o->begin();
 
                                 {
                                         fltk::InvisibleBox* o;
-                                        o = cframe = new fltk::InvisibleBox(0, 0, 600, 500);
+                                        o = cframe = new fltk::InvisibleBox(0, 0, 500, 530);
                                         o->box(fltk::FLAT_BOX);
                                         o->color((fltk::Color)0xffffff00);
@@ -2413 +2438 @@
                                 {
                                         GeoMeshView* o;
-                                        o = geoMeshView = new GeoMeshView(      0,0,600,500,0,this);
+                                        o = geoMeshView = new GeoMeshView(      0,0,500,530,0,this);
                                 }
 
@@ -2424 +2449 @@
                         {
                                 fltk::Group* o;
-                                o = MainView = new fltk::Group(600, 0, 200, 500);
+                                o = MainView = new fltk::Group(500, 0, 300, 530);
                                 o->begin();
 
@@ -2509 +2534 @@
                                         {
                                                 mGeometryBased = new fltk::RadioButton(0, 8, 25, 25, "Geometry based");
-                                                mImageBased = new fltk::RadioButton(0, 23, 25, 25, "Image based");
+                                                mViewPointDriven = new fltk::RadioButton(0, 23, 25, 25, "Viewpoint driven");
                                         }
                                         o->end();
@@ -2517 +2542 @@
 
                                 {
-                                        mProcessTitle           = new fltk::Widget(0, 0, 200, 25, "");
+                                        mProcessTitle           = new fltk::Widget(0, 0, 300, 25, "");
                                         fltk::Widget* o =       mProcessTitle;
                                         o->set_vertical();
@@ -2582 +2607 @@
 
                                 {
-                                        fltk::Browser* o = mMeshInfo = new fltk::Browser(0, 20, 200, 380);
+                                        fltk::Browser* o = mMeshInfo = new fltk::Browser(0, 20, 300, 380);
                                         o->set_vertical();
                                         o->callback((fltk::Callback*)cb_mMeshInfo);
@@ -2618 +2643 @@
                                 }
 
-                                //{
-                                //      fltk::Item* o = menuMeshExportOBJ = new fltk::Item("Export to OBJ");
-                                //      o->callback((fltk::Callback*)cb_menuMeshExportOBJ);
-                                //}
+                                {
+                                        fltk::Item* o = menuMeshExportOBJ = new fltk::Item("Export to OBJ");
+                                        o->callback((fltk::Callback*)cb_menuMeshExportOBJ);
+                                }
 
                                 //{