Changeset 2844 for code/branches/gui/src/orxonox/gamestates/GSGraphics.cc
- Timestamp:
- Mar 25, 2009, 5:23:00 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gui/src/orxonox/gamestates/GSGraphics.cc
r2817 r2844 45 45 #include "gui/GUIManager.h" 46 46 #include "GraphicsManager.h" 47 #include " Game.h"47 #include "core/Game.h" 48 48 49 49 namespace orxonox 50 50 { 51 GSGraphics::GSGraphics() 52 : GameState("graphics") 51 AddGameState(GSGraphics, "graphics"); 52 53 GSGraphics::GSGraphics(const std::string& name) 54 : GameState(name) 53 55 , inputManager_(0) 54 56 , console_(0) … … 60 62 { 61 63 RegisterRootObject(GSGraphics); 62 setConfigValues();63 64 } 64 65 … … 71 72 } 72 73 73 void GSGraphics:: enter()74 void GSGraphics::activate() 74 75 { 76 setConfigValues(); 77 75 78 Core::setShowsGraphics(true); 76 79 … … 108 111 } 109 112 110 void GSGraphics:: leave()113 void GSGraphics::deactivate() 111 114 { 112 115 if (Core::showsGraphics()) … … 146 149 need the time. So we shouldn't run into problems. 147 150 */ 148 void GSGraphics:: ticked(const Clock& time)151 void GSGraphics::update(const Clock& time) 149 152 { 150 153 uint64_t timeBeforeTick = time.getRealMicroseconds(); … … 152 155 this->inputManager_->update(time); // tick console 153 156 this->console_->update(time); 154 this->tickChild(time);155 157 156 158 uint64_t timeAfterTick = time.getRealMicroseconds();
Note: See TracChangeset
for help on using the changeset viewer.