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

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

Files:

• gamestates/GSClient.cc (modified) (3 diffs)
• gamestates/GSDedicated.cc (modified) (2 diffs)
• gamestates/GSGUI.cc (modified) (2 diffs)
• gamestates/GSGraphics.cc (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (1 diff)
• gamestates/GSServer.cc (modified) (1 diff)
• gamestates/GSStandalone.cc (modified) (1 diff)
• gui/GUIManager.h (modified) (3 diffs)
• overlays/console/InGameConsole.cc (modified) (5 diffs)
• overlays/console/InGameConsole.h (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);

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

@@ -40 +40 @@
 #include <CEGUIInputEvent.h>
 #include <CEGUISystem.h>
+#include "core/Clock.h"
 #include "core/input/InputInterfaces.h"
 
@@ -71 +72 @@
         bool initialise(Ogre::RenderWindow* renderWindow);
         void loadScene(const std::string& name);
-        void tick(float dt)
+        void update(const Clock& time)
         {
             assert(guiSystem_);
-            guiSystem_->injectTimePulse(dt);
+            guiSystem_->injectTimePulse(time.getDeltaTime());
         }
         void showGUI(const std::string& name, Ogre::SceneManager* sceneManager);// bool showBackground); // tolua_export
@@ -108 +109 @@
         { guiSystem_->injectMouseWheelChange(rel);}
 
-        void tickInput(float dt) { }
-        void tickKey(float dt) { }
-        void tickMouse(float dt) { }
+        void updateInput(float dt) { }
+        void updateKey(float dt) { }
+        void updateMouse(float dt) { }
 
         void loadScenes();

code/branches/gui/src/orxonox/overlays/console/InGameConsole.cc

@@ -42 +42 @@
 #include "util/Convert.h"
 #include "util/Debug.h"
+#include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -347 +348 @@
         @brief Used to control the actual scrolling and the cursor.
     */
-    void InGameConsole::tick(float dt)
+    void InGameConsole::update(const Clock& time)
     {
         if (this->scroll_ != 0)
@@ -358 +359 @@
                 // enlarge oldTop a little bit so that this exponential function
                 // reaches 0 before infinite time has passed...
-                float deltaScroll = (oldTop - 0.01) * dt * this->scrollSpeed_;
+                float deltaScroll = (oldTop - 0.01) * time.getDeltaTime() * this->scrollSpeed_;
                 if (oldTop - deltaScroll >= 0)
                 {
@@ -373 +374 @@
                 // scrolling up
                 // note: +0.01 for the same reason as when scrolling down
-                float deltaScroll = (1.2 * this->relativeHeight + 0.01 + oldTop) * dt * this->scrollSpeed_;
+                float deltaScroll = (1.2 * this->relativeHeight + 0.01 + oldTop) * time.getDeltaTime() * this->scrollSpeed_;
                 if (oldTop - deltaScroll <= -1.2 * this->relativeHeight)
                 {
@@ -388 +389 @@
         if (this->bActive_)
         {
-            this->cursor_ += dt;
+            this->cursor_ += time.getDeltaTime();
             if (this->cursor_ >= this->blinkTime)
             {

code/branches/gui/src/orxonox/overlays/console/InGameConsole.h

@@ -53 +53 @@
         void setConfigValues();
 
-        virtual void tick(float dt);
+        void update(const Clock& time);
 
         static InGameConsole& getInstance() { assert(singletonRef_s); return *singletonRef_s; }