Changeset 415

Timestamp:

Dec 5, 2007, 6:23:10 PM (17 years ago)

Author:

scheusso

Message:

errorless

Location:

code/branches/FICN/src/network

Files:

• CMakeLists.txt (modified) (1 diff)
• Client.cc (modified) (1 diff)
• ConnectionManager.cc (modified) (2 diffs)
• GameStateManager.h (modified) (1 diff)
• PacketDecoder.cc (modified) (2 diffs)
• PacketGenerator.cc (modified) (4 diffs)
• PacketManager.h (modified) (3 diffs)

code/branches/FICN/src/network/CMakeLists.txt

@@ -6 +6 @@
   ConnectionManager.cc
   GameStateManager.cc
+  GameStateClient.cc
   PacketBuffer.cc
   PacketDecoder.cc

code/branches/FICN/src/network/Client.cc

@@ -149 +149 @@
     id=orxonox::ID(std::string(clid->message));
     if(id!=NULL)
-      id->setNetworkID(clid->classid);
+      id->setNetworkID(clid->clid);
     return;
   }

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

@@ -90 +90 @@
   
   bool ConnectionManager::addPacketAll(ENetPacket *packet){
-    for(int i=0; i<clientVector.size(); i++){
+    for(unsigned int i=0; i<clientVector.size(); i++){
       if(enet_peer_send(&(peerMap.find(clientVector[i])->second), i, packet)!=0)
          return false;
@@ -158 +158 @@
     bool disconnected=false;
     ENetEvent event;
-    for(int i=0; i<clientVector.size(); i++){
+    for(unsigned int i=0; i<clientVector.size(); i++){
       enet_peer_disconnect(&(peerMap.find(clientVector[i])->second), 0);
       while( !disconnected && enet_host_service(server, &event, NETWORK_WAIT_TIMEOUT) > 0){

code/branches/FICN/src/network/GameStateManager.h

@@ -20 +20 @@
 #include "orxonox/core/IdentifierIncludes.h"
 #include "orxonox/core/Iterator.h"
-#include "PacketManager.h"
+#include "PacketTypes.h"
 
 namespace network {
 
-/**
- * This struct defines a gamestate:
- * size: total size of the data in *data
- * data: pointer to the data allocated in the memory
- */
-  struct GameState{
-  int id;
-  int size;
-  unsigned char *data;
-};
 
-/**
- * this struct defines a gamestate:
- * compsize is the size of the compressed data
- * normsize is the size of the uncompressed data
- * data are the gamestates
- */
-  struct GameStateCompressed{
-        int id; 
-        int compsize;
-        int normsize;
-        unsigned char *data;
-  };
 
 /**

code/branches/FICN/src/network/PacketDecoder.cc

@@ -137 +137 @@
         cid->length = ((classid*)(packet->data))->length;
         cid->id = ((classid *)(packet->data))->id;
-        cid->classid = ((classid *)(packet->data))->classid;
+        cid->clid = ((classid *)(packet->data))->clid;
         cid->message = (const char *)malloc(cid->length);
         enet_packet_destroy( packet );
@@ -193 +193 @@
         cout << "id of classid:    " << cid->id << endl;
         cout << "size of classid:  " << cid->length << endl;
-        cout << "ID of classid:    " << cid->classid <<endl;
+        cout << "ID of classid:    " << cid->clid <<endl;
         cout << "data of classid:  " << cid->message <<endl;
 }

code/branches/FICN/src/network/PacketGenerator.cc

@@ -14 +14 @@
 #include <cstring>
 
-using namespace std;
 using namespace network;
 
@@ -23 +22 @@
 ENetPacket* PacketGenerator::acknowledgement( int state, int reliable )
 {
-        cout << "generating new acknowledgement" << endl;
+        std::cout << "generating new acknowledgement" << std::endl;
         ack* ackreq = new ack;
         ackreq->id = ACK;
@@ -35 +34 @@
 ENetPacket* PacketGenerator::mousem( double x, double y, int reliable )
 {
-        cout << "generating new mouse" << endl;
+        std::cout << "generating new mouse" << std::endl;
         mouse* mousemove = new mouse;
         mousemove->id = MOUSE;
@@ -48 +47 @@
 ENetPacket* PacketGenerator::keystrike( char press, int reliable )
 {
-        cout << "generating new keyboard" << endl;
+        std::cout << "generating new keyboard" << std::endl;
         keyboard* key = new keyboard;
         key->id = KEYBOARD;

code/branches/FICN/src/network/PacketManager.h

@@ -4 +4 @@
 #include <string>
 #include <enet/enet.h>
-#include "GameStateManager.h"
+#include "PacketTypes.h"
 
 //enum netowk generaly used to set the type ID of a packet
 namespace network{
   
-enum packet_id {
-        ACK,
-        MOUSE,
-        KEYBOARD,
-        CHAT,
-        GAMESTATE ,
-    CLASSID
-};
+  
+
+
 
 /*
@@ -36 +31 @@
         ENetPacket* clid( int classid, std::string classname, int reliable = ENET_PACKET_FLAG_RELIABLE );
 private:
-        //used to set the bytes in the right order
-        struct ack {
-                int id;
-                int a;
-        };
-
-        struct mouse {
-                int id;
-                double x;
-                double y;
-        };
-
-        struct keyboard {
-                int id;
-                char press;
-        };      
 };
 
@@ -66 +45 @@
         //call this function to decode, it calls the right decoding function below
         bool elaborate( ENetPacket* packet, int clientId );
-        struct classid{
-          int id;
-          int length;
-          int classid;
-          const char *message;
-        };
+        
 private:
-        struct ack {
-                int id;
-                int a;
-        };
-
-        struct mouse {
-                int id;
-                double x;
-                double y;
-        };
-
-        struct keyboard {
-                int id;
-                char press;
-        };
-        //only in this class, not PacketGenerator, used as pattern to put incoming
-        //bytes inside
-        struct chat {
-                int id;
-                const char* message;
-        };