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

Timestamp:

05/30/06 10:47:05 (18 years ago)

Author:

gumbau

Message:

 

File:

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

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

@@ -28 +28 @@
         mMainWindow->redraw();
 }
+
+inline void GeoMeshViewUI::cb_menuFileLoadTexture_i(fltk::Item*, void*)
+{
+        fltk::FileChooser       *fcho = new fltk::FileChooser("","*.jpg",fltk::FileChooser::CREATE,"Open image file");
+        fcho->exec();
+        if (fcho->value())
+                geoMeshView->LoadTexture(fcho->value());
+}
+
+void GeoMeshViewUI::cb_menuFileLoadTexture(fltk::Item *o, void *v)
+{
+        ((GeoMeshViewUI*)       (o->parent()->parent()->parent()->user_data()))
+                                                                                ->
+                                                                                cb_menuFileLoadTexture_i(o,v);
+}
+
 
 //---------------------------------------------------------------------------
@@ -539 +555 @@
         //      Repaint the main window.
         mMainWindow->redraw();
+        if (geoMeshView->isTextureMappingEnabled())
+                geoMeshView->disableTextureMapping();
+        else
+                geoMeshView->enableTextureMapping();
 }
 
@@ -2771 +2791 @@
 
                                 {
+                                        fltk::Item* o = menuFileLoadTexture = new fltk::Item("Load texture");
+                                        o->callback((fltk::Callback*)cb_menuFileLoadTexture);
+                                }
+
+                                {
                                         fltk::Item* o = menuFileQuit = new fltk::Item("Quit");
                                         o->callback((fltk::Callback*)cb_menuFileQuit);
@@ -2880 +2905 @@
                                 }
 
-                                //new fltk::Divider();
-
-                                //{
-                                //      fltk::Item* o = menuRenderTextures = new fltk::Item("Textures");
-                                //      o->callback((fltk::Callback*)cb_menuRenderTextures);
-                                //}
+                                new fltk::Divider();
+
+                                {
+                                        fltk::Item* o = menuRenderTextures = new fltk::Item("Texture mapping");
+                                        o->type(fltk::Item::RADIO);
+                                        o->set_value();
+                                        o->callback((fltk::Callback*)cb_menuRenderTextures);
+                                }
 
                                 o->end();