Changeset 3280 for code/trunk/src/orxonox/gamestates/GSGraphics.cc
- Timestamp:
- Jul 12, 2009, 11:58:01 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 (added) merged: 3235-3237,3245-3250,3253-3254,3260-3261,3265,3270
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gamestates/GSGraphics.cc
r3196 r3280 57 57 namespace orxonox 58 58 { 59 AddGameState(GSGraphics, "graphics", false);60 61 GSGraphics::GSGraphics(const std::string& name, bool countTickTime)62 : GameState( name, countTickTime)59 DeclareGameState(GSGraphics, "graphics", true, true); 60 61 GSGraphics::GSGraphics(const GameStateConstrParams& params) 62 : GameState(params) 63 63 , inputManager_(0) 64 64 , console_(0) … … 108 108 setConfigValues(); 109 109 110 // initialise graphics manager. Doesn't load the render window yet!110 // Load OGRE including the render window 111 111 this->graphicsManager_ = new GraphicsManager(); 112 this->graphicsManager_->initialise();113 112 114 113 // load debug overlay … … 198 197 void GSGraphics::toggleGUI() 199 198 { 200 199 GUIManager::getInstance().executeCode("toggleGUI()"); 201 200 } 202 201
Note: See TracChangeset
for help on using the changeset viewer.