Changeset 405

Timestamp:

Dec 5, 2007, 4:40:46 PM (16 years ago)

Author:

scheusso

Message:

corrected errors

Location:

code/branches/FICN/src/network

Files:

• Client.cc (modified) (4 diffs)
• Client.h (modified) (1 diff)
• GameStateManager.cc (modified) (5 diffs)
• GameStateManager.h (modified) (1 diff)
• PacketDecoder.cc (modified) (2 diffs)
• PacketGenerator.cc (modified) (1 diff)
• PacketManager.h (modified) (2 diffs)
• Synchronisable.cc (modified) (1 diff)

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

@@ -73 +73 @@
    */
   bool Client::sendMouse(double x, double y){
-    ENetEvent event;
     // generate packet and add it to the queue
     if(!client_connection.addPacket(pck_gen.mousem(x, y)))
@@ -87 +86 @@
    */
   bool Client::sendKeyboard(char key_code){
-    ENetEvent event;
     // generate packet and add it to queue
     if(!client_connection.addPacket(pck_gen.keystrike(key_code)))
@@ -115 +113 @@
    */
   bool Client::addKeyboard(char key_code){
-    ENetEvent event;
     // generate packet and add it to queue
     if(client_connection.addPacket(pck_gen.keystrike(key_code)))
@@ -149 +146 @@
   }
   
-  void Client::processGamestate( GameState *data){
+  void Client::processGamestate( GameStateCompressed *data){
     gamestate.loadSnapshot( *data );
     return;

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

@@ -56 +56 @@
   
   // implement data processing functions of PacketDecoder
-  void processGamestate( GameState *data);
+  void processGamestate( GameStateCompressed *data);
   void processClassid(classid *clid);
 

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

@@ -27 +27 @@
  * @return struct of type gamestate containing the size of the whole gamestate and a pointer linking to the flat list
  */
-GameState GameStateManager::getSnapshot(int id)
+GameStateCompressed GameStateManager::getSnapshot(int id)
 {
   //the size of the gamestate
@@ -63 +63 @@
   }
   retval.size=totalsize;
-  return retval;
+  return compress(retval);
 }
 
@@ -70 +70 @@
  * @param state a GameState struct containing the size of the gamestate and a pointer linking to a flat list (returned by getSnapshot)
  */
-bool GameStateManager::loadSnapshot(GameState state)
+bool GameStateManager::loadSnapshot(GameStateCompressed compstate)
 {
+  GameState state = decompress(compstate);
   unsigned char *data=state.data;
   // get the start of the Synchronisable list
@@ -125 +126 @@
 }
 
-GameState GameStateManager::encode(GameState a, GameState b){
+GameStateCompressed GameStateManager::encode(GameState a, GameState b){
   GameState r = diff(a,b);
   return compress(r);
 }
 
-GameState GameStateManager::decode(GameState a, GameState x){
+GameState GameStateManager::decode(GameState a, GameStateCompressed x){
   GameState t = decompress(x);
   return diff(a, t);
@@ -167 +168 @@
 }
 
-GameState GameStateManager::compress(GameState a){
-  a.
-  return a;
+GameStateCompressed GameStateManager::compress(GameState a){
+  //to be implemented
+  GameStateCompressed b;
+  return b;
 }
 
-GameState GameStateManager::decompress(GameState a){
+GameState GameStateManager::decompress(GameStateCompressed a){
   // to be implemented !!!!!!!!!!!!!!
-  return a;
+  GameState b;
+  return b;
 }
 

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

@@ -62 +62 @@
   GameStateManager();
   ~GameStateManager();
-  GameState getSnapshot(int id);
-  bool loadSnapshot(GameState state);
-  GameState encode(GameState a, GameState b);
-  GameState decode(GameState a, GameState x);
+  GameStateCompressed getSnapshot(int id);
+  bool loadSnapshot(GameStateCompressed state);
+  GameStateCompressed encode(GameState a, GameState b);
+  GameState decode(GameState a, GameStateCompressed x);
 private:
   void removeObject(orxonox::Iterator<Synchronisable> &it);
   GameState diff(GameState a, GameState b);
-  GameState compress(GameState a);
-  GameState decompress(GameState a);
+  GameStateCompressed compress(GameState a);
+  GameState decompress(GameStateCompressed a);
 };
 

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

@@ -121 +121 @@
         memcpy( (void*)&(currentState->normsize), (const void*)(data+3*sizeof( int )), sizeof( int ) );
         //since data is not allocated, because it's just a pointer, allocate it with size of gamestatedatastream
-        currentState->data = (unsigned char*)(malloc( currentState->size ));
+        currentState->data = (unsigned char*)(malloc( currentState->compsize ));
         //copy the GameStateCompressed data
         memcpy( (void*)(currentState->data), (const void*)(data+4*sizeof( int )), currentState->compsize );
@@ -186 +186 @@
 {
         cout << "id of GameStateCompressed:   " << data->id << endl;
-        cout << "size of GameStateCompressed: " << data->size << endl;
+        cout << "size of GameStateCompressed: " << data->compsize << endl;
 }
 

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

@@ -72 +72 @@
 ENetPacket* PacketGenerator::gstate( GameStateCompressed* states, int reliable )
 {
-        int* gid; *gid = GAMESTATE; //first assign the correct enet id
-        int totalLen = 3*sizeof( int ) + states->size; //calculate the total size of the datastream memory
+        int* gid = new int; 
+        *gid = GAMESTATE; //first assign the correct enet id
+        int totalLen = 3*sizeof( int ) + states->compsize; //calculate the total size of the datastream memory
         unsigned char* data = (unsigned char*)malloc( totalLen ); //allocate the memory for datastream
         memcpy( (void*)(data), (const void*)gid, sizeof( int ) ); //this is the enet id

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

@@ -33 +33 @@
         ENetPacket* keystrike( char press, int reliable = ENET_PACKET_FLAG_RELIABLE );
         ENetPacket* chatMessage( const char* message, int reliable = ENET_PACKET_FLAG_RELIABLE );
-        ENetPacket* gstate( GameState* states, int reliable = ENET_PACKET_FLAG_RELIABLE );
+        ENetPacket* gstate( GameStateCompressed* states, int reliable = ENET_PACKET_FLAG_RELIABLE );
         ENetPacket* clid( int classid, std::string classname, int reliable = ENET_PACKET_FLAG_RELIABLE );
 private:
@@ -116 +116 @@
         void printKey( keyboard* data );
         void printChat( chat* data );
-        void printGamestate( GameState* data );
+        void printGamestate( GameStateCompressed* data );
     void printClassid( classid *cid);
 };

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

@@ -131 +131 @@
       return false; //there was some problem with registerVar
   }
+  return true;
 }