Changeset 2853 for code/branches/gui/src/orxonox
- Timestamp:
- Mar 26, 2009, 3:18:08 PM (16 years ago)
- Location:
- code/branches/gui/src/orxonox
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc
r2850 r2853 67 67 68 68 // show main menu 69 GUIManager::getInstance().showGUI("main Menu");69 GUIManager::getInstance().showGUI("mainmenu"); 70 70 GUIManager::getInstance().setCamera(this->camera_); 71 71 GraphicsManager::getInstance().setCamera(this->camera_); … … 77 77 CommandExecutor::addConsoleCommandShortcut(this->ccStartGame_); 78 78 } 79 79 80 80 InputManager::getInstance().requestEnterState("mainMenu"); 81 81 } -
code/branches/gui/src/orxonox/gui/GUIManager.cc
r2850 r2853 186 186 } 187 187 188 void GUIManager::testOutput(std::string& str) 189 { 190 COUT(0) << "*** CEGUI: " << str << std::endl; 191 } 192 188 193 void GUIManager::showGUI(const std::string& name) 189 194 { -
code/branches/gui/src/orxonox/gui/GUIManager.h
r2850 r2853 78 78 void setCamera(Ogre::Camera* camera); 79 79 80 void testOutput(std::string& str); // tolua_export 81 80 82 static GUIManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; } // tolua_export 81 83 static GUIManager* getInstancePtr() { return singletonRef_s; }
Note: See TracChangeset
for help on using the changeset viewer.