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

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)

Location:

code/branches/gui/src/orxonox/overlays

Files:

• OrxonoxOverlay.cc (modified) (1 diff)
• console/InGameConsole.cc (modified) (2 diffs)
• debug/DebugFPSText.cc (modified) (1 diff)
• debug/DebugRTRText.cc (modified) (1 diff)

code/branches/gui/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -115 +115 @@
             // We'll have to get the aspect ratio manually for the first time. Afterwards windowResized() gets
             // called automatically by the GraphicsEngine.
-            this->windowResized(GraphicsEngine::getSingleton().getWindowWidth(),
-                GraphicsEngine::getSingleton().getWindowHeight());
+            this->windowResized(GraphicsEngine::getInstance().getWindowWidth(),
+                GraphicsEngine::getInstance().getWindowHeight());
 
             this->changedVisibility();

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

code/branches/gui/src/orxonox/overlays/debug/DebugFPSText.cc

@@ -49 +49 @@
     void DebugFPSText::tick(float dt)
     {
-        float fps = GraphicsEngine::getSingleton().getAverageFramesPerSecond();
+        float fps = GraphicsEngine::getInstance().getAverageFramesPerSecond();
         this->text_->setCaption(this->getCaption() + convertToString(fps));
     }

code/branches/gui/src/orxonox/overlays/debug/DebugRTRText.cc

@@ -49 +49 @@
     void DebugRTRText::tick(float dt)
     {
-        float rtr = GraphicsEngine::getSingleton().getAverageTickTime();
+        float rtr = GraphicsEngine::getInstance().getAverageTickTime();
         this->text_->setCaption(this->getCaption() + convertToString(rtr));
     }