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

Timestamp:

Mar 19, 2009, 10:58:43 AM (16 years ago)

Author:

rgrieder

Message:

Move graphic related content of GSGraphics to GraphicsManager which originally was GraphisEngine (but since we don't have an engine of our own, I renamed it).
Reduced OgreWindowEventUtilities.h dependency from GraphisManager.h (includes windows.h).

Location:

code/branches/gui/src/orxonox/overlays

Files:

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

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

@@ -39 +39 @@
 #include <OgreOverlayManager.h>
 #include <OgrePanelOverlayElement.h>
+#include <OgreRenderWindow.h>
+
 #include "util/Convert.h"
 #include "util/Exception.h"
@@ -46 +48 @@
 #include "core/XMLPort.h"
 #include "core/ConsoleCommand.h"
+#include "GraphicsManager.h"
 
 namespace orxonox
@@ -77 +80 @@
         this->overlay_->add2D(this->background_);
 
-        // We'll have to set the aspect ratio to a default value first.
-        // GSGraphics gets informed about our construction here and can update us in the next tick.
-        this->windowAspectRatio_ = 1.0;
+        // 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->sizeCorrectionChanged();
 
@@ -175 +178 @@
     /**
     @brief
-        Called by the GraphicsEngine whenever the window size changes.
+        Called by the GraphicsManager whenever the window size changes.
         Calculates the aspect ratio only.
     */
-    void OrxonoxOverlay::windowResized(int newWidth, int newHeight)
+    void OrxonoxOverlay::windowResized(unsigned int newWidth, unsigned int newHeight)
     {
         this->windowAspectRatio_ = newWidth/(float)newHeight;

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

@@ -200 +200 @@
 
     private:
-        void windowResized(int newWidth, int newHeight);
+        void windowResized(unsigned int newWidth, unsigned int newHeight);
 
         static unsigned int hudOverlayCounter_s;   //!< Static counter for hud elements

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

@@ -410 +410 @@
         @brief Resizes the console elements. Call if window size changes.
     */
-    void InGameConsole::windowResized(int newWidth, int newHeight)
+    void InGameConsole::windowResized(unsigned int newWidth, unsigned int newHeight)
     {
         this->windowW_ = newWidth;

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

@@ -81 +81 @@
         void print(const std::string& text, int index, bool alwaysShift = false);
 
-        void windowResized(int newWidth, int newHeight);
+        void windowResized(unsigned int newWidth, unsigned int newHeight);
 
         // config value related

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

@@ -31 +31 @@
 #include <OgreTextAreaOverlayElement.h>
 #include "core/CoreIncludes.h"
-#include "GraphicsEngine.h"
+#include "GraphicsManager.h"
 #include "util/Convert.h"
 
@@ -51 +51 @@
         SUPER(DebugFPSText, tick, dt);
 
-        float fps = GraphicsEngine::getInstance().getAverageFramesPerSecond();
+        float fps = GraphicsManager::getInstance().getAverageFramesPerSecond();
         this->setCaption(convertToString(fps));
     }

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

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "util/Convert.h"
-#include "GraphicsEngine.h"
+#include "GraphicsManager.h"
 
 namespace orxonox
@@ -51 +51 @@
         SUPER(DebugRTRText, tick, dt);
 
-        float rtr = GraphicsEngine::getInstance().getAverageTickTime();
+        float rtr = GraphicsManager::getInstance().getAverageTickTime();
         this->setCaption(convertToString(rtr));
     }