Changeset 10465 for code/branches/core7

Timestamp:

May 25, 2015, 10:24:56 AM (10 years ago)

Author:

landauf

Message:

moved macro ans helperfunction from NetworkFunction.h to NetworkFunctionIncludes.h

Location:

code/branches/core7/src

Files:

• libraries/network/NetworkFunction.h (modified) (2 diffs)
• libraries/network/NetworkFunctionIncludes.h (added)
• modules/docking/Dock.cc (modified) (1 diff)
• modules/notifications/NotificationDispatcher.cc (modified) (1 diff)
• modules/objects/Script.cc (modified) (1 diff)
• modules/pickup/PickupManager.cc (modified) (1 diff)
• orxonox/Test.cc (modified) (1 diff)
• orxonox/gamestates/GSRoot.cc (modified) (1 diff)
• orxonox/infos/GametypeInfo.cc (modified) (1 diff)
• orxonox/interfaces/NotificationListener.cc (modified) (1 diff)
• orxonox/worldentities/ControllableEntity.cc (modified) (1 diff)

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

@@ -36 +36 @@
 #include <map>
 #include <string>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/static_assert.hpp>
 
 #include "core/object/Listable.h"
@@ -237 +235 @@
 }
 
-template<class T> inline void* registerStaticNetworkFunctionFct( T ptr, const std::string& name )
-{
-  BOOST_STATIC_ASSERT( sizeof(T)<=sizeof(NetworkFunctionPointer) ); // if this fails your compiler uses bigger pointers for static functions than defined above
-  NetworkFunctionPointer destptr;
-  copyPtr( ptr, destptr );
-  new NetworkFunctionStatic( createFunctor(ptr), name, destptr );
-  return 0;
 }
 
-template<class T, class PT> inline void* registerMemberNetworkFunctionFct( PT ptr, const std::string& name )
-{
-  BOOST_STATIC_ASSERT( sizeof(PT)<=sizeof(NetworkFunctionPointer) ); // if this fails your compiler uses bigger pointers for a specific kind of member functions than defined above
-  NetworkFunctionPointer destptr;
-  copyPtr( ptr, destptr );
-  new NetworkMemberFunction<T>( createFunctor(ptr), name, destptr );
-  return 0;
-}
-
-#define registerStaticNetworkFunction( functionPointer ) \
-  static void* BOOST_PP_CAT( NETWORK_FUNCTION_, __UNIQUE_NUMBER__ ) = registerStaticNetworkFunctionFct( functionPointer, #functionPointer );
-#define registerMemberNetworkFunction( class, function ) \
-  static void* BOOST_PP_CAT( NETWORK_FUNCTION_##class, __UNIQUE_NUMBER__ ) = registerMemberNetworkFunctionFct<class>( &class::function, #class "_" #function);
-  // call it with functionPointer, clientID, args
-#define callStaticNetworkFunction( functionPointer, ...) \
-  { \
-    NetworkFunctionPointer p1; \
-    copyPtr( functionPointer, p1 ); \
-    FunctionCallManager::addCallStatic(NetworkFunctionStatic::getFunction(p1)->getNetworkID(), __VA_ARGS__); \
-  }
-  // call it with class, function, objectID, clientID, args
-#define callMemberNetworkFunction( class, function, objectID, ...) \
-  { \
-    NetworkFunctionPointer p1; \
-    copyPtr( &class::function, p1 ); \
-    FunctionCallManager::addCallMember(NetworkMemberFunctionBase::getFunction(p1)->getNetworkID(), objectID, __VA_ARGS__); \
-  }
-
-
-}
-
 #endif /* _NetworkFunction_H__ */

code/branches/core7/src/modules/docking/Dock.cc

@@ -38 +38 @@
 #include "core/GUIManager.h"
 #include "core/command/ConsoleCommandIncludes.h"
-#include "network/NetworkFunction.h"
+#include "network/NetworkFunctionIncludes.h"
 
 #include "infos/HumanPlayer.h"

code/branches/core7/src/modules/notifications/NotificationDispatcher.cc

@@ -37 +37 @@
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"
-#include "network/NetworkFunction.h"
+#include "network/NetworkFunctionIncludes.h"
 #include "network/Host.h"
 

code/branches/core7/src/modules/objects/Script.cc

@@ -37 +37 @@
 #include "core/XMLPort.h"
 #include "network/Host.h"
-#include "network/NetworkFunction.h"
+#include "network/NetworkFunctionIncludes.h"
 
 #include "PlayerManager.h"

code/branches/core7/src/modules/pickup/PickupManager.cc

@@ -40 +40 @@
 #include "core/singleton/ScopedSingletonIncludes.h"
 #include "network/Host.h"
-#include "network/NetworkFunction.h"
+#include "network/NetworkFunctionIncludes.h"
 
 #include "infos/PlayerInfo.h"

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

@@ -30 +30 @@
 #include "core/config/ConfigValueIncludes.h"
 #include "core/command/ConsoleCommandIncludes.h"
-#include "network/NetworkFunction.h"
+#include "network/NetworkFunctionIncludes.h"
 #include "Test.h"
 #include "util/MultiType.h"

code/branches/core7/src/orxonox/gamestates/GSRoot.cc

@@ -34 +34 @@
 #include "core/GameMode.h"
 #include "core/command/ConsoleCommandIncludes.h"
-#include "network/NetworkFunction.h"
+#include "network/NetworkFunctionIncludes.h"
 #include "tools/Timer.h"
 #include "tools/interfaces/Tickable.h"

code/branches/core7/src/orxonox/infos/GametypeInfo.cc

@@ -37 +37 @@
 #include "core/GameMode.h"
 #include "network/Host.h"
-#include "network/NetworkFunction.h"
+#include "network/NetworkFunctionIncludes.h"
 #include "util/Convert.h"
 

code/branches/core7/src/orxonox/interfaces/NotificationListener.cc

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "network/Host.h"
-#include "network/NetworkFunction.h"
+#include "network/NetworkFunctionIncludes.h"
 #include "util/SubString.h"
 

code/branches/core7/src/orxonox/worldentities/ControllableEntity.cc

@@ -36 +36 @@
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "network/NetworkFunction.h"
+#include "network/NetworkFunctionIncludes.h"
 
 #include "Scene.h"