Changeset 2817 for code/branches/gui/src/orxonox

Timestamp:

Mar 21, 2009, 10:17:59 PM (16 years ago)

Author:

rgrieder

Message:

Removed GameState template and renamed GameStateBase to GameState.
Moved statistics stuff (fps and tick time) to Game and removed the remaining hacks in GSGraphics and GSRoot.

Location:

code/branches/gui/src/orxonox

Files:

• Game.cc (modified) (6 diffs)
• Game.h (modified) (3 diffs)
• GraphicsManager.h (modified) (1 diff)
• gamestates/GSClient.cc (modified) (1 diff)
• gamestates/GSClient.h (modified) (1 diff)
• gamestates/GSDedicated.cc (modified) (1 diff)
• gamestates/GSDedicated.h (modified) (1 diff)
• gamestates/GSGUI.cc (modified) (1 diff)
• gamestates/GSGUI.h (modified) (1 diff)
• gamestates/GSGraphics.cc (modified) (2 diffs)
• gamestates/GSGraphics.h (modified) (1 diff)
• gamestates/GSIOConsole.cc (modified) (1 diff)
• gamestates/GSIOConsole.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• gamestates/GSLevel.h (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (5 diffs)
• gamestates/GSRoot.h (modified) (3 diffs)
• gamestates/GSServer.cc (modified) (1 diff)
• gamestates/GSServer.h (modified) (1 diff)
• gamestates/GSStandalone.cc (modified) (1 diff)
• gamestates/GSStandalone.h (modified) (1 diff)
• overlays/debug/DebugFPSText.cc (modified) (2 diffs)
• overlays/debug/DebugRTRText.cc (modified) (2 diffs)

code/branches/gui/src/orxonox/Game.cc

@@ -45 +45 @@
 #include "core/Core.h"
 #include "core/Identifier.h"
+#include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
 
 #include "gamestates/GSRoot.h"
@@ -61 +63 @@
 int main(int argc, char** argv)
 {
-    orxonox::Game orxonox(argc, argv);
-    orxonox.run();
+    {
+        orxonox::Game orxonox(argc, argv);
+        orxonox.run();
+        // objects gets destroyed here!
+    }
+
+    // Clean up class hierarchy stuff (identifiers, xmlport, configvalue, consolecommand)
+    // Needs to be done after Game destructor because of ~OrxonoxClass
+    orxonox::Identifier::destroyAllIdentifiers();
+
     return 0;
 }
@@ -89 +99 @@
         this->abort_ = false;
 
+        // reset statistics
+        this->statisticsStartTime_ = 0;
+        this->statisticsTickTimes_.clear();
+        this->periodTickTime_ = 0;
+        this->periodTime_ = 0;
+        this->avgFPS_ = 0.0f;
+        this->avgTickTime_ = 0.0f;
+
         this->core_ = new orxonox::Core();
         this->gameClock_ = this->core_->initialise(argc, argv);
+
+        RegisterRootObject(Game);
+        this->setConfigValues();
     }
 
@@ -101 +122 @@
         delete this->core_;
 
-        // Clean up class hierarchy stuff (identifiers, xmlport, configvalue, consolecommand)
-        // Needs to be done after 'delete core' because of ~OrxonoxClass
-        orxonox::Identifier::destroyAllIdentifiers();
-
         assert(singletonRef_s);
         singletonRef_s = 0;
+    }
+
+    void Game::setConfigValues()
+    {
+        SetConfigValue(statisticsRefreshCycle_, 250000)
+            .description("Sets the time in microseconds interval at which average fps, etc. get updated.");
+        SetConfigValue(statisticsAvgLength_, 1000000)
+            .description("Sets the time in microseconds interval at which average fps, etc. gets calculated.");
     }
 
@@ -143 +168 @@
         root.gotoState(CommandLine::getValue("state"));
 
