Changeset 3291 for code/branches/core4/src/orxonox/overlays

Timestamp:

Jul 14, 2009, 11:50:47 AM (15 years ago)

Author:

rgrieder

Message:

Added window size as static variable to the WindowEventListener interface.
This resolves several hacks and inconveniences in Mouse, InputManager, InGameConsole, GSGraphics and OrxonoxOverlay.

Location:

code/branches/core4/src/orxonox/overlays

Files:

• OrxonoxOverlay.cc (modified) (2 diffs)
• console/InGameConsole.cc (modified) (2 diffs)
• console/InGameConsole.h (modified) (1 diff)

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

@@ -47 +47 @@
 #include "core/XMLPort.h"
 #include "core/ConsoleCommand.h"
-#include "GraphicsManager.h"
 
 namespace orxonox
@@ -81 +80 @@
 
         // Get aspect ratio from the render window. Later on, we get informed automatically
-        Ogre::RenderWindow* defaultWindow = GraphicsManager::getInstance().getRenderWindow();
-        this->windowAspectRatio_ = (float)defaultWindow->getWidth() / defaultWindow->getHeight();
+        this->windowAspectRatio_ = (float)this->getWindowWidth() / this->getWindowHeight();
         this->sizeCorrectionChanged();
 

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

@@ -172 +172 @@
         @brief Initializes the InGameConsole.
     */
-    void InGameConsole::initialise(int windowWidth, int windowHeight)
+    void InGameConsole::initialise()
     {
         // create the corresponding input state
@@ -248 +248 @@
         this->consoleOverlayContainer_->addChild(this->consoleOverlayNoise_);
 
-        this->windowResized(windowWidth, windowHeight);
+        this->windowResized(this->getWindowWidth(), this->getWindowWidth());
 
         // move overlay "above" the top edge of the screen

code/branches/core4/src/orxonox/overlays/console/InGameConsole.h

@@ -46 +46 @@
         ~InGameConsole();
 
-        void initialise(int windowWidth, int windowHeight);
+        void initialise();
         void destroy();
         void setConfigValues();