Changeset 10413 for code/branches/core7

Timestamp:

May 2, 2015, 11:20:45 PM (10 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

Files:

• libraries/core/CMakeLists.txt (modified) (1 diff)
• libraries/core/Core.cc (modified) (4 diffs)
• libraries/core/CorePrereqs.h (modified) (1 diff)
• libraries/core/UpdateListener.cc (added)
• libraries/core/UpdateListener.h (added)
• libraries/core/singleton/ScopedSingletonManager.cc (modified) (1 diff)
• libraries/core/singleton/ScopedSingletonManager.h (modified) (4 diffs)
• libraries/util/Singleton.h (modified) (1 diff)
• orxonox/PawnManager.cc (modified) (1 diff)
• orxonox/PawnManager.h (modified) (2 diffs)
• orxonox/ShipPartManager.cc (modified) (1 diff)
• orxonox/ShipPartManager.h (modified) (2 diffs)
• orxonox/overlays/InGameConsole.cc (modified) (1 diff)
• orxonox/overlays/InGameConsole.h (modified) (2 diffs)
• orxonox/sound/SoundManager.cc (modified) (1 diff)
• orxonox/sound/SoundManager.h (modified) (3 diffs)

code/branches/core7/src/libraries/core/CMakeLists.txt

@@ -34 +34 @@
   NamespaceNode.cc
   Template.cc
+  UpdateListener.cc
   ViewportEventListener.cc
   WindowEventListener.cc

code/branches/core7/src/libraries/core/Core.cc

@@ -79 +79 @@
 #include "object/ObjectList.h"
 #include "module/ModuleInstance.h"
+#include "UpdateListener.h"
 
 namespace orxonox
@@ -481 +482 @@
     void Core::preUpdate(const Clock& time)
     {
-        // Update singletons before general ticking
-        ScopedSingletonManager::preUpdate<ScopeID::Root>(time);
+        // Update UpdateListeners before general ticking
+        for (ObjectList<UpdateListener>::iterator it = ObjectList<UpdateListener>::begin(); it != ObjectList<UpdateListener>::end(); ++it)
+            it->preUpdate(time);
         if (this->bGraphicsLoaded_)
         {
@@ -489 +491 @@
             // Update GUI
             this->guiManager_->preUpdate(time);
-            // Update singletons before general ticking
-            ScopedSingletonManager::preUpdate<ScopeID::Graphics>(time);
         }
         // Process console events and status line
@@ -501 +501 @@
     void Core::postUpdate(const Clock& time)
     {
-        // Update singletons just before rendering
-        ScopedSingletonManager::postUpdate<ScopeID::Root>(time);
+        // Update UpdateListeners just before rendering
+        for (ObjectList<UpdateListener>::iterator it = ObjectList<UpdateListener>::begin(); it != ObjectList<UpdateListener>::end(); ++it)
+            it->postUpdate(time);
         if (this->bGraphicsLoaded_)
         {
-            // Update singletons just before rendering
-            ScopedSingletonManager::postUpdate<ScopeID::Graphics>(time);
             // Render (doesn't throw)
             this->graphicsManager_->postUpdate(time);

code/branches/core7/src/libraries/core/CorePrereqs.h

@@ -209 +209 @@
     class Thread;
     class ThreadPool;
+    class UpdateListener;
     class ViewportEventListener;
     template <class T>

code/branches/core7/src/libraries/core/singleton/ScopedSingletonManager.cc

@@ -41 +41 @@
         return managers;
     }
-    /*static*/ ScopedSingletonManager::ManagerMultiMap& ScopedSingletonManager::getManagersByScope()
-    {
-        static ManagerMultiMap managers;
-        return managers;
-    }
 
     /*static*/ void ScopedSingletonManager::addManager(ScopedSingletonManager* manager)
     {
         getManagers()[manager->className_] = manager;
-        getManagersByScope().insert(std::make_pair(manager->scope_, manager));
     }
 }

code/branches/core7/src/libraries/core/singleton/ScopedSingletonManager.h

@@ -68 +68 @@
 namespace orxonox
 {
-    class Destroyable;
-
     /**
-        @brief Base class of ClassScopedSingletonManager, implements some static functions
-        used to dispatch calls to preUpdate and postUpdate to all instances of this class.
-        It also keeps track of all existing ScopedSingletonManagers and stores them in a
-        map, sorted by the scope they belong to.
+        @brief Base class of ClassScopedSingletonManager. Keeps track of all existing ScopedSingletonManagers
+        and stores them in a map, sorted by the scope they belong to.
     */
     class _CoreExport ScopedSingletonManager
@@ -89 +85 @@
             static void addManager(ScopedSingletonManager* manager);
 
-            /// Calls preUpdate in all instances of ScopedSingletonManager that are registered in the map.
-            template<ScopeID::Value scope>
-            static void preUpdate(const Clock& time)
-            {
-                assert(Scope<scope>::isActive());
-                for (ManagerMultiMap::iterator it = getManagersByScope().lower_bound(scope); it != getManagersByScope().upper_bound(scope); ++it)
-                    it->second->preUpdate(time);
-            }
-            virtual void preUpdate(const Clock& time) = 0;
-
-            /// Calls postUpdate in all instances of ScopedSingletonManager that are registered in the map.
-            template<ScopeID::Value scope>
-            static void postUpdate(const Clock& time)
-            {
-                assert(Scope<scope>::isActive());
-                for (ManagerMultiMap::iterator it = getManagersByScope().lower_bound(scope); it != getManagersByScope().upper_bound(scope); ++it)
-                    it->second->postUpdate(time);
-            }
-            virtual void postUpdate(const Clock& time) = 0;
-
             static std::map<std::string, ScopedSingletonManager*>& getManagers();
             typedef std::multimap<ScopeID::Value, ScopedSingletonManager*> ManagerMultiMap;
-            static ManagerMultiMap& getManagersByScope();
 
         protected:
@@ -177 +152 @@
         }
 
-        //! Called every frame by the ScopedSingletonManager
-        void preUpdate(const Clock& time)
-        {
-            assert(Scope<scope>::isActive());
-            // assuming T inherits Singleton<T>
-            singletonPtr_->preUpdateSingleton(time);
-        }
-
-        //! Called every frame by the ScopedSingletonManager
-        void postUpdate(const Clock& time)
-        {
-            assert(Scope<scope>::isActive());
-            // assuming T inherits Singleton<T>
-            singletonPtr_->postUpdateSingleton(time);
-        }
-
     private:
         T* singletonPtr_;   ///< Unique instance of the singleton class @a T
@@ -257 +216 @@
         }
 
-        //! Called every frame by the ScopedSingletonManager
-        void preUpdate(const Clock& time)
-        {
-            assert(Scope<scope>::isActive());
-            // assuming T inherits Singleton<T>
-            if (singletonPtr_ != NULL)
-                singletonPtr_->preUpdateSingleton(time);
-        }
-
-        //! Called every frame by the ScopedSingletonManager
-        void postUpdate(const Clock& time)
-        {
-            assert(Scope<scope>::isActive());
-            // assuming T inherits Singleton<T>
-            if (singletonPtr_ != NULL)
-                singletonPtr_->postUpdateSingleton(time);
-        }
-
     private:
         T* singletonPtr_;   ///< Unique instance of the singleton class @a T

code/branches/core7/src/libraries/util/Singleton.h

@@ -146 +146 @@
         }
 
-        //! Update method called by ClassSingletonManager (if used)
-        void preUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->preUpdate(time); }
-        //! Empty update method for the static polymorphism
-        void preUpdate(const Clock& time) { }
-        //! Update method called by ClassSingletonManager (if used)
-        void postUpdateSingleton(const Clock& time) { static_cast<T*>(T::singletonPtr_s)->postUpdate(time); }
-        //! Empty update method for the static polymorphism
-        void postUpdate(const Clock& time) { }
-
     protected:
         //! Constructor sets the singleton instance pointer

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();