Changeset 9021 in orxonox.OLD for trunk

Timestamp:

Jul 2, 2006, 10:25:41 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: GUI: mapped water can no be edited with the mouse

Location:

trunk/src

Files:

• lib/gui/gl/glgui_handler.cc (modified) (3 diffs)
• world_entities/environments/mapped_water.cc (modified) (3 diffs)
• world_entities/environments/mapped_water.h (modified) (1 diff)

trunk/src/lib/gui/gl/glgui_handler.cc

@@ -18 +18 @@
 #include "glgui_handler.h"
 #include "event_handler.h"
+#include "key_names.h"
 
 #include "glgui_mainwidget.h"
@@ -203 +204 @@
     switch (event.type)
     {
+      case EV_MOUSE_MOTION:
+        this->checkFocus();
+        break;
+
       case  EV_MOUSE_BUTTON_LEFT:
         if (GLGuiWidget::mouseFocused() != NULL && event.bPressed)
@@ -247 +252 @@
     }
 
+
+    // Send the Event to the Widget below.
     if (GLGuiWidget::selected() != NULL)
     {
+      printf("event is %s\n", EVToKeyName(event.type).c_str());
       GLGuiWidget::selected()->processEvent(event);
     }

trunk/src/world_entities/environments/mapped_water.cc

@@ -27 +27 @@
 CREATE_FACTORY(MappedWater, CL_MAPPED_WATER);
 
-SHELL_COMMAND(gui, MappedWater, openGui);
+SHELL_COMMAND(gui, MappedWater, toggleGui);
 SHELL_COMMAND(output, MappedWater, saveParams);
 
@@ -343 +343 @@
  * @brief starts the slider gui that lets you edit all water parameters
  */
-void MappedWater::openGui()
+void MappedWater::toggleGui()
 {
   if (this->box == NULL)
@@ -518 +518 @@
     OrxGui::GLGuiHandler::getInstance()->activateCursor();
   }
-}
-
-/**
- * @brief closes the water gui
- */
-void MappedWater::closeGui()
-{
-  delete this->box;
-  this->box = NULL;
+  else
+  {
+    OrxGui::GLGuiHandler::getInstance()->deactivate();
+    OrxGui::GLGuiHandler::getInstance()->deactivateCursor();
+    delete this->box;
+    this->box = NULL;
+  }
 }
 

trunk/src/world_entities/environments/mapped_water.h

@@ -52 +52 @@
 
   // slider gui to edit water params during gameplay
-  void openGui();
-  void closeGui();
+  void toggleGui();
 
   // functions to set parameters for the water, usually they're called through loadparam