Changeset 2948 for code/branches/netp2/src/orxonox/objects

Timestamp:

May 1, 2009, 11:34:14 PM (16 years ago)

Author:

scheusso

Message:

member function calls should work now
argument transfer still untested

Location:

code/branches/netp2/src/orxonox/objects

Files:

• Test.cc (modified) (2 diffs)
• Test.h (modified) (3 diffs)

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

@@ -49 +49 @@
 //   NetworkFunctionBase* NETWORK_FUNCTION_TEST_C = new NetworkFunctionStatic( createFunctor(&Test::printV1), "bla", NETWORK_FUNCTION_POINTER );
   
-  registerStaticNetworkFunction( &Test::printV1, "printV1" );
+  registerStaticNetworkFunction( &Test::printV1 );
+  registerMemberNetworkFunction( Test, checkU1 );
   
   Test* Test::instance_ = 0;
@@ -101 +102 @@
   }
   
+  void Test::tick(float dt)
+  {
+    if(!Core::isMaster())
+      callMemberNetworkFunction( Test, checkU1, this->getObjectID(), 0 );
+//       callMemberNetworkFunction( &Test::printV1, this->getObjectID(), 0);
+  }
+  
   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

@@ -33 +33 @@
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
+#include "Tickable.h"
 
 
@@ -41 +42 @@
 namespace orxonox
 {
-  class _OrxonoxExport Test: public BaseObject, public Synchronisable
+  class _OrxonoxExport Test: public BaseObject, public Synchronisable, public Tickable
   {
     public:
@@ -51 +52 @@
       
       static void call(unsigned int clientID);
+      virtual void tick(float dt);