Changeset 2800 for code/branches/gui/src/orxonox/gamestates

Timestamp:

Mar 19, 2009, 10:34:54 AM (16 years ago)

Author:

rgrieder

Message:

Renaming "tick" to "update" for all those classes not inheriting from Tickable to avoid confusions.
GameState::ticked still exists, but that's going to change anyway.

Location:

code/branches/gui/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (3 diffs)
• GSDedicated.cc (modified) (2 diffs)
• GSGUI.cc (modified) (2 diffs)
• GSGraphics.cc (modified) (1 diff)
• GSRoot.cc (modified) (1 diff)
• GSServer.cc (modified) (1 diff)
• GSStandalone.cc (modified) (1 diff)

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

@@ -31 +31 @@
 
 #include "core/input/InputManager.h"
+#include "core/Clock.h"
 #include "core/CommandLine.h"
 #include "core/Core.h"
@@ -60 +61 @@
         GSLevel::enter(this->getParent()->getViewport());
 
-        client_->tick(0);
+        // TODO: Get Clock from Game or GameStateManager, but with 0 delta time
+        client_->update(Clock());
     }
 
@@ -78 +80 @@
     {
         GSLevel::ticked(time);
-        client_->tick(time.getDeltaTime());
+        client_->update(time);
 
         this->tickChild(time);

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

@@ -30 +30 @@
 #include "GSDedicated.h"
 
+#include "core/Clock.h"
 #include "core/CommandLine.h"
 #include "core/Core.h"
@@ -83 +84 @@
             timeSinceLastUpdate_ -= static_cast<unsigned int>(timeSinceLastUpdate_ / NETWORK_PERIOD) * NETWORK_PERIOD;
             GSLevel::ticked(time);
-            server_->tick(time.getDeltaTime());
+            server_->update(time);
             this->tickChild(time);
         }

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

@@ -31 +31 @@
 
 #include <OgreViewport.h>
+#include "core/Clock.h"
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"
@@ -64 +65 @@
     {
         // tick CEGUI
-        guiManager_->tick(time.getDeltaTime());
+        guiManager_->update(time);
 
         this->tickChild(time);

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

@@ -233 +233 @@
         float dt = time.getDeltaTime();
 
-        this->inputManager_->tick(dt);
+        this->inputManager_->update(time);
         // tick console
-        this->console_->tick(dt);
+        this->console_->update(time);
         this->tickChild(time);
 

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

@@ -134 +134 @@
         uint64_t timeBeforeTick = time.getRealMicroseconds();
 
-        Core::getInstance().tick(time);
+        Core::getInstance().update(time);
 
         for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)

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

@@ -73 +73 @@
     {
         GSLevel::ticked(time);
-        server_->tick(time.getDeltaTime());
+        server_->update(time);
         this->tickChild(time);
     }

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

@@ -86 +86 @@
         }
         // tick CEGUI
-        guiManager_->tick(time.getDeltaTime());
+        guiManager_->update(time);
 
         GSLevel::ticked(time);