Changeset 10470

Timestamp:

May 25, 2015, 12:25:29 PM (9 years ago)

Author:

landauf

Message:

NetworkFunctionBase doesn't have to inherit from Listable: there's a list of all instances stored in NetworkFunctionManager stored anyway

Location:

code/branches/core7/src/libraries/network

Files:

• NetworkFunction.cc (modified) (4 diffs)
• NetworkFunction.h (modified) (2 diffs)
• packet/FunctionIDs.cc (modified) (1 diff)

code/branches/core7/src/libraries/network/NetworkFunction.cc

@@ -29 +29 @@
 #include "NetworkFunction.h"
 #include "NetworkFunctionManager.h"
-#include "core/CoreIncludes.h"
 
 namespace orxonox
@@ -36 +35 @@
   std::map<uint32_t, NetworkMemberFunctionBase*> NetworkMemberFunctionBase::idMap_;
 
-  // no suitable factory for NetworkFunctionBase (and children), so we declare it abstract
-  RegisterAbstractClass(NetworkFunctionBase).inheritsFrom<Listable>();
-  RegisterAbstractClass(NetworkFunctionStatic).inheritsFrom<NetworkFunctionBase>();
-  RegisterAbstractClass(NetworkMemberFunctionBase).inheritsFrom<NetworkFunctionBase>();
-
   NetworkFunctionBase::NetworkFunctionBase(const std::string& name)
   {
-      RegisterObject(NetworkFunctionBase);
-
     static uint32_t networkID = 0;
     this->networkID_ = networkID++;
@@ -59 +51 @@
     NetworkFunctionBase(name)
   {
-    RegisterObject(NetworkFunctionStatic);
-
     this->functor_ = functor;
     NetworkFunctionStatic::getFunctorMap()[p] = this;
@@ -82 +72 @@
     NetworkFunctionBase(name)
   {
-    RegisterObject(NetworkMemberFunctionBase);
-
     this->functorMap_[p] = this;
     this->idMap_[ this->getNetworkID() ] = this;

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

@@ -37 +37 @@
 #include <string>
 
-#include "core/object/Listable.h"
-#include "core/class/Identifier.h"
 #include "core/command/Functor.h"
 #include "FunctionCallManager.h"
@@ -69 +67 @@
 
 
-class _NetworkExport NetworkFunctionBase: virtual public Listable {
+class _NetworkExport NetworkFunctionBase {
   public:
     NetworkFunctionBase(const std::string& name);
-    ~NetworkFunctionBase();
+    virtual ~NetworkFunctionBase();
 
     virtual void        setNetworkID(uint32_t id)       { this->networkID_ = id; }

code/branches/core7/src/libraries/network/packet/FunctionIDs.cc

@@ -56 +56 @@
 
   //calculate total needed size (for all strings and integers)
-  ObjectList<NetworkFunctionBase>::iterator it;
-  for(it = ObjectList<NetworkFunctionBase>::begin(); it; ++it)
+  std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionManager::getNameMap();
+  std::map<std::string, NetworkFunctionBase*>::iterator it;
+  for (it = map.begin(); it != map.end(); ++it)
   {
-    const std::string& functionname = it->getName();
-    networkID = it->getNetworkID();
+    const std::string& functionname = it->second->getName();
+    networkID = it->second->getNetworkID();
     // now push the network id and the classname to the stack
     tempQueue.push( std::pair<unsigned int, std::string>(networkID, functionname) );