Changeset 1674 for code/branches/gui/src/core

Timestamp:

Aug 28, 2008, 8:30:25 PM (16 years ago)

Author:

rgrieder

Message:

• Wrote Clock() class: It starts an internal clock when GSRoot starts and gets handed to all GameState ticks as reference. You can then either query the ticked time or the real time (for instance for statistical measurements)
• general clean up in all the game states

Location:

code/branches/gui/src/core

Files:

• Clock.cc (added)
• Clock.h (added)
• CorePrereqs.h (modified) (1 diff)
• GameState.cc (modified) (2 diffs)
• GameState.h (modified) (3 diffs)
• RootGameState.cc (modified) (3 diffs)
• RootGameState.h (modified) (3 diffs)

code/branches/gui/src/core/CorePrereqs.h

@@ -162 +162 @@
 
   // game states
-  class BaseGameState;
   class GameState;
   class RootGameState;

code/branches/gui/src/core/GameState.cc

@@ -34 +34 @@
 
 #include "GameState.h"
-#include <cassert>
 #include "Debug.h"
 #include "Exception.h"
@@ -359 +358 @@
         This method is not virtual! You cannot override it therefore.
     */
-    void GameState::tick(float dt, uint64_t time)
+    void GameState::tick(const Clock& time)
     {
         this->operation_.running = true;
-        this->ticked(dt, time);
+        this->ticked(time);
         this->operation_.running = false;
     }

code/branches/gui/src/core/GameState.h

@@ -42 +42 @@
 #include <map>
 #include "util/Integers.h"
+#include "Clock.h"
 
 namespace orxonox
@@ -100 +101 @@
         virtual void enter() = 0;
         virtual void leave() = 0;
-        virtual void ticked(float dt, uint64_t time) = 0;
+        virtual void ticked(const Clock& time) = 0;
 
         GameState* getActiveChild() { return this->activeChild_; }
 
-        void tickChild(float dt, uint64_t time) { if (this->getActiveChild()) this->getActiveChild()->tick(dt, time); }
+        void tickChild(const Clock& time) { if (this->getActiveChild()) this->getActiveChild()->tick(time); }
 
     private:
@@ -113 +114 @@
         void grandchildRemoved(GameState* grandchild);
 
-        void tick(float dt, uint64_t time);
+        void tick(const Clock& time);
         void activate();
         void deactivate();

code/branches/gui/src/core/RootGameState.cc

@@ -29 +29 @@
 #include "RootGameState.h"
 
-#include <OgreTimer.h>
-#include "util/Integers.h"
+#include "Clock.h"
 #include "Debug.h"
 #include "Exception.h"
@@ -95 +94 @@
             if (current)
             {
-                //OrxAssert(dynamic_cast<GameState*>(current),
-                //    "RootGameState: There was a RootGameState in the subtree of Root");
-                //GameState* currentGS = static_cast<GameState*>(current);
-                //currentGS->makeTransition(this, request);
                 current->makeTransition(0, request);
             }
@@ -141 +136 @@
         gotoState(initialState);
 
-        Ogre::Timer timer;
-        uint64_t storedTime = 0;
-        unsigned long lastTimersTime = 1;
-        timer.reset();
+        Clock clock;
         while (this->activeChild_)
         {
-            // get current time
-            unsigned long timersTime = timer.getMicroseconds();
-            uint64_t realTime = storedTime + timersTime;
-            float dt = (float)(timersTime - lastTimersTime)/1000000.0f;
-            if (timersTime > 7000000)
-            {
-                // Under worst condition, the ogre timer will overflow right after 7 seconds
-                storedTime += timersTime;
-                lastTimersTime = 0;
-                timer.reset();
-            }
-            else
-            {
-                lastTimersTime = timersTime;
-            }
+            clock.capture();
 
-            this->tick(dt, realTime);
+            this->tick(clock);
 
             if (this->stateRequest_ != "")

code/branches/gui/src/core/RootGameState.h

@@ -31 +31 @@
 
 #include "CorePrereqs.h"
-#include <OgrePrerequisites.h>
 #include "GameState.h"
 
@@ -38 +37 @@
     class _CoreExport RootGameState : public GameState
     {
-        //friend class GameState;
-
     public:
         RootGameState(const std::string& name);
@@ -46 +43 @@
         void requestState(const std::string& name);
         void start();
-
-    protected:
-        //virtual void ticked(float dt) = 0;
-        //virtual void enter() = 0;
-        //virtual void leave() = 0;
 
     private: