Changeset 10413 for code/branches/core7/src/libraries/core/singleton

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/libraries/core/singleton

Files:

• ScopedSingletonManager.cc (modified) (1 diff)
• ScopedSingletonManager.h (modified) (4 diffs)

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