Changeset 2800 for code/branches

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

Files:

• core/Core.cc (modified) (1 diff)
• core/Core.h (modified) (1 diff)
• core/TclThreadManager.cc (modified) (3 diffs)
• core/TclThreadManager.h (modified) (1 diff)
• core/input/CalibratorCallback.h (modified) (1 diff)
• core/input/ExtendedInputState.cc (modified) (2 diffs)
• core/input/ExtendedInputState.h (modified) (1 diff)
• core/input/InputBuffer.cc (modified) (1 diff)
• core/input/InputBuffer.h (modified) (1 diff)
• core/input/InputInterfaces.h (modified) (5 diffs)
• core/input/InputManager.cc (modified) (6 diffs)
• core/input/InputManager.h (modified) (1 diff)
• core/input/InputState.h (modified) (1 diff)
• core/input/KeyBinder.cc (modified) (3 diffs)
• core/input/KeyBinder.h (modified) (3 diffs)
• core/input/SimpleInputState.h (modified) (3 diffs)
• network/Client.cc (modified) (2 diffs)
• network/Client.h (modified) (1 diff)
• network/Server.cc (modified) (2 diffs)
• network/Server.h (modified) (1 diff)
• orxonox/gamestates/GSClient.cc (modified) (3 diffs)
• orxonox/gamestates/GSDedicated.cc (modified) (2 diffs)
• orxonox/gamestates/GSGUI.cc (modified) (2 diffs)
• orxonox/gamestates/GSGraphics.cc (modified) (1 diff)
• orxonox/gamestates/GSRoot.cc (modified) (1 diff)
• orxonox/gamestates/GSServer.cc (modified) (1 diff)
• orxonox/gamestates/GSStandalone.cc (modified) (1 diff)
• orxonox/gui/GUIManager.h (modified) (3 diffs)
• orxonox/overlays/console/InGameConsole.cc (modified) (5 diffs)
• orxonox/overlays/console/InGameConsole.h (modified) (1 diff)

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

@@ -563 +563 @@
     }
 
-    void Core::tick(const Clock& time)
-    {
-        this->tclThreadManager_->tick(time.getDeltaTime());
+    void Core::update(const Clock& time)
+    {
+        this->tclThreadManager_->update(time);
     }
 }

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

@@ -66 +66 @@
 
             bool isLoaded() { return this->loaded_; }
-            void tick(const Clock& time);
+            void update(const Clock& time);
 
             static Core& getInstance() { assert(Core::singletonRef_s); return *Core::singletonRef_s; }

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

@@ -35 +35 @@
 #include <OgreTimer.h>
 
+#include "Clock.h"
 #include "CoreIncludes.h"
 #include "ConsoleCommand.h"
@@ -598 +599 @@
     }
 
-    void TclThreadManager::tick(float dt)
+    void TclThreadManager::update(const Clock& time)
     {
         {
@@ -633 +634 @@
             boost::try_mutex::scoped_lock interpreter_lock(this->orxonoxInterpreterBundle_.interpreterMutex_);
 #endif
-            unsigned long maxtime = (unsigned long)(dt * 1000000 * TCLTHREADMANAGER_MAX_CPU_USAGE);
+            unsigned long maxtime = (unsigned long)(time.getDeltaTime() * 1000000 * TCLTHREADMANAGER_MAX_CPU_USAGE);
             Ogre::Timer timer;
             while (!this->queueIsEmpty())

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

@@ -90 +90 @@
             void debug(const std::string& error);
 
-            virtual void tick(float dt);
+            void update(const Clock& time);
 
             std::list<unsigned int> getThreadList() const;

code/branches/gui/src/core/input/CalibratorCallback.h

@@ -52 +52 @@
         void keyHeld    (const KeyEvent& evt) { }
 
-        void tickInput(float dt) { }
+        void updateInput(float dt) { }
     };
 }

code/branches/gui/src/core/input/ExtendedInputState.cc

@@ -402 +402 @@
     }
 
