Changeset 871 for code/trunk/src/orxonox/tools

Timestamp:

Mar 9, 2008, 4:44:36 PM (17 years ago)

Author:

landauf

Message:

merged core branch to trunk

Location:

code/trunk/src/orxonox/tools

Files:

• BillboardSet.h (modified) (1 diff)
• Timer.cc (copied) (copied from code/branches/core/src/orxonox/tools/Timer.cc)
• Timer.h (modified) (5 diffs)

code/trunk/src/orxonox/tools/BillboardSet.h

@@ -7 +7 @@
 
 #include "../OrxonoxPrereqs.h"
-
-#include "../core/CoreIncludes.h"
 #include "util/Math.h"
 

code/trunk/src/orxonox/tools/Timer.h

@@ -59 +59 @@
 
 #include <OgreFrameListener.h>
-
 #include "../OrxonoxPrereqs.h"
-
-#include "../core/CoreIncludes.h"
 
 namespace orxonox
@@ -72 +69 @@
 
         public:
-            /** @brief Constructor: Sets the default-values. */
-            TimerBase()
-            {
-                RegisterRootObject(TimerBase);
-
-                this->interval_ = 0;
-                this->bLoop_ = false;
-                this->bActive_ = false;
-
-                this->time_ = 0;
-            }
+            TimerBase();
 
             virtual void run() const = 0;
@@ -94 +81 @@
             /** @brief Unpauses the Timer - continues with the given state. */
             inline void unpauseTimer() { this->bActive_ = true; }
-            /** @returns true if the Timer is active (= not stoped, not paused). */
+            /** @brief Returns true if the Timer is active (= not stoped, not paused). @return True = Time is active */
             inline bool isActive() const { return this->bActive_; }
 
@@ -104 +91 @@
             float time_;        //!< Internal variable, counting the time till the next function-call
     };
-    ExportAbstractClass(TimerBase, Orxonox);
 
     //! The Timer is a callback-object, calling a given function after a given time-interval.
@@ -158 +144 @@
             T* object_;
     };
-    ExportAbstractClass(Timer<BaseObject>, Orxonox);
 
     //! The TimerFrameListener manages all Timers in the game.