Changeset 1524 for code/branches/input/src/orxonox/objects

Timestamp:

Jun 3, 2008, 12:20:36 AM (16 years ago)

Author:

rgrieder

Message:

• moved Tickable to objects again
• network, audio and core now have their own tick routine
• Sequence is defined in Orxonox.cc

Location:

code/branches/input/src/orxonox/objects

Files:

• Tickable.cc (moved) (moved from code/branches/input/src/core/Tickable.cc) (1 diff)
• Tickable.h (moved) (moved from code/branches/input/src/core/Tickable.h) (2 diffs)
• WorldEntity.h (modified) (1 diff)

code/branches/input/src/orxonox/objects/Tickable.cc

@@ -27 +27 @@
  */
 
+#include "OrxonoxStableHeaders.h"
 #include "Tickable.h"
-#include "CoreIncludes.h"
-#include "ConsoleCommand.h"
+#include "core/CoreIncludes.h"
+#include "core/ConsoleCommand.h"
 
 namespace orxonox

code/branches/input/src/orxonox/objects/Tickable.h

@@ -42 +42 @@
 #define _Tickable_H__
 
-#include "CorePrereqs.h"
+#include "OrxonoxPrereqs.h"
 
-#include "OrxonoxClass.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
 {
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
-    class _CoreExport Tickable : virtual public OrxonoxClass
+    class _OrxonoxExport Tickable : virtual public OrxonoxClass
     {
         public:
@@ -63 +63 @@
 
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
-    class _CoreExport TickableReal : virtual public OrxonoxClass
+    class _OrxonoxExport TickableReal : virtual public OrxonoxClass
     {
         public:

code/branches/input/src/orxonox/objects/WorldEntity.h

@@ -39 +39 @@
 #include "network/Synchronisable.h"
 #include "core/BaseObject.h"
-#include "core/Tickable.h"
+#include "Tickable.h"
 #include "../tools/Mesh.h"