-    void ExtendedInputState::tickInput(float dt)
+    void ExtendedInputState::updateInput(float dt)
     {
         for (unsigned int i = 0; i < allHandlers_.size(); ++i)
         {
-            allHandlers_[i]->tickInput(dt);
-        }
-    }
-
-    void ExtendedInputState::tickInput(float dt, unsigned int device)
+            allHandlers_[i]->updateInput(dt);
+        }
+    }
+
+    void ExtendedInputState::updateInput(float dt, unsigned int device)
     {
         switch (device)
@@ -416 +416 @@
         case Keyboard:
             for (unsigned int i = 0; i < keyHandlers_.size(); ++i)
-                keyHandlers_[i]->tickKey(dt);
+                keyHandlers_[i]->updateKey(dt);
             break;
 
         case Mouse:
             for (unsigned int i = 0; i < mouseHandlers_.size(); ++i)
-                mouseHandlers_[i]->tickMouse(dt);
+                mouseHandlers_[i]->updateMouse(dt);
             break;
 
         default: // joy sticks
             for (unsigned int i = 0; i < joyStickHandlers_[device - 2].size(); ++i)
-                joyStickHandlers_[device - 2][i]->tickJoyStick(dt, device - 2);
+                joyStickHandlers_[device - 2][i]->updateJoyStick(dt, device - 2);
             break;
         }

code/branches/gui/src/core/input/ExtendedInputState.h

@@ -68 +68 @@
         ~ExtendedInputState() { }
 
-        void tickInput(float dt);
-        void tickInput(float dt, unsigned int device);
+        void updateInput(float dt);
+        void updateInput(float dt, unsigned int device);
 
         void keyPressed (const KeyEvent& evt);

code/branches/gui/src/core/input/InputBuffer.cc

@@ -224 +224 @@
 
     /**
-        @brief This tick() function is called by the InputManager if the InputBuffer is active.
+        @brief This update() function is called by the InputManager if the InputBuffer is active.
         @param dt Delta time
     */
-    void InputBuffer::tickInput(float dt)
+    void InputBuffer::updateInput(float dt)
     {
         timeSinceKeyPressed_ += dt;

code/branches/gui/src/core/input/InputBuffer.h

@@ -171 +171 @@
             void processKey (const KeyEvent &e);
 
-            void tickInput(float dt);
-            void tickKey(float dt) { }
+            void updateInput(float dt);
+            void updateKey(float dt) { }
 
             std::string buffer_;

code/branches/gui/src/core/input/InputInterfaces.h

@@ -474 +474 @@
     public:
         virtual ~InputHandler() { }
-        virtual void tickInput(float dt) = 0;
+        virtual void updateInput(float dt) = 0;
     };
 
@@ -488 +488 @@
         virtual void keyReleased(const KeyEvent& evt) = 0;
         virtual void keyHeld    (const KeyEvent& evt) = 0;
-        virtual void tickKey    (float dt) = 0;
+        virtual void updateKey    (float dt) = 0;
     };
 
@@ -504 +504 @@
         virtual void mouseMoved         (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) = 0;
         virtual void mouseScrolled      (int abs, int rel)     = 0;
-        virtual void tickMouse          (float dt) = 0;
+        virtual void updateMouse          (float dt) = 0;
     };
 
@@ -520 +520 @@
         virtual void joyStickButtonHeld    (unsigned int joyStickID, JoyStickButtonCode::ByEnum id) = 0;
         virtual void joyStickAxisMoved     (unsigned int joyStickID, unsigned int axis, float value) = 0;
-        virtual void tickJoyStick          (float dt, unsigned int joyStick) = 0;
+        virtual void updateJoyStick          (float dt, unsigned int joyStick) = 0;
     };
 
@@ -531 +531 @@
         virtual ~EmptyHandler() { }
 
-        void tickInput(float dt) { }
-        void tickJoyStick(float dt, unsigned int joyStick) { }
-        void tickMouse(float dt) { }
-        void tickKey(float dt) { }
+        void updateInput(float dt) { }
+        void updateJoyStick(float dt, unsigned int joyStick) { }
+        void updateMouse(float dt) { }
+        void updateKey(float dt) { }
 
         void keyPressed (const KeyEvent& evt) { }

