Changeset 6150 for code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc

Timestamp:

Nov 25, 2009, 4:52:37 PM (16 years ago)

Author:

scheusso

Message:

merged menu branch to presentation2 branch with some additional fixes and features

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (2 diffs)

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

@@ -83 +83 @@
     {
         // show main menu
-        GUIManager::getInstance().showGUI("MainMenu");
+        GUIManager::getInstance().showGUI("MainMenu", true, false);
         GUIManager::getInstance().setCamera(this->camera_);
+        GUIManager::getInstance().setBackground("MainMenuBackground");
+//         GUIManager::getInstance().setBackground("");
         GraphicsManager::getInstance().setCamera(this->camera_);
 
@@ -118 +120 @@
 
         GUIManager::getInstance().setCamera(0);
+        GUIManager::getInstance().setBackground("");
+        GUIManager::hideGUI("MainMenu");
         GraphicsManager::getInstance().setCamera(0);
     }