+        this->gameClock_->capture(); // first delta time should be about 0 seconds
         while (!this->abort_)
         {
             this->gameClock_->capture();
-
+            uint64_t currentTime = this->gameClock_->getMicroseconds();
+
+            // STATISTICS
+            statisticsTickInfo tickInfo = {currentTime, 0};
+            statisticsTickTimes_.push_back(tickInfo);
+            this->periodTime_ += this->gameClock_->getDeltaTimeMicroseconds();
+
+            // UPDATE
             root.tick(*this->gameClock_);
+
+            // STATISTICS
+            if (this->periodTime_ > statisticsRefreshCycle_)
+            {
+                std::list<statisticsTickInfo>::iterator it = this->statisticsTickTimes_.begin();
+                assert(it != this->statisticsTickTimes_.end());
+                int64_t lastTime = currentTime - this->statisticsAvgLength_;
+                if ((int64_t)it->tickTime < lastTime)
+                {
+                    do
+                    {
+                        assert(this->periodTickTime_ > it->tickLength);
+                        this->periodTickTime_ -= it->tickLength;
+                        ++it;
+                        assert(it != this->statisticsTickTimes_.end());
+                    } while ((int64_t)it->tickTime < lastTime);
+                    this->statisticsTickTimes_.erase(this->statisticsTickTimes_.begin(), it);
+                }
+
+                uint32_t framesPerPeriod = this->statisticsTickTimes_.size();
+                this->avgFPS_ = (float)framesPerPeriod / (currentTime - this->statisticsTickTimes_.front().tickTime) * 1000000.0;
+                this->avgTickTime_ = (float)this->periodTickTime_ / framesPerPeriod / 1000.0;
+
+                this->periodTime_ -= this->statisticsRefreshCycle_;
+            }
 
             if (root.stateRequest_ != "")
@@ -161 +219 @@
         this->abort_ = true;
     }
+
+    void Game::addTickTime(uint32_t length)
+    {
+        assert(!this->statisticsTickTimes_.empty());
+        this->statisticsTickTimes_.back().tickLength += length;
+        this->periodTickTime_+=length;
+    }
 }

code/branches/gui/src/orxonox/Game.h

@@ -38 +38 @@
 #include "OrxonoxPrereqs.h"
 #include <cassert>
-#include "core/CorePrereqs.h"
+#include <list>
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
@@ -46 +47 @@
         Main class responsible for running the game.
     */
-    class _OrxonoxExport Game
+    class _OrxonoxExport Game : public OrxonoxClass
     {
     public:
         Game(int argc, char** argv);
         ~Game();
+        void setConfigValues();
 
         void run();
         void stop();
 
+        float getAvgTickTime() { return this->avgTickTime_; }
+        float getAvgFPS()      { return this->avgFPS_; }
+
+        void addTickTime(uint32_t length);
+
         static Game& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
     private:
+        struct statisticsTickInfo
+        {
+            uint64_t    tickTime;
+            uint32_t    tickLength;
+        };
+
         Game(Game&); // don't mess with singletons
 
@@ -65 +78 @@
         bool abort_;
 
+        // variables for time statistics
+        uint64_t              statisticsStartTime_;
+        std::list<statisticsTickInfo>
+                              statisticsTickTimes_;
+        uint32_t              periodTime_;
+        uint32_t              periodTickTime_;
+        float                 avgFPS_;
+        float                 avgTickTime_;
+
+        // config values
+        unsigned int          statisticsRefreshCycle_;
+        unsigned int          statisticsAvgLength_;
+
         static Game* singletonRef_s;        //!< Pointer to the Singleton
     };

code/branches/gui/src/orxonox/GraphicsManager.h

@@ -66 +66 @@
             { return this->detailLevelParticle_; }
 
-        // <HACK>
-        float getAverageFramesPerSecond() const   { return this->avgFramesPerSecond_; }
-        float getAverageTickTime() const          { return this->avgTickTime_; }
-        void setAverageTickTime(float tickTime)   { this->avgTickTime_ = tickTime; }
-        void setAverageFramesPerSecond(float fps) { this->avgFramesPerSecond_ = fps; }
-        // </HACK>
-
         inline void setViewport(Ogre::Viewport* viewport)
             { this->viewport_ = viewport; }