code/branches/gui/src/core/input/InputManager.cc

@@ -43 +43 @@
 
 #include "util/Exception.h"
+#include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -670 +671 @@
     @brief
         Public interface. Only reloads immediately if the call stack doesn't
-        include the tick() method.
+        include the update() method.
     @param joyStickSupport
         Whether or not to initialise joy sticks as well.
@@ -742 +743 @@
     @brief
         Updates the states and the InputState situation.
-    @param dt
-        Delta time
-    */
-    void InputManager::tick(float dt)
+    @param time
+        Clock holding the current time.
+    */
+    void InputManager::update(const Clock& time)
     {
         if (internalState_ == Uninitialised)
@@ -849 +850 @@
                 }
 
-            // tick the handlers for each active handler
+            // update the handlers for each active handler
             for (unsigned int i = 0; i < devicesNum_; ++i)
             {
-                activeStatesTop_[i]->tickInput(dt, i);
+                activeStatesTop_[i]->updateInput(time.getDeltaTime(), i);
                 if (stateMaster_->isInputDeviceEnabled(i))
-                    stateMaster_->tickInput(dt, i);
-            }
-
-            // tick the handler with a general tick afterwards
+                    stateMaster_->updateInput(time.getDeltaTime(), i);
+            }
+
+            // update the handler with a general tick afterwards
             for (unsigned int i = 0; i < activeStatesTicked_.size(); ++i)
-                activeStatesTicked_[i]->tickInput(dt);
-            stateMaster_->tickInput(dt);
+                activeStatesTicked_[i]->updateInput(time.getDeltaTime());
+            stateMaster_->updateInput(time.getDeltaTime());
         }
 
@@ -869 +870 @@
     @brief
         Updates the currently active states (according to activeStates_) for each device.
-        Also, a list of all active states (no duplicates!) is compiled for the general tick.
+        Also, a list of all active states (no duplicates!) is compiled for the general update().
     */
     void InputManager::_updateActiveStates()
@@ -1290 +1291 @@
     @remarks
         You can't remove the internal states "empty", "calibrator" and "detector".
-        The removal process is being postponed if InputManager::tick() is currently running.
+        The removal process is being postponed if InputManager::update() is currently running.
     */
     bool InputManager::requestDestroyState(const std::string& name)

code/branches/gui/src/core/input/InputManager.h

@@ -125 +125 @@
         bool requestLeaveState     (const std::string& name);
 
-        void tick(float dt);
+        void update(const Clock& time);
 
         static InputManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; }

code/branches/gui/src/core/input/InputState.h

@@ -71 +71 @@
         virtual void unRegisterOnLeave()                      { executorOnLeave_ = 0; }
 
-        virtual void tickInput(float dt, unsigned int device) = 0;
-        virtual void tickInput(float dt) = 0;
+        virtual void updateInput(float dt, unsigned int device) = 0;
+        virtual void updateInput(float dt) = 0;
 
         virtual void keyPressed (const KeyEvent& evt) = 0;

code/branches/gui/src/core/input/KeyBinder.cc

@@ -309 +309 @@
     }
 
-    void KeyBinder::tickMouse(float dt)
+    void KeyBinder::updateMouse(float dt)
     {
         if (bDeriveMouseInput_)
@@ -349 +349 @@
             // Why dividing relative value by dt? The reason lies in the simple fact, that when you
             // press a button that has relative movement, that value has to be multiplied by dt to be
-            // frame rate independent. This can easily (and only) be done in tickInput(float).
+            // frame rate independent. This can easily (and only) be done in updateInput(float).
             // Hence we need to divide by dt here for the mouse to compensate, because the relative
             // move movements have nothing to do with dt.
@@ -362 +362 @@
     }
 
