Changeset 888 for code/branches/network/src/network

Timestamp:

Mar 13, 2008, 3:25:10 PM (16 years ago)

Author:

scheusso

Message:

sdfsdf

Location:

code/branches/network/src/network

Files:

• Client.h (modified) (3 diffs)
• ConnectionManager.cc (modified) (1 diff)
• ConnectionManager.h (modified) (2 diffs)
• Server.h (modified) (2 diffs)

code/branches/network/src/network/Client.h

@@ -16 +16 @@
 #include <string>
 
+#include "orxonox/objects/Tickable.h"
+
 #include "NetworkPrereqs.h"
 #include "ClientConnection.h"
@@ -21 +23 @@
 #include "GameStateClient.h"
 //#include "NetworkFrameListener.h"
+
 
 
@@ -32 +35 @@
   *
   */
-  class _NetworkExport Client : PacketDecoder{
+  class _NetworkExport Client : PacketDecoder, public orxonox::Tickable{
   public:
     Client();

code/branches/network/src/network/ConnectionManager.cc

@@ -281 +281 @@
   }
 
+  
+  
+  void ConnectionManager::addClientsObjectID( int clientID, int objectID ) {
+    COUT(4) << "ship of client: " << clientID << ": " << objectID << " mapped" << std::endl;
+    clientsShip.insert( std::make_pair( clientID, objectID ) );
+  }
+
+  int ConnectionManager::getClientsShipID( int clientID ) {
+    return clientsShip[clientID];
+  }
+
+  int ConnectionManager::getObjectsClientID( int objectID ) {
+    std::map<int, int>::iterator iter = clientsShip.begin();
+    while( iter != clientsShip.end() ) {
+      if( iter->second == objectID ) return iter->first;
+    }
+    return -99;
+  }
+
+  void ConnectionManager::deleteClientIDReg( int clientID ) {
+    clientsShip.erase( clientID );
+  }
+
+  void ConnectionManager::deleteObjectIDReg( int objectID ) {
+    std::map<int, int>::iterator iter = clientsShip.begin();
+    while( iter != clientsShip.end() ) {
+      if( iter->second == objectID ) break; 
+    }
+    clientsShip.erase( iter->first );
+  }
+  
 }

code/branches/network/src/network/ConnectionManager.h

@@ -14 +14 @@
 
 #include <string>
+#include <map>
 // enet library for networking support
 #include <enet/enet.h>
@@ -73 +74 @@
     bool quit; // quit-variable (communication with threads)
     ClientInformation *head_;
+    
+    //functions to map what object every clients uses
+    std::map<int, int> clientsShip;
+    void addClientsObjectID( int clientID, int objectID );
+    int getClientsShipID( int clientID );
+    int getObjectsClientID( int objectID );
+    void deleteClientIDReg( int clientID );
+    void deleteObjectIDReg( int objectID );
   };
 

code/branches/network/src/network/Server.h

@@ -16 +16 @@
 #include <string>
 
+#include "orxonox/objects/Tickable.h"
+
 #include "PacketManager.h"
 #include "NetworkPrereqs.h"
+
+
 
 namespace network
@@ -25 +29 @@
   * It implements all functions necessary for a Server
   */
-  class _NetworkExport Server : public PacketDecoder{
+  class _NetworkExport Server : public PacketDecoder, public orxonox::Tickable{
   public:
     Server();