Changeset 5774 for code/trunk/src/orxonox/GSRoot.cc

Timestamp:

Sep 23, 2009, 11:31:02 PM (15 years ago)

Author:

rgrieder

Message:

Removed almost everything. Should be working already, but not yet tested on Unix.

File:

• code/trunk/src/orxonox/GSRoot.cc (copied) (copied from code/trunk/src/modules/gamestates/GSRoot.cc) (2 diffs)

code/trunk/src/orxonox/GSRoot.cc

@@ -30 +30 @@
 
 #include "core/Clock.h"
-#include "core/ConsoleCommand.h"
 #include "core/Game.h"
-#include "core/GameMode.h"
-#include "network/NetworkFunction.h"
-#include "tools/Timer.h"
-#include "tools/interfaces/TimeFactorListener.h"
-#include "tools/interfaces/Tickable.h"
-#include "LevelManager.h"
 
 namespace orxonox
@@ -45 +38 @@
     GSRoot::GSRoot(const GameStateInfo& info)
         : GameState(info)
-        , timeFactor_(1.0f)
-        , bPaused_(false)
-        , timeFactorPauseBackup_(1.0f)
     {
-        this->ccSetTimeFactor_ = 0;
-        this->ccPause_ = 0;
     }
 
     GSRoot::~GSRoot()
     {
-        NetworkFunctionBase::destroyAllNetworkFunctions();
     }
 
     void GSRoot::activate()
     {
-        // reset game speed to normal
-        this->timeFactor_ = 1.0f;
-
-        {
-            // time factor console command
-            FunctorMember<GSRoot>* functor = createFunctor(&GSRoot::setTimeFactor);
-            functor->setObject(this);
-            this->ccSetTimeFactor_ = createConsoleCommand(functor, "setTimeFactor");
-            CommandExecutor::addConsoleCommandShortcut(this->ccSetTimeFactor_).accessLevel(AccessLevel::Offline).defaultValue(0, 1.0);
-        }
-
-        {
-            // time factor console command
-            FunctorMember<GSRoot>* functor = createFunctor(&GSRoot::pause);
-            functor->setObject(this);
-            this->ccPause_ = createConsoleCommand(functor, "pause");
-            CommandExecutor::addConsoleCommandShortcut(this->ccPause_).accessLevel(AccessLevel::Offline);
-        }
-
-        // create the LevelManager
-        this->levelManager_ = new LevelManager();
     }
 
     void GSRoot::deactivate()
     {
-/*
-        if (this->ccSetTimeFactor_)
-        {
-            delete this->ccSetTimeFactor_;
-            this->ccSetTimeFactor_ = 0;
-        }
-
-        if (this->ccPause_)
-        {
-            delete this->ccPause_;
-            this->ccPause_ = 0;
-        }
-*/
-
-        delete this->levelManager_;
     }
 
     void GSRoot::update(const Clock& time)
     {
-        if (this->getActivity().topState)
-        {
-            // This state can not 'survive' on its own.
-            // Load a user interface therefore
-            Game::getInstance().requestState("ioConsole");
-        }
-
-        for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)
-            it->tick(time);
-
-        /*** HACK *** HACK ***/
-        // Call the Tickable objects
-        float leveldt = time.getDeltaTime();
-        if (leveldt > 1.0f)
-        {
-            // just loaded
-            leveldt = 0.0f;
-        }
-        for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
-            it->tick(leveldt * this->timeFactor_);
-        /*** HACK *** HACK ***/
-    }
-
-    /**
-    @brief
-        Changes the speed of Orxonox
-    @remark
-        This function is a hack when placed here!
-        Timefactor should be related to the scene (level or so), not the game
-    */
-    void GSRoot::setTimeFactor(float factor)
-    {
-        if (GameMode::isMaster())
-        {
-            if (!this->bPaused_)
-            {
-                TimeFactorListener::timefactor_s = factor;
-
-                for (ObjectList<TimeFactorListener>::iterator it = ObjectList<TimeFactorListener>::begin(); it != ObjectList<TimeFactorListener>::end(); ++it)
-                    it->changedTimeFactor(factor, this->timeFactor_);
-
-                this->timeFactor_ = factor;
-            }
-            else
-                this->timeFactorPauseBackup_ = factor;
-        }
-    }
-
-    void GSRoot::pause()
-    {
-        if (GameMode::isMaster())
-        {
-            if (!this->bPaused_)
-            {
-                this->timeFactorPauseBackup_ = this->timeFactor_;
-                this->setTimeFactor(0.0f);
-                this->bPaused_ = true;
-            }
-            else
-            {
-                this->bPaused_ = false;
-                this->setTimeFactor(this->timeFactorPauseBackup_);
-            }
-        }
     }
 }