-    void KeyBinder::tickJoyStick(float dt, unsigned int joyStick)
+    void KeyBinder::updateJoyStick(float dt, unsigned int joyStick)
     {
         for (unsigned int i = 0; i < JoyStickAxisCode::numberOfAxes * 2; i++)

code/branches/gui/src/core/input/KeyBinder.h

@@ -68 +68 @@
 
     protected: // functions
-        void tickInput(float dt);
-        void tickKey(float dt) { }
-        void tickMouse(float dt);
-        void tickJoyStick(float dt, unsigned int joyStick);
+        void updateInput(float dt);
+        void updateKey(float dt) { }
+        void updateMouse(float dt);
+        void updateJoyStick(float dt, unsigned int joyStick);
         // internal
         void tickHalfAxis(HalfAxis& halfAxis);
@@ -134 +134 @@
         @brief
             Commands that have additional parameters (axes) are executed at the end of
-            the tick() so that all values can be buffered for single execution.
+            update() so that all values can be buffered for single execution.
         */
         std::vector<BufferedParamCommand*> paramCommandBuffer_;
@@ -200 +200 @@
     { joyStickButtons_[joyStickID][id].execute(KeybindMode::OnHold); }
 
-    inline void KeyBinder::tickInput(float dt)
+    inline void KeyBinder::updateInput(float dt)
     {
         // execute all buffered bindings (additional parameter)

code/branches/gui/src/core/input/SimpleInputState.h

@@ -59 +59 @@
         ~SimpleInputState() { }
 
-        void tickInput(float dt);
-        void tickInput(float dt, unsigned int device);
+        void updateInput(float dt);
+        void updateInput(float dt, unsigned int device);
 
         void keyPressed (const KeyEvent& evt);
@@ -87 +87 @@
     };
 
-    inline void SimpleInputState::tickInput(float dt)
+    inline void SimpleInputState::updateInput(float dt)
     {
         for (unsigned int i = 0; i < allHandlers_.size(); ++i)
         {
-            allHandlers_[i]->tickInput(dt);
+            allHandlers_[i]->updateInput(dt);
         }
     }
 
-    inline void SimpleInputState::tickInput(float dt, unsigned int device)
+    inline void SimpleInputState::updateInput(float dt, unsigned int device)
     {
         switch (device)
@@ -101 +101 @@
         case InputDevice::Keyboard:
             if (keyHandler_)
-                keyHandler_->tickKey(dt);
+                keyHandler_->updateKey(dt);
             break;
 
         case InputDevice::Mouse:
             if (mouseHandler_)
-                mouseHandler_->tickMouse(dt);
+                mouseHandler_->updateMouse(dt);
             break;
 
         default: // joy sticks
             if (joyStickHandler_[device - 2])
-                joyStickHandler_[device - 2]->tickJoyStick(dt, device - 2);
+                joyStickHandler_[device - 2]->updateJoyStick(dt, device - 2);
             break;
         }

code/branches/gui/src/network/Client.cc

@@ -45 +45 @@
 #include "Host.h"
 #include "synchronisable/Synchronisable.h"
+#include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "packet/Packet.h"
@@ -138 +139 @@
    * @param time
    */
-  void Client::tick(float time){
+  void Client::update(const Clock& time){
 //     COUT(3) << ".";
     if(client_connection.isConnected() && isSynched_){

code/branches/gui/src/network/Client.h

@@ -76 +76 @@
     //bool sendChat(packet::Chat *chat);
 
-    void tick(float time);
+    void update(const Clock& time);
 
   private:

code/branches/gui/src/network/Server.cc

@@ -51 +51 @@
 #include "ClientInformation.h"
 #include "util/Sleep.h"
+#include "core/Clock.h"
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
@@ -149 +150 @@
   * @param time time since last tick
   */
-  void Server::tick(float time) {
+  void Server::update(const Clock& time) {
     processQueue();
     //this steers our network frequency
-    timeSinceLastUpdate_+=time;
+    timeSinceLastUpdate_+=time.getDeltaTime();
     if(timeSinceLastUpdate_>=NETWORK_PERIOD){
       timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;

code/branches/gui/src/network/Server.h

@@ -71 +71 @@
     bool processChat(const std::string& message, unsigned int playerID);
     bool queuePacket(ENetPacket *packet, int clientID);
-    void tick(float time);
+    void update(const Clock& time);
     unsigned int getPing(unsigned int clientID);
     double getPacketLoss(unsigned int clientID);

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; }