Changeset 2023 for code/branches/objecthierarchy/src/orxonox/overlays

Timestamp:

Oct 27, 2008, 10:56:51 PM (16 years ago)

Author:

rgrieder

Message:

• Added support for dedicated server. Could not network test it yet, client still segfaults me.
• Also kicked GraphicsEngine::levelSceneManager_, there are only the statistic methods left.
• GSDedicated also derives from GSLevel, but GSLevel is not anymore a real GameState.
• CameraHandler and LevelManager get created in GSLevel now.

Location:

code/branches/objecthierarchy/src/orxonox/overlays

Files:

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

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

@@ -44 +44 @@
 #include "core/XMLPort.h"
 #include "core/ConsoleCommand.h"
-#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -115 +114 @@
 
             // We'll have to get the aspect ratio manually for the first time. Afterwards windowResized() gets
-            // called automatically by the GraphicsEngine.
-            this->windowResized(GraphicsEngine::getInstance().getWindowWidth(),
-                GraphicsEngine::getInstance().getWindowHeight());
+            // called automatically by GSGraphics.
+            //this->windowResized(GraphicsEngine::getInstance().getWindowWidth(),
+            //    GraphicsEngine::getInstance().getWindowHeight());
+            this->windowAspectRatio_ = Ogre::OverlayManager::getSingleton().getViewportAspectRatio();
+            this->sizeCorrectionChanged();
 
             this->changedVisibility();

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

@@ -48 +48 @@
 #include "core/input/SimpleInputState.h"
 #include "core/input/InputBuffer.h"
-#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -170 +169 @@
         @brief Initializes the InGameConsole.
     */
-    void InGameConsole::initialise()
+    void InGameConsole::initialise(int windowWidth, int windowHeight)
     {
         // create the corresponding input state
@@ -246 +245 @@
         this->consoleOverlayContainer_->addChild(this->consoleOverlayNoise_);
 
-        this->windowResized(GraphicsEngine::getInstance().getWindowWidth(), GraphicsEngine::getInstance().getWindowHeight());
+        this->windowResized(windowWidth, windowHeight);
 
         // move overlay "above" the top edge of the screen

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

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

code/branches/objecthierarchy/src/orxonox/overlays/hud/ChatOverlay.cc

@@ -38 +38 @@
 #include "network/ClientInformation.h"
 
-#include "GraphicsEngine.h"
 #include "LevelManager.h"
 #include "objects/infos/PlayerInfo.h"