Changeset 2937 for code/branches/netp2/src/orxonox

Timestamp:

Apr 29, 2009, 4:05:35 PM (16 years ago)

Author:

scheusso

Message:

commit for testing reasons

• added possibility to transfer function calls over network
• made MultiType serialisable
• put serialise functions from synchronisable to util
• … (can't remember )

Location:

code/branches/netp2/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• objects/Test.cc (modified) (3 diffs)
• objects/Test.h (modified) (1 diff)

code/branches/netp2/src/orxonox/OrxonoxPrereqs.h

@@ -159 +159 @@
     class SpawnPoint;
     class TeamSpawnPoint;
+    class Test;
 
     class Spectator;

code/branches/netp2/src/orxonox/objects/Test.cc

@@ -31 +31 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/ConsoleCommand.h"
+#include "network/NetworkFunction.h"
 #include "Test.h"
 
@@ -41 +42 @@
   SetConsoleCommand(Test, printV3, true).accessLevel(AccessLevel::User);
   SetConsoleCommand(Test, printV4, true).accessLevel(AccessLevel::User);
+  SetConsoleCommand(Test, call, true).accessLevel(AccessLevel::User);
+  
+  
+  //void=* aaaaa = copyPtr<sizeof(&Test::printV1)>( &NETWORK_FUNCTION_POINTER, &Test::printV1 );
+  //void* NETWORK_FUNCTION_TEST_B = memcpy(&NETWORK_FUNCTION_POINTER, &a, sizeof(a));
+//   NetworkFunctionBase* NETWORK_FUNCTION_TEST_C = new NetworkFunctionStatic( createFunctor(&Test::printV1), "bla", NETWORK_FUNCTION_POINTER );
+  
+  registerStaticNetworkFunction( &Test::printV1, "printV1" );
   
   Test* Test::instance_ = 0;
@@ -85 +94 @@
     registerVariable ( s4, variableDirection::clientMaster, new NetworkCallback<Test> ( this, &Test::checkS4 ), true );
         }
-
+  
+  void Test::call(unsigned int clientID)
+  {
+    callStaticNetworkFunction( &Test::printV1, clientID );
+  }
+  
   void Test::checkU1(){ COUT(1) << "U1 changed: " << u1 << std::endl; }
   void Test::checkU2(){ COUT(1) << "U2 changed: " << u2 << std::endl; }

code/branches/netp2/src/orxonox/objects/Test.h

@@ -49 +49 @@
       void setConfigValues();
       void registerVariables();
+      
+      void call(unsigned int clientID);