Changeset 10475 for code/branches/core7/src/libraries/network/NetworkFunctionManager.h

Timestamp:

May 25, 2015, 2:41:57 PM (9 years ago)

Author:

landauf

Message:

refactored the interface of NetworkFunctionManager: maps are better encapsulated now

File:

• code/branches/core7/src/libraries/network/NetworkFunctionManager.h (modified) (2 diffs)

code/branches/core7/src/libraries/network/NetworkFunctionManager.h

@@ -34 +34 @@
 #include <cassert>
 #include <map>
+#include <set>
 
 namespace orxonox
@@ -42 +43 @@
             static NetworkFunctionManager& getInstance();
 
-            void setNetworkID(const std::string& name, uint32_t id);
+            void registerFunction(NetworkFunctionBase* function);
+            void unregisterFunction(NetworkFunctionBase* function);
+
             void destroyAllNetworkFunctions();
 
-            inline std::map<std::string, NetworkFunctionBase*>& getNameMap()
-                { return nameMap_; }
-            inline std::map<NetworkFunctionPointer, NetworkFunctionBase*>& getFunctorMap()
-                { return functorMap_; }
-            inline std::map<uint32_t, NetworkFunctionBase*>& getIdMap()
-                { return idMap_; }
+            inline const std::set<NetworkFunctionBase*>& getAllFunctions()
+                { return functions_; }
 
-            NetworkFunctionBase* getFunction(const NetworkFunctionPointer& p);
-            NetworkFunctionBase* getFunction(uint32_t id);
+            NetworkFunctionBase* getFunctionByName(const std::string& name);
+            NetworkFunctionBase* getFunctionByFunctionPointer(const NetworkFunctionPointer& p);
+            NetworkFunctionBase* getFunctionByNetworkId(uint32_t id);
 
         private:
+            std::set<NetworkFunctionBase*> functions_;
             std::map<std::string, NetworkFunctionBase*> nameMap_;
             std::map<NetworkFunctionPointer, NetworkFunctionBase*> functorMap_;