Changeset 5876 for code/branches/core5/src/orxonox/gamestates/GSGraphics.cc

Timestamp:

Oct 4, 2009, 11:08:14 PM (16 years ago)

Author:

rgrieder

Message:

Cleanup in the GameStates (also moved debug overlay to the GraphicsManager).

File:

• code/branches/core5/src/orxonox/gamestates/GSGraphics.cc (modified) (5 diffs)

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

@@ -35 +35 @@
 #include "GSGraphics.h"
 
-#include "util/Clock.h"
-#include "util/Convert.h"
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
 #include "core/Game.h"
 #include "core/GUIManager.h"
-#include "core/Loader.h"
-#include "core/XMLFile.h"
-
 // HACK:
 #include "overlays/Map.h"
@@ -53 +48 @@
     GSGraphics::GSGraphics(const GameStateInfo& info)
         : GameState(info)
-        , debugOverlay_(0)
     {
     }
@@ -65 +59 @@
         This function is called when we enter this game state.
 
-        Since graphics is very important for our game this function does quite a lot:
-        \li starts graphics manager
-        \li loads debug overlay
-        \li manages render window
-        \li creates input manager
-        \li loads master key bindings
-        \li loads the SoundManager
-        \li loads ingame console
-        \li loads GUI interface (GUIManager)
-        \li creates console command to toggle GUI
+        There is only one thing to do here:
+        \li create console command to toggle GUI
     */
     void GSGraphics::activate()
     {
-        // load debug overlay
-        COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile("debug.oxo");
-        Loader::open(debugOverlay_);
-
         // add console command to toggle GUI
-        this->ccToggleGUI_ = createConsoleCommand(createFunctor(&GSGraphics::toggleGUI, this), "toggleGUI");
-        CommandExecutor::addConsoleCommandShortcut(this->ccToggleGUI_);
+        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSGraphics::toggleGUI, this), "toggleGUI"));
     }
 
@@ -91 +71 @@
     @brief
         This function is called when the game state is left
-
-        Created references, input states and console commands are deleted.
     */
     void GSGraphics::deactivate()
     {
-/*
-        if (this->ccToggleGUI_)
-        {
-            delete this->ccToggleGUI_;
-            this->ccToggleGUI_ = 0;
-        }
-*/
-
-        Loader::unload(this->debugOverlay_);
-        delete this->debugOverlay_;
-
         // HACK: (destroys a resource smart pointer)
         Map::hackDestroyMap();
@@ -123 +90 @@
     }
 
-    /**
-    @note
-        A note about the Ogre::FrameListener: Even though we don't use them,
-        they still get called. However, the delta times are not correct (except
-        for timeSinceLastFrame, which is the most important). A little research
-        as shown that there is probably only one FrameListener that doesn't even
-        need the time. So we shouldn't run into problems.
-    */
     void GSGraphics::update(const Clock& time)
     {