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

Timestamp:

Mar 19, 2009, 6:11:00 PM (16 years ago)

Author:

rgrieder

Message:

Moved global game clock to Core. Use getGameClock() for a const reference to an object that can tell you the time since the game was started or since the last capture() (which is usually once a frame).

Location:

code/branches/gui/src/orxonox

Files:

• Game.cc (modified) (3 diffs)
• Game.h (modified) (1 diff)
• gamestates/GSClient.cc (modified) (1 diff)

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

@@ -89 +89 @@
         this->abort_ = false;
 
-        this->core_ = new orxonox::Core(argc, argv);
-        if (!this->core_->isLoaded())
-        {
-            COUT(0) << "Core was not fully loaded, probably an exception occurred during consruction. Aborting" << std::endl;
-            abort();
-        }
+        this->core_ = new orxonox::Core();
+        this->gameClock_ = this->core_->initialise(argc, argv);
     }
 
@@ -142 +138 @@
         root.addChild(&dedicated);
 
-
-        // start global orxonox time
-        Clock clock;
-
         root.activate();
 
@@ -153 +145 @@
         while (!this->abort_)
         {
-            clock.capture();
+            this->gameClock_->capture();
 
-            root.tick(clock);
+            root.tick(*this->gameClock_);
 
             if (root.stateRequest_ != "")

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

@@ -61 +61 @@
 
         Core* core_;
+        Clock* gameClock_;
 
         bool abort_;

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

@@ -61 +61 @@
         GSLevel::enter();
 
-        // TODO: Get Clock from Game or GameStateManager, but with 0 delta time
-        client_->update(Clock());
+        client_->update(Core::getGameClock());
     }