Changeset 6003 for code/branches/ingamemenu/src/orxonox

Timestamp:

Oct 28, 2009, 5:58:11 PM (15 years ago)

Author:

dafrick

Message:

Implemented support for multiple simultaniously showing GUIs. What happens now, in essence, is, that every root-window of a gui, that is to be showed, is attached to a global root window, which is always displayed and therefore needs to be fully transparent (alpha = 0.0). To not inherit the transparency (and thus be fully transparent as well) each root-window of a gui must (or should) set the property 'InheritsAlpha' to false.

Location:

code/branches/ingamemenu/src/orxonox

Files:

• gamestates/GSGraphics.cc (modified) (2 diffs)
• gamestates/GSGraphics.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• gamestates/GSMainMenu.cc (modified) (2 diffs)
• pickup/PickupInventory.cc (modified) (1 diff)
• pickup/PickupSpawner.cc (modified) (1 diff)

code/branches/ingamemenu/src/orxonox/gamestates/GSGraphics.cc

@@ -64 +64 @@
     void GSGraphics::activate()
     {
-        // add console command to toggle GUI
-        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSGraphics::toggleGUI, this), "toggleGUI"));
+        
     }
 
@@ -78 +77 @@
     }
 
-    /**
-    @brief
-        Toggles the visibility of the current GUI
-
-        This function just executes a Lua function in the main script of the GUI by accessing the GUIManager.
-        For more details on this function check out the Lua code.
-    */
-    void GSGraphics::toggleGUI()
-    {
-        GUIManager::getInstance().executeCode("toggleGUI()");
-    }
-
     void GSGraphics::update(const Clock& time)
     {

code/branches/ingamemenu/src/orxonox/gamestates/GSGraphics.h

@@ -57 +57 @@
         void update(const Clock& time);
 
-        void toggleGUI();
-
     private:
     };

code/branches/ingamemenu/src/orxonox/gamestates/GSLevel.cc

@@ -101 +101 @@
         if (show)
         {
-            GUIManager::getInstance().showGUI("inGameTest");
-            GUIManager::getInstance().executeCode("showCursor()");
-            InputManager::getInstance().enterState("guiMouseOnly");
+            GUIManager::showGUI("inGameTest");
         }
         else
         {
-            GUIManager::getInstance().executeCode("hideGUI(\"inGameTest\")");
-            GUIManager::getInstance().executeCode("hideCursor()");
-            InputManager::getInstance().leaveState("guiMouseOnly");
+            GUIManager::hideGUI("inGameTest");
         }
     }

code/branches/ingamemenu/src/orxonox/gamestates/GSMainMenu.cc

@@ -82 +82 @@
     {
         // show main menu
-        GUIManager::getInstance().showGUI("MainMenu");
+        GUIManager::showGUI("MainMenu");
         GUIManager::getInstance().setCamera(this->camera_);
         GraphicsManager::getInstance().setCamera(this->camera_);
@@ -111 +111 @@
 
         InputManager::getInstance().leaveState("mainMenu");
+        GUIManager::hideGUI("MainMenu");
 
         GUIManager::getInstance().setCamera(0);

code/branches/ingamemenu/src/orxonox/pickup/PickupInventory.cc

@@ -86 +86 @@
     {
         if(PickupInventory::getSingleton()->isVisible()) {
-            GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
-            GUIManager::getInstance().executeCode("hideCursor()");
-            InputManager::getInstance().leaveState("guiMouseOnly");
-        }
-        else
-        {
-            GUIManager::getInstance().showGUI("PickupInventory");
-            GUIManager::getInstance().executeCode("showCursor()");
-            InputManager::getInstance().enterState("guiMouseOnly");
+            GUIManager::hideGUI("PickupInventory");
+        }
+        else
+        {
+            GUIManager::showGUI("PickupInventory");
         }
         PickupInventory::getSingleton()->setVisible(!PickupInventory::getSingleton()->isVisible());

code/branches/ingamemenu/src/orxonox/pickup/PickupSpawner.cc

@@ -96 +96 @@
         //  & load the GUI itself too, along with some empty windows
         //   = even less delays
-        GUIManager::getInstance().showGUI("PickupInventory");
-        GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
+        GUIManager::showGUI("PickupInventory");
+        GUIManager::hideGUI("PickupInventory");
         PickupInventory::getSingleton();
     }