Changeset 5850 for code/branches/core5/src/orxonox/gamestates

Timestamp:

Oct 1, 2009, 11:44:53 AM (15 years ago)

Author:

rgrieder

Message:

Moved the singleton creation/destruction mess to the Core class by using just two possible Scopes:

• ScopeID::Root for singletons that may always persists
• ScopeID::Graphics for singletons that only work when graphics was loaded

Location:

code/branches/core5/src/orxonox/gamestates

Files:

• GSGraphics.cc (modified) (5 diffs)
• GSGraphics.h (modified) (1 diff)
• GSLevel.cc (modified) (6 diffs)
• GSLevel.h (modified) (2 diffs)
• GSRoot.cc (modified) (3 diffs)
• GSRoot.h (modified) (1 diff)

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

@@ -46 +46 @@
 #include "core/Loader.h"
 #include "core/XMLFile.h"
-#include "overlays/InGameConsole.h"
-#include "sound/SoundManager.h"
 
 // HACK:
@@ -58 +56 @@
     GSGraphics::GSGraphics(const GameStateInfo& info)
         : GameState(info)
-        , console_(0)
-        , soundManager_(0)
         , masterKeyBinder_(0)
         , masterInputState_(0)
@@ -100 +96 @@
         masterKeyBinder_->loadBindings("masterKeybindings.ini");
 
-        // Load the SoundManager
-        soundManager_ = new SoundManager();
-
-        // Load the InGameConsole
-        console_ = new InGameConsole();
-        console_->initialise();
-
         // add console command to toggle GUI
         this->ccToggleGUI_ = createConsoleCommand(createFunctor(&GSGraphics::toggleGUI, this), "toggleGUI");
@@ -131 +120 @@
 */
 
-        this->console_->destroy();
-
         Loader::unload(this->debugOverlay_);
         delete this->debugOverlay_;
-
-        this->soundManager_->destroy();
 
         // HACK: (destroys a resource smart pointer)
@@ -170 +155 @@
             Game::getInstance().requestState("mainMenu");
         }
-
-        this->console_->update(time);
     }
 }

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

@@ -60 +60 @@
 
     private:
-        // managed singletons
-        InGameConsole*        console_;
-        SoundManager*         soundManager_;        //!< Keeps track of SoundBase objects
-
         KeyBinder*            masterKeyBinder_;     //!< Key binder for master key bindings
         InputState*           masterInputState_;    //!< Special input state for master input

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

@@ -41 +41 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
-#include "core/GraphicsManager.h"
 #include "core/GUIManager.h"
 #include "core/Loader.h"
 #include "core/XMLFile.h"
 
-#include "tools/interfaces/Tickable.h"
-#include "CameraManager.h"
 #include "LevelManager.h"
 #include "PlayerManager.h"
-#include "infos/HumanPlayer.h"
 
 namespace orxonox
@@ -65 +61 @@
         , guiMouseOnlyInputState_(0)
         , guiKeysOnlyInputState_(0)
-        , cameraManager_(0)
     {
         RegisterObject(GSLevel);
@@ -98 +93 @@
             guiKeysOnlyInputState_ = InputManager::getInstance().createInputState("guiKeysOnly");
             guiKeysOnlyInputState_->setKeyHandler(GUIManager::getInstancePtr());
-
-            // create the global CameraManager
-            this->cameraManager_ = new CameraManager(GraphicsManager::getInstance().getViewport());
-        }
-
-        this->playerManager_ = new PlayerManager();
-
-        this->scope_GSLevel_ = new Scope<ScopeID::GSLevel>();
+        }
 
         if (GameMode::isMaster())
@@ -126 +114 @@
             
             // connect the HumanPlayer to the game
-            this->playerManager_->clientConnected(0);
+            PlayerManager::getInstance().clientConnected(0);
         }
     }
@@ -165 +153 @@
         {
             // disconnect the HumanPlayer
-            this->playerManager_->clientDisconnected(0);
+            PlayerManager::getInstance().clientDisconnected(0);
             
             // unload all compositors (this is only necessary because we don't yet destroy all resources!)
@@ -184 +172 @@
         if (GameMode::isMaster())
             this->unloadLevel();
-
-        if (this->cameraManager_)
-        {
-            delete this->cameraManager_;
-            this->cameraManager_ = 0;
-        }
-
-        if (this->playerManager_)
-        {
-            this->playerManager_->destroy();
-            this->playerManager_ = 0;
-        }
-
-        if (this->scope_GSLevel_)
-        {
-            delete this->scope_GSLevel_;
-            this->scope_GSLevel_ = NULL;
-        }
 
         if (GameMode::showsGraphics())

code/branches/core5/src/orxonox/gamestates/GSLevel.h

@@ -33 +33 @@
 
 #include <string>
-#include "util/Scope.h"
 #include "core/OrxonoxClass.h"
 #include "core/GameState.h"
@@ -67 +66 @@
         InputState*              guiMouseOnlyInputState_;  //!< input state if we only need the mouse to use the GUI
         InputState*              guiKeysOnlyInputState_;   //!< input state if we only need the keys to use the GUI
-        CameraManager*           cameraManager_;           //!< camera manager for this level
-        PlayerManager*           playerManager_;           //!< player manager for this level
-        Scope<ScopeID::GSLevel>* scope_GSLevel_;
 
         //##### ConfigValues #####

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

@@ -37 +37 @@
 #include "tools/interfaces/TimeFactorListener.h"
 #include "tools/interfaces/Tickable.h"
-#include "LevelManager.h"
 
 namespace orxonox
@@ -70 +69 @@
         this->ccPause_ = createConsoleCommand(createFunctor(&GSRoot::pause, this), "pause");
         CommandExecutor::addConsoleCommandShortcut(this->ccPause_).accessLevel(AccessLevel::Offline);
-
-        // create the LevelManager
-        this->levelManager_ = new LevelManager();
     }
 
@@ -90 +86 @@
         }
 */
-
-        this->levelManager_->destroy();
     }
 

code/branches/core5/src/orxonox/gamestates/GSRoot.h

@@ -56 +56 @@
         float                 timeFactorPauseBackup_;
 
-        LevelManager*         levelManager_;            //!< global level manager
-
         // console commands
         ConsoleCommand*       ccSetTimeFactor_;