Changeset 3349 for code/branches/resource/src/orxonox/gamestates

Timestamp:

Jul 25, 2009, 2:14:05 PM (15 years ago)

Author:

rgrieder

Message:

Moved InputManager, GUIManager and GraphicsManager handling from GSGraphics to Core.

Location:

code/branches/resource/src/orxonox/gamestates

Files:

• GSGraphics.cc (modified) (8 diffs)
• GSGraphics.h (modified) (1 diff)
• GSRoot.cc (modified) (3 diffs)

code/branches/resource/src/orxonox/gamestates/GSGraphics.cc

@@ -35 +35 @@
 #include "GSGraphics.h"
 
-#include <boost/filesystem.hpp>
-#include <OgreRenderWindow.h>
-
 #include "util/Convert.h"
 #include "core/Clock.h"
@@ -44 +41 @@
 #include "core/Core.h"
 #include "core/Game.h"
-#include "core/GameMode.h"
-#include "core/GraphicsManager.h"
 #include "core/GUIManager.h"
 #include "core/input/InputManager.h"
@@ -60 +55 @@
 namespace orxonox
 {
-    DeclareGameState(GSGraphics, "graphics", true, true);
+    DeclareGameState(GSGraphics, "graphics", false, true);
 
     GSGraphics::GSGraphics(const GameStateConstrParams& params)
         : GameState(params)
-        , inputManager_(0)
         , console_(0)
-        , guiManager_(0)
-        , graphicsManager_(0)
         , soundManager_(0)
         , masterKeyBinder_(0)
@@ -99 +91 @@
         Core::getInstance().loadGraphics();
 
-        // Load OGRE including the render window
-        this->graphicsManager_ = new GraphicsManager();
-
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile((Core::getMediaPath() / "overlay" / "debug.oxo").string());
+        this->debugOverlay_ = new XMLFile(Core::getMediaPathString() + "overlay/debug.oxo");
         Loader::open(debugOverlay_);
-
-        // The render window width and height are used to set up the mouse movement.
-        size_t windowHnd = 0;
-        Ogre::RenderWindow* renderWindow = GraphicsManager::getInstance().getRenderWindow();
-        renderWindow->getCustomAttribute("WINDOW", &windowHnd);
-
-        // Calls the InputManager which sets up the input devices.
-        inputManager_ = new InputManager(windowHnd);
-
         // load master key bindings
         masterInputState_ = InputManager::getInstance().createInputState("master", true);
@@ -127 +107 @@
         console_ = new InGameConsole();
         console_->initialise();
-
-        // load the CEGUI interface
-        guiManager_ = new GUIManager(renderWindow);
 
         // add console command to toggle GUI
@@ -161 +138 @@
         delete this->masterKeyBinder_;
 
-        delete this->guiManager_;
         delete this->console_;
 
@@ -169 +145 @@
         delete this->soundManager_;
 
-        delete this->inputManager_;
-        this->inputManager_ = 0;
-
-        // HACK:
+        // HACK: (destroys a resource smart pointer)
         Map::hackDestroyMap();
-
-        delete graphicsManager_;
 
         // Unload OGRE, CEGUI and OIS
@@ -210 +181 @@
         }
 
-        uint64_t timeBeforeTick = time.getRealMicroseconds();
-
-        this->inputManager_->update(time);
         this->console_->update(time);
-
-        uint64_t timeAfterTick = time.getRealMicroseconds();
-
-        // Also add our tick time
-        Game::getInstance().addTickTime(timeAfterTick - timeBeforeTick);
-
-        // Process gui events
-        this->guiManager_->update(time);
-        // Render
-        this->graphicsManager_->update(time);
     }
 }

code/branches/resource/src/orxonox/gamestates/GSGraphics.h

@@ -61 +61 @@
     private:
         // managed singletons
-        InputManager*         inputManager_;        //!< Reference to input management
         InGameConsole*        console_;
-        GUIManager*           guiManager_;          //!< Interface to GUI
-        GraphicsManager*      graphicsManager_;     //!< Interface to Ogre
         SoundManager*         soundManager_;        //!< Keeps track of SoundBase objects
 

code/branches/resource/src/orxonox/gamestates/GSRoot.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    DeclareGameState(GSRoot, "root", true, false);
+    DeclareGameState(GSRoot, "root", false, false);
     SetCommandLineSwitch(console).information("Start in console mode (text IO only)");
     // Shortcuts for easy direct loading
@@ -155 +155 @@
         }
 
-        uint64_t timeBeforeTick = time.getRealMicroseconds();
-
         for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)
             it->tick(time);
@@ -171 +169 @@
             it->tick(leveldt * this->timeFactor_);
         /*** HACK *** HACK ***/
-
-        uint64_t timeAfterTick = time.getRealMicroseconds();
-
-        // Also add our tick time
-        Game::getInstance().addTickTime(timeAfterTick - timeBeforeTick);
     }