Changeset 7631 in orxonox.OLD for branches/network/src/subprojects

Timestamp:

May 17, 2006, 8:28:23 AM (19 years ago)

Author:

rennerc

Message:

synchronisation should work now

Location:

branches/network/src/subprojects/network

Files:

• network_unit_test.cc (modified) (2 diffs)
• simple_sync.cc (modified) (3 diffs)
• simple_sync.h (modified) (1 diff)

branches/network/src/subprojects/network/network_unit_test.cc

@@ -259 +259 @@
   
   SimpleSync* ss = new SimpleSync("Server");
+  ss->setSynchronized( true );
 
   
@@ -292 +293 @@
   netMan->establishConnection("localhost", 9999);
   
-  SimpleSync* ss = new SimpleSync("SimpleSync");
-  netMan->connectSynchronizeable( *ss );
-
+//  SimpleSync* ss = new SimpleSync("SimpleSync");
+//  ss->setSynchronized( true );
+//  netMan->connectSynchronizeable( *ss );
+
+  SimpleSync * ss = NULL;
+  
   for(;;)
   {
     netMan->synchronize();
+    ss = dynamic_cast<SimpleSync*>(ClassList::getObject( "Server", CL_SIMPLE_SYNC ) );
     SDL_Delay(1000);
-    ss->debug();
+    if (ss)
+      ss->debug();
   }
 

branches/network/src/subprojects/network/simple_sync.cc

@@ -22 +22 @@
 #include "simple_sync.h"
 
+#include "class_id.h"
+#include "fast_factory.h"
+#include "lib/util/loading/factory.h"
+
 #include "debug.h"
+
+CREATE_FACTORY(SimpleSync, CL_SIMPLE_SYNC);
 
 
@@ -31 +37 @@
 {
   setName( name );
+  this->setClassID( CL_SIMPLE_SYNC, "SimpleSync" );
   in = 0;
   out = 1;
@@ -49 +56 @@
 }
 
+SimpleSync::SimpleSync( const TiXmlElement * root )
+{
+  setName( "" );
+  this->setClassID( CL_SIMPLE_SYNC, "SimpleSync" );
+  in = 0;
+  out = 1;
+  id = this->registerVarId( new SynchronizeableInt( &in, &out, "var", PERMISSION_ALL ) );
+}
 
 
+

branches/network/src/subprojects/network/simple_sync.h

@@ -14 +14 @@
   public:
     SimpleSync( std::string name);
+    SimpleSync(const TiXmlElement* root = NULL);
     virtual ~SimpleSync();