Changeset 1271

Timestamp:

May 14, 2008, 11:26:34 AM (16 years ago)

Author:

rgrieder

Message:

added TickableReal to tick objects that shouldn't be affected by setTimeFactor

Location:

code/branches/input/src

Files:

• core/InputBuffer.h (modified) (1 diff)
• core/InputManager.h (modified) (1 diff)
• core/Tickable.cc (modified) (1 diff)
• core/Tickable.h (modified) (1 diff)
• orxonox/Orxonox.cc (modified) (1 diff)

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

@@ -43 +43 @@
   {};
 
-  class _CoreExport InputBuffer : public KeyHandler, public Tickable
+  class _CoreExport InputBuffer : public KeyHandler, public TickableReal
   {
     struct InputBufferListenerTuple

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

@@ -51 +51 @@
   */
   class _CoreExport InputManager
-        : public Tickable,
+        : public TickableReal,
           public OIS::KeyListener, public OIS::MouseListener, public OIS::JoyStickListener
   {

code/branches/input/src/core/Tickable.cc

@@ -40 +40 @@
         RegisterRootObject(Tickable);
     }
+
+    /**
+        @brief Constructor: Registers the object in the TickableReal-list
+    */
+    TickableReal::TickableReal()
+    {
+        RegisterRootObject(TickableReal);
+    }
 }

code/branches/input/src/core/Tickable.h

@@ -62 +62 @@
     };
 
+    //! The Tickable interface provides a tick(dt) function, that gets called every frame.
+    class _CoreExport TickableReal : virtual public OrxonoxClass
+    {
+        public:
+            /**
+                @brief Gets called every frame.
+                @param dt The time since the last frame in seconds
+            */
+            virtual void tick(float dt) = 0;
+
+        protected:
+            TickableReal();
+    };
+
 }
 

code/branches/input/src/orxonox/Orxonox.cc

@@ -490 +490 @@
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
         it->tick((float)evt.timeSinceLastFrame * this->timefactor_);
-      orxonoxConsole_->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+      // Iterate through all TickableReals and call their tick(dt) function
+      for (Iterator<TickableReal> it = ObjectList<TickableReal>::start(); it; ++it)
+        it->tick((float)evt.timeSinceLastFrame);
+      orxonoxConsole_->tick((float)evt.timeSinceLastFrame);
 
       // don't forget to call _fireFrameStarted in ogre to make sure