Changeset 1653 for code/branches/gui/src/orxonox/overlays/console

Timestamp:

Aug 5, 2008, 9:50:26 PM (16 years ago)

Author:

rgrieder

Message:

• getInstance is probably more suitable than getSingleton (as x3n has already done so in most of his classes) I changed it in Orxonox and GraphicsEngine. Maybe more to come.
• Removed derivation from BaseObject in InputState (templates work well too, don't need a factory at all)

File:

• code/branches/gui/src/orxonox/overlays/console/InGameConsole.cc (modified) (2 diffs)

code/branches/gui/src/orxonox/overlays/console/InGameConsole.cc

@@ -147 +147 @@
     {
         // create the corresponding input state
-        InputManager::getInstance().createSimpleInputState("console", 40)
+        InputManager::getInstance().createInputState<SimpleInputState>("console", 40)
             ->setKeyHandler(Shell::getInstance().getInputBuffer());
 
@@ -219 +219 @@
         this->consoleOverlayContainer_->addChild(this->consoleOverlayNoise_);
 
-        this->windowResized(GraphicsEngine::getSingleton().getWindowWidth(), GraphicsEngine::getSingleton().getWindowHeight());
+        this->windowResized(GraphicsEngine::getInstance().getWindowWidth(), GraphicsEngine::getInstance().getWindowHeight());
 
         // move overlay "above" the top edge of the screen