Changeset 1790 for code/trunk

Timestamp:

Sep 15, 2008, 11:38:46 PM (16 years ago)

Author:

rgrieder

Message:

removed TickableReal

Location:

code/trunk/src/orxonox

Files:

• gamestates/GSDedicated.cc (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• objects/Tickable.cc (modified) (1 diff)
• objects/Tickable.h (modified) (1 diff)

code/trunk/src/orxonox/gamestates/GSDedicated.cc

@@ -102 +102 @@
     void GSDedicated::ticked(const Clock& time)
     {
-        // Call those objects that need the real time
-        for (ObjectList<TickableReal>::iterator it = ObjectList<TickableReal>::begin(); it; ++it)
-            it->tick(time.getDeltaTime());
         // Call the scene objects
         for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -113 +113 @@
     void GSLevel::ticked(const Clock& time)
     {
-        // Call those objects that need the real time
-        for (ObjectList<TickableReal>::iterator it = ObjectList<TickableReal>::begin(); it; ++it)
-            it->tick(time.getDeltaTime());
         // Call the scene objects
         for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)

code/trunk/src/orxonox/objects/Tickable.cc

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

code/trunk/src/orxonox/objects/Tickable.h

@@ -64 +64 @@
 
     SUPER_FUNCTION(1, Tickable, tick, true);
-
-    //! The Tickable interface provides a tick(dt) function, that gets called every frame.
-    class _OrxonoxExport 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();
-    };
-
 }