code/branches/gui/src/orxonox/gamestates/GSClient.cc

@@ -41 +41 @@
 
     GSClient::GSClient()
-        : GameState<GSGraphics>("client")
+        : GameState("client")
         , client_(0)
     {

code/branches/gui/src/orxonox/gamestates/GSClient.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+#include "core/GameState.h"
 #include "network/NetworkPrereqs.h"
 #include "GSLevel.h"
-#include "GSGraphics.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSClient : public GameState<GSGraphics>, public GSLevel
+    class _OrxonoxExport GSClient : public GameState, public GSLevel
     {
     public:

code/branches/gui/src/orxonox/gamestates/GSDedicated.cc

@@ -41 +41 @@
 {
     GSDedicated::GSDedicated()
-        : GameState<GSRoot>("dedicated")
+        : GameState("dedicated")
         , server_(0)
         , timeSinceLastUpdate_(0)

code/branches/gui/src/orxonox/gamestates/GSDedicated.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+#include "core/GameState.h"
 #include "network/NetworkPrereqs.h"
 #include "GSLevel.h"
-#include "GSRoot.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSDedicated : public GameState<GSRoot>, public GSLevel
+    class _OrxonoxExport GSDedicated : public GameState, public GSLevel
     {
     public:

code/branches/gui/src/orxonox/gamestates/GSGUI.cc

@@ -40 +40 @@
 {
     GSGUI::GSGUI()
-        : GameState<GSGraphics>("gui")
+        : GameState("gui")
     {
     }

code/branches/gui/src/orxonox/gamestates/GSGUI.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "core/GameState.h"
-#include "GSGraphics.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSGUI : public GameState<GSGraphics>
+    class _OrxonoxExport GSGUI : public GameState
     {
     public:

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

@@ -44 +44 @@
 #include "overlays/console/InGameConsole.h"
 #include "gui/GUIManager.h"
-
-// for compatibility
 #include "GraphicsManager.h"
+#include "Game.h"
 
 namespace orxonox
 {
     GSGraphics::GSGraphics()
-        : GameState<GSRoot>("graphics")
+        : GameState("graphics")
         , inputManager_(0)
         , console_(0)
@@ -157 +156 @@
         uint64_t timeAfterTick = time.getRealMicroseconds();
 
-        // Also add our tick time to the list in GSRoot
-        this->getParent()->addTickTime(timeAfterTick - timeBeforeTick);
-
-        // Update statistics overlay. Note that the values only change periodically in GSRoot.
-        GraphicsManager::getInstance().setAverageFramesPerSecond(this->getParent()->getAvgFPS());
-        GraphicsManager::getInstance().setAverageTickTime(this->getParent()->getAvgTickTime());
+        // Also add our tick time
+        Game::getInstance().addTickTime(timeAfterTick - timeBeforeTick);
 
         this->graphicsManager_->update(time);

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

@@ -34 +34 @@
 #include "core/OrxonoxClass.h"
 #include "tools/WindowEventListener.h"
-#include "GSRoot.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSGraphics : public GameState<GSRoot>, public WindowEventListener
+    class _OrxonoxExport GSGraphics : public GameState, public WindowEventListener
     {
         friend class ClassIdentifier<GSGraphics>;

code/branches/gui/src/orxonox/gamestates/GSIOConsole.cc

@@ -40 +40 @@
 {
     GSIOConsole::GSIOConsole()
-        : GameState<GSRoot>("ioConsole")
+        : GameState("ioConsole")
     {
     }

code/branches/gui/src/orxonox/gamestates/GSIOConsole.h

@@ -33 +33 @@
 #include <OgrePrerequisites.h>
 #include "core/GameState.h"
-#include "GSRoot.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSIOConsole : public GameState<GSRoot>
+    class _OrxonoxExport GSIOConsole : public GameState
     {
     public:

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

@@ -53 +53 @@
 
     GSLevel::GSLevel()
-//        : GameState<GSGraphics>(name)
+//        : GameState(name)
         : keyBinder_(0)
         , inputState_(0)

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+#include "core/GameState.h"
 #include "core/OrxonoxClass.h"
 

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

@@ -33 +33 @@
 #include "util/Debug.h"
 #include "core/Core.h"
-#include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
 #include "tools/Timer.h"
 #include "objects/Tickable.h"
+#include "Game.h"
 
 namespace orxonox
@@ -47 +47 @@
         , timeFactorPauseBackup_(1.0f)
     {
-        RegisterRootObject(GSRoot);
-        setConfigValues();
-
         this->ccSetTimeFactor_ = 0;
         this->ccPause_ = 0;
@@ -58 +55 @@
     }
 
-    void GSRoot::setConfigValues()
-    {
-        SetConfigValue(statisticsRefreshCycle_, 250000)
-            .description("Sets the time in microseconds interval at which average fps, etc. get updated.");
-        SetConfigValue(statisticsAvgLength_, 1000000)
-            .description("Sets the time in microseconds interval at which average fps, etc. gets calculated.");
-    }
-
     void GSRoot::enter()
     {
@@ -71 +60 @@
         timeFactor_ = 1.0f;
 
-        // reset frame counter
-        this->statisticsStartTime_ = 0;
-        this->statisticsTickTimes_.clear();
-        this->periodTickTime_ = 0;
-        this->avgFPS_ = 0.0f;
-        this->avgTickTime_ = 0.0f;
-
         {
             // add console commands
-            FunctorMember01<GameStateBase, const std::string&>* functor = createFunctor(&GameStateBase::requestState);
+            FunctorMember01<GameState, const std::string&>* functor = createFunctor(&GameState::requestState);
             functor->setObject(this);
             this->ccSelectGameState_ = createConsoleCommand(functor, "selectGameState");
@@ -144 +126 @@
         uint64_t timeAfterTick = time.getRealMicroseconds();
 
-        // STATISTICS
-        assert(timeAfterTick - timeBeforeTick >= 0 );
-        statisticsTickInfo tickInfo = {timeAfterTick, timeAfterTick - timeBeforeTick};
-        statisticsTickTimes_.push_back(tickInfo);
-        assert(statisticsTickTimes_.back().tickLength==tickInfo.tickLength);
-        this->periodTickTime_ += tickInfo.tickLength;
+        // Also add our tick time to the list in GSRoot
+        Game::getInstance().addTickTime(timeAfterTick - timeBeforeTick);
 
-        // Ticks GSGraphics or GSDedicated
         this->tickChild(time);
-
-        if (timeAfterTick > statisticsStartTime_ + statisticsRefreshCycle_)
-        {
-            std::list<statisticsTickInfo>::iterator it = this->statisticsTickTimes_.begin();
-            assert(it != this->statisticsTickTimes_.end());
-            int64_t lastTime = timeAfterTick - statisticsAvgLength_;
-            if ((int64_t)it->tickTime < lastTime)
-            {
-                do
-                {
-                    assert(this->periodTickTime_ > it->tickLength);
-                    this->periodTickTime_ -= it->tickLength;
-                    ++it;
-                    assert(it != this->statisticsTickTimes_.end());
-                } while ((int64_t)it->tickTime < lastTime);
-                this->statisticsTickTimes_.erase(this->statisticsTickTimes_.begin(), it);
-            }
-
-            uint32_t framesPerPeriod = this->statisticsTickTimes_.size();
-            this->avgFPS_ = (float)framesPerPeriod / (timeAfterTick - this->statisticsTickTimes_.front().tickTime) * 1000000.0;
-            this->avgTickTime_ = (float)this->periodTickTime_ / framesPerPeriod / 1000.0;
-
-            statisticsStartTime_ = timeAfterTick;
-        }
-
     }
 

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

@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSRoot : public RootGameState, public OrxonoxClass
+    class _OrxonoxExport GSRoot : public RootGameState
     {
         friend class ClassIdentifier<GSRoot>;
 
     public:
-        struct statisticsTickInfo
-        {
-            uint64_t    tickTime;
-            uint32_t    tickLength;
-        };
     
     public:
@@ -59 +54 @@
         float getTimeFactor() { return this->timeFactor_; }
 
-        float getAvgTickTime() { return this->avgTickTime_; }
-        float getAvgFPS()      { return this->avgFPS_; }
-
-        inline void addTickTime(uint32_t length)
-            { assert(!this->statisticsTickTimes_.empty()); this->statisticsTickTimes_.back().tickLength += length;
-              this->periodTickTime_+=length; }
-
     private:
         void enter();
@@ -71 +59 @@
         void ticked(const Clock& time);
 
-        void setConfigValues();
-
         float                 timeFactor_;       //!< A factor that sets the gamespeed. 1 is normal.
         bool                  bPaused_;
         float                 timeFactorPauseBackup_;
-
-        // variables for time statistics
-        uint64_t              statisticsStartTime_;
-        std::list<statisticsTickInfo>
-                              statisticsTickTimes_;
-        uint32_t              periodTickTime_;
-        float                 avgFPS_;
-        float                 avgTickTime_;
-
-        // config values
-        unsigned int          statisticsRefreshCycle_;
-        unsigned int          statisticsAvgLength_;
 
         // console commands

code/branches/gui/src/orxonox/gamestates/GSServer.cc

@@ -39 +39 @@
 
     GSServer::GSServer()
-        : GameState<GSGraphics>("server")
+        : GameState("server")
         , server_(0)
     {

code/branches/gui/src/orxonox/gamestates/GSServer.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+#include "core/GameState.h"
 #include "network/NetworkPrereqs.h"
 #include "GSLevel.h"
-#include "GSGraphics.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSServer : public GameState<GSGraphics>, public GSLevel
+    class _OrxonoxExport GSServer : public GameState, public GSLevel
     {
     public:

code/branches/gui/src/orxonox/gamestates/GSStandalone.cc

@@ -40 +40 @@
 {
     GSStandalone::GSStandalone()
-        : GameState<GSGraphics>("standalone")
+        : GameState("standalone")
     {
     }

code/branches/gui/src/orxonox/gamestates/GSStandalone.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+#include "core/GameState.h"
 #include "GSLevel.h"
-#include "GSGraphics.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSStandalone : public GameState<GSGraphics>, public GSLevel
+    class _OrxonoxExport GSStandalone : public GameState, public GSLevel
     {
     public:

code/branches/gui/src/orxonox/overlays/debug/DebugFPSText.cc

@@ -30 +30 @@
 #include "DebugFPSText.h"
 #include <OgreTextAreaOverlayElement.h>
+#include "util/Convert.h"
 #include "core/CoreIncludes.h"
-#include "GraphicsManager.h"
-#include "util/Convert.h"
+#include "Game.h"
 
 namespace orxonox
@@ -51 +51 @@
         SUPER(DebugFPSText, tick, dt);
 
-        float fps = GraphicsManager::getInstance().getAverageFramesPerSecond();
+        float fps = Game::getInstance().getAvgFPS();
         this->setCaption(convertToString(fps));
     }

code/branches/gui/src/orxonox/overlays/debug/DebugRTRText.cc

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "util/Convert.h"
-#include "GraphicsManager.h"
+#include "Game.h"
 
 namespace orxonox
@@ -51 +51 @@
         SUPER(DebugRTRText, tick, dt);
 
-        float rtr = GraphicsManager::getInstance().getAverageTickTime();
+        float rtr = Game::getInstance().getAvgTickTime();
         this->setCaption(convertToString(rtr));
     }