Changeset 1180

Timestamp:

Apr 24, 2008, 6:01:12 PM (17 years ago)

Author:

scheusso

Message:

synchronisation made progress

Location:

code/branches/network3/src

Files:

• network/PacketGenerator.cc (modified) (2 diffs)
• network/Synchronisable.cc (modified) (4 diffs)
• network/Synchronisable.h (modified) (2 diffs)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)

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

@@ -108 +108 @@
     //std::cout << "states->compsize " << states->compsize << std::endl;
     int gid = GAMESTATE; //first assign the correct enet id
-    int totalLen = 4*sizeof( int ) + sizeof(bool) + states->compsize; //calculate the total size of the datastream memory
+    int totalLen = 5*sizeof( int ) + sizeof(bool) + states->compsize; //calculate the total size of the datastream memory
     //std::cout << "totalLen " << totalLen << std::endl;
     unsigned char *data = (unsigned char*)malloc( totalLen ); //allocate the memory for datastream
@@ -120 +120 @@
     memcpy( (void*)(data+5*sizeof( int ) + sizeof(bool)), (const void*)states->data, states->compsize );
     //create an enet packet with the generated bytestream
+    COUT(4) << "PacketGenerator generating totalLen " << totalLen << std::endl;
     ENetPacket *packet = enet_packet_create( data , totalLen, reliable );
     //delete data;

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

@@ -70 +70 @@
   * @param size size of the datatype the variable consists of
   */
-  void Synchronisable::registerVar(const void *var, int size, variableType t){
+  void Synchronisable::registerVar(void *var, int size, variableType t){
     // create temporary synch.Var struct
     synchronisableVariable *temp = new synchronisableVariable;
@@ -155 +155 @@
       switch((*i)->type){
       case DATA:
-        std::memcpy( (void *)(retVal.data+n), (const void*)((*i)->var), (*i)->size);
+        std::memcpy( (void *)(retVal.data+n), (void*)((*i)->var), (*i)->size);
         n+=(*i)->size;
         break;
       case STRING:
-        memcpy( (void *)(retVal.data+n), (const void *)&((*i)->size), sizeof(int) );
+        memcpy( (void *)(retVal.data+n), (void *)&((*i)->size), sizeof(int) );
         n+=sizeof(int);
-        std::memcpy( retVal.data+n, (const void*)( ( (std::string *) (*i)->var)->c_str()), (*i)->size);
+        const char *data = ( ( *(std::string *) (*i)->var).c_str());
+        std::memcpy( retVal.data+n, (void*)data, (*i)->size);
+        COUT(4) << "synchronisable: char: " << (const char *)(retVal.data+n) << " data: " << data << " string: " << *(std::string *)((*i)->var) << std::endl;
         n+=(*i)->size;
         break;
@@ -191 +193 @@
       case STRING:
         (*i)->size = *(int *)data;
+        COUT(4) << "string size: " << (*i)->size << std::endl;
         data+=sizeof(int);
         *((std::string *)((*i)->var)) = std::string((const char*)data);
+        COUT(4) << "synchronisable: char: " << (const char*)data << " string: " << std::string((const char*)data) << std::endl;
         data += (*i)->size;
         break;
@@ -215 +219 @@
         tsize+=sizeof(int);
         (*i)->size=((std::string *)(*i)->var)->length()+1;
+        COUT(4) << "String size: " << (*i)->size << std::endl;
         tsize+=(*i)->size;
         break;

code/branches/network3/src/network/Synchronisable.h

@@ -62 +62 @@
   typedef struct synchronisableVariable{
     int size;
-    const void *var;
+    void *var;
     variableType type;
   }SYNCVAR;
@@ -79 +79 @@
     int classID;
 
-    void registerVar(const void *var, int size, variableType t);
+    void registerVar(void *var, int size, variableType t);
     //  syncData getData();
     syncData getData(unsigned char *mem);

code/branches/network3/src/orxonox/objects/SpaceShip.cc

@@ -158 +158 @@
 
     void SpaceShip::registerAllVariables(){
-      Model::registerAllVariables();