Changeset 6672 in orxonox.OLD for branches/network/src/lib

Timestamp:

Jan 24, 2006, 3:02:19 PM (18 years ago)

Author:

patrick

Message:

network: now every entity gets a network uniqueID

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (5 diffs)
• network_game_manager.h (modified) (1 diff)
• network_manager.cc (modified) (1 diff)
• network_manager.h (modified) (2 diffs)
• network_stream.cc (modified) (1 diff)
• network_stream.h (modified) (1 diff)
• synchronizeable.cc (modified) (1 diff)

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

@@ -53 +53 @@
   this->setClassID(CL_NETWORK_GAME_MANAGER, "NetworkGameManager");
 
-  newUniqueID = MAX_CONNECTIONS + 2;
-
   hasRequestedWorld = false;
   this->setSynchronized(true);
@@ -215 +213 @@
   if ( this->isServer() )
   {
-    if ( newUniqueID < 0 )
+    if ( NetworkManager::getInstance()->getNewUniqueID() < 0 )
     {
       PRINTF(1)("Cannot create entity! There are no more uniqueIDs left!\n");
@@ -221 +219 @@
     }
 
-    return this->executeCreateEntity( classID, newUniqueID++, owner );
+    return this->executeCreateEntity( classID, NetworkManager::getInstance()->getNewUniqueID(), owner );
   }
   else
@@ -240 +238 @@
   if ( this->isServer() )
   {
-    if ( newUniqueID < 0 )
+    if ( NetworkManager::getInstance()->getNewUniqueID() < 0 )
     {
       PRINTF(1)("Cannot create entity! There are no more uniqueIDs left!\n");
@@ -258 +256 @@
     {
       Synchronizeable * s = dynamic_cast<Synchronizeable*>(b);
-      s->setUniqueID( newUniqueID++ );
+      s->setUniqueID( NetworkManager::getInstance()->getNewUniqueID() );
       s->setOwner( 0 );
       // all entities created via this function are added automaticaly to the synchronizeable list

branches/network/src/lib/network/network_game_manager.h

@@ -143 +143 @@
 
 
-
   private:
     std::vector<clientBuffer>     outBuffer;
     //clientBuffer                  allOutBuffer;
     static NetworkGameManager*    singletonRef;
-
-    int                           newUniqueID;
     bool                          hasRequestedWorld;
 };

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

@@ -54 +54 @@
 
   this->hostID = -1;
+  this->newUniqueID = MAX_CONNECTIONS + 2;
   this->bGameServer = false;
 

branches/network/src/lib/network/network_manager.h

@@ -53 +53 @@
     inline NetworkStream* getDefaultSyncStream() { return this->defaultSyncStream; }
 
+    /** @returns the next uniqueID free for an object */
+    inline int getNewUniqueID() { return this->newUniqueID++; }
+
     void debug();
 
@@ -67 +70 @@
     int                              hostID;                  //!< The Host-ID of the Manager
     bool                             bGameServer;             //!< true if it is a server
+    int                              newUniqueID;
 
 };

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

@@ -448 +448 @@
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+int NetworkStream::getSyncCount()
+{
+  int n = 0;
+  for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
+    if( (*it)->beSynchronized() == true)
+      ++n;
+
+  //return synchronizeables.size();
+  return n;
+}
+
+
+
+
+
+

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

@@ -56 +56 @@
     inline SynchronizeableList::const_iterator getSyncBegin(){ return synchronizeables.begin(); }
     inline SynchronizeableList::const_iterator getSyncEnd(){ return synchronizeables.end(); }
-    inline int getSyncCount(){ return synchronizeables.size(); }
+    int getSyncCount();
 
     inline bool isUserIdActive( int userID ) { if (userID>=networkSockets.size()) return false; else return networkSockets[userID]!=NULL; }

branches/network/src/lib/network/synchronizeable.cc

@@ -43 +43 @@
 
   this->bSynchronize = false;
+
   NetworkStream* nd = NetworkManager::getInstance()->getDefaultSyncStream();
   assert(nd != NULL);
   nd->connectSynchronizeable(*this);
+  this->setUniqueID(NetworkManager::getInstance()->getNewUniqueID());
 }