Changeset 6660 in orxonox.OLD

Timestamp:

Jan 23, 2006, 3:38:45 PM (18 years ago)

Author:

patrick

Message:

network: some more nodes connected to the NetworkStream no sync yet

Location:

branches/network/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• lib/network/network_game_manager.cc (modified) (1 diff)
• lib/network/network_manager.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (4 diffs)
• lib/network/network_stream.h (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (1 diff)

branches/network/src/lib/coord/p_node.cc

@@ -697 +697 @@
     PNode::nullParent = new PNode(NULL, PNODE_PARENT_MODE_DEFAULT | PNODE_REPARENT_TO_NULL);
     PNode::nullParent->setName("NullParent");
+    PNode::nullParent->setSynchronized(true);
   }
   return PNode::nullParent;

branches/network/src/lib/network/network_game_manager.cc

@@ -247 +247 @@
       s->setUniqueID( newUniqueID++ );
       s->setOwner( 0 );
-      this->networkStream->connectSynchronizeable( *s );
       return b;
     }

branches/network/src/lib/network/network_manager.cc

@@ -183 +183 @@
  void NetworkManager::debug()
 {
+  PRINT(0)("=================Network::debug()=========\n");
   this->defaultSyncStream->debug();
+  PRINT(0)("===========================================\n");
 }

branches/network/src/lib/network/network_stream.cc

@@ -53 +53 @@
 }
 
+
 NetworkStream::NetworkStream(IPaddress& address)
 {
@@ -60 +61 @@
   this->networkProtocol = new NetworkProtocol();
   this->connectionMonitor = new ConnectionMonitor();
-
-  Handshake* hs = new Handshake(false);
-  hs->setUniqueID( 0 );
-  this->handshakes.push_back(hs);
-  this->connectSynchronizeable(*hs);
-  PRINTF(0)("NetworkStream: %s\n", hs->getName());
   this->maxConnections = 1;
 }
@@ -136 +131 @@
 
 
+void NetworkStream::startHandshake()
+{
+  Handshake* hs = new Handshake(false);
+  hs->setUniqueID( 0 );
+  this->handshakes.push_back(hs);
+  //this->connectSynchronizeable(*hs);
+  PRINTF(0)("NetworkStream: %s\n", hs->getName());
+}
+
+
 void NetworkStream::connectSynchronizeable(Synchronizeable& sync)
 {
@@ -426 +431 @@
 void NetworkStream::debug()
 {
-  PRINT(0)("=================NetworkStream::debug()====\n");
-  PRINT(0)(" Host ID: %i\n", this->myHostId);
-
-  PRINT(0)(" Got %i connected Synchronizeables:\n", this->synchronizeables.size());
+  if( this->isServer())
+    PRINT(0)(" Host ist Server with ID: %i\n", this->myHostId);
+  else
+    PRINT(0)(" Host ist Client with ID: %i\n", this->myHostId);
+
+  PRINT(0)(" Got %i connected Synchronizeables, showing active Syncs:\n", this->synchronizeables.size());
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
-    PRINT(0)("  Synchronizeable of class: %s::%s, with unique ID: %i, Synchronize: %i\n", (*it)->getClassName(), (*it)->getName(), (*it)->getUniqueID(), (*it)->beSynchronized());
-  }
-
+    if( (*it)->beSynchronized() == true)
+      PRINT(0)("  Synchronizeable of class: %s::%s, with unique ID: %i, Synchronize: %i\n", (*it)->getClassName(), (*it)->getName(),
+               (*it)->getUniqueID(), (*it)->beSynchronized());
+  }
   PRINT(0)(" Maximal Connections: %i\n", this->maxConnections);
-  PRINT(0)("===========================================\n");
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/network/src/lib/network/network_stream.h

@@ -41 +41 @@
 
     void createNetworkGameManager();
+    void startHandshake();
 
     void connectSynchronizeable(Synchronizeable& sync);

branches/network/src/world_entities/weapons/weapon.cc

@@ -103 +103 @@
   this->energyWidget = NULL;
   this->energyLoadedWidget = NULL;
+
+  // set this object to be synchronized over network
+  this->setSynchronized(true);
 }