Changeset 10413 for code/branches/core7/src/orxonox

Timestamp:

May 2, 2015, 11:20:45 PM (9 years ago)

Author:

landauf

Message:

use the generic UpdateListener interface to receive calls to preUpdate() and postUpdate() instead of limiting this functionality to singletons.

Location:

code/branches/core7/src/orxonox

Files:

• PawnManager.cc (modified) (1 diff)
• PawnManager.h (modified) (2 diffs)
• ShipPartManager.cc (modified) (1 diff)
• ShipPartManager.h (modified) (2 diffs)
• overlays/InGameConsole.cc (modified) (1 diff)
• overlays/InGameConsole.h (modified) (2 diffs)
• sound/SoundManager.cc (modified) (1 diff)
• sound/SoundManager.h (modified) (3 diffs)

code/branches/core7/src/orxonox/PawnManager.cc

@@ -37 +37 @@
     ManageScopedSingleton(PawnManager, ScopeID::Root, false);
 
-    RegisterAbstractClass(PawnManager).inheritsFrom<Tickable>();
+    RegisterAbstractClass(PawnManager).inheritsFrom<UpdateListener>();
 
     PawnManager::PawnManager()

code/branches/core7/src/orxonox/PawnManager.h

@@ -33 +33 @@
 
 #include "util/Singleton.h"
-#include "tools/interfaces/Tickable.h"
+#include "core/UpdateListener.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PawnManager : public Singleton<PawnManager>, public Tickable
+    class _OrxonoxExport PawnManager : public Singleton<PawnManager>, public UpdateListener
     {
             friend class Singleton<PawnManager>;
@@ -45 +45 @@
 
             virtual void preUpdate(const Clock& time);
+            virtual void postUpdate(const Clock& time) { /*no action*/ }
 
         private:

code/branches/core7/src/orxonox/ShipPartManager.cc

@@ -37 +37 @@
     ManageScopedSingleton(ShipPartManager, ScopeID::Root, false);
 
-    RegisterAbstractClass(ShipPartManager).inheritsFrom<Tickable>();
+    RegisterAbstractClass(ShipPartManager).inheritsFrom<UpdateListener>();
 
     ShipPartManager::ShipPartManager()

code/branches/core7/src/orxonox/ShipPartManager.h

@@ -33 +33 @@
 
 #include "util/Singleton.h"
-#include "tools/interfaces/Tickable.h"
+#include "core/UpdateListener.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ShipPartManager : public Singleton<ShipPartManager>, public Tickable
+    class _OrxonoxExport ShipPartManager : public Singleton<ShipPartManager>, public UpdateListener
     {
             friend class Singleton<ShipPartManager>;
@@ -45 +45 @@
 
             virtual void preUpdate(const Clock& time);
+            virtual void postUpdate(const Clock& time) { /*no action*/ }
 
         private:

code/branches/core7/src/orxonox/overlays/InGameConsole.cc

@@ -67 +67 @@
     ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
 
-    RegisterAbstractClass(InGameConsole).inheritsFrom<WindowEventListener>();
+    RegisterAbstractClass(InGameConsole).inheritsFrom<WindowEventListener>().inheritsFrom<UpdateListener>();
 
     /**

code/branches/core7/src/orxonox/overlays/InGameConsole.h

@@ -39 +39 @@
 #include "core/WindowEventListener.h"
 #include "core/command/Shell.h"
+#include "core/UpdateListener.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport InGameConsole : public Singleton<InGameConsole>, public ShellListener, public WindowEventListener
+    class _OrxonoxExport InGameConsole : public Singleton<InGameConsole>, public ShellListener, public WindowEventListener, public UpdateListener
     {
         friend class Singleton<InGameConsole>;
@@ -53 +54 @@
 
         void preUpdate(const Clock& time);
+        void postUpdate(const Clock& time) { /*no action*/ }
 
         static void openConsole();

code/branches/core7/src/orxonox/sound/SoundManager.cc

@@ -66 +66 @@
     }
 
-    RegisterAbstractClass(SoundManager).inheritsFrom<Configurable>();
+    RegisterAbstractClass(SoundManager).inheritsFrom<Configurable>().inheritsFrom<UpdateListener>();
 
     SoundManager::SoundManager()

code/branches/core7/src/orxonox/sound/SoundManager.h

@@ -41 +41 @@
 #include "core/config/Configurable.h"
 #include "core/object/SmartPtr.h"
+#include "core/UpdateListener.h"
 
 // tolua_begin
@@ -59 +60 @@
     class _OrxonoxExport SoundManager
     // tolua_end
-        : public Singleton<SoundManager>, public Configurable
+        : public Singleton<SoundManager>, public Configurable, public UpdateListener
     { // tolua_export
         friend class Singleton<SoundManager>;
@@ -68 +69 @@
 
         void preUpdate(const Clock& time);
+        void postUpdate(const Clock& time) { /*no action*/ }
         void setConfigValues();