Changeset 565 for code/branches/FICN/src/network

Timestamp:

Dec 17, 2007, 10:39:12 AM (17 years ago)

Author:

scheusso

Message:

added class BaseEntity:

• !!! please inherit from this class in future (instead of Entity/WorldEntity/BaseObject):
• this class is able to be synchronised over the network (or at least created so far)

Location:

code/branches/FICN/src/network

Files:

• Client.cc (modified) (1 diff)
• Synchronisable.cc (modified) (7 diffs)
• Synchronisable.h (modified) (5 diffs)

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

@@ -127 +127 @@
     if(!isConnected)
       return false;
-    if(client_connection.addPacket(pck_gen.chatMessage( message.c_str() )));
+    if(client_connection.addPacket(pck_gen.chatMessage( message.c_str() )))
       return client_connection.sendPackets();
     // send packets

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

@@ -26 +26 @@
   datasize=0;
   objectID=idCounter++;
-  //registerAllVariables();
+//   registerAllVariables();
 }
 
@@ -41 +41 @@
  * @param size size of the datatype the variable consists of
  */
-void Synchronisable::registerVar(const void *var, int size){
+void Synchronisable::registerVar(const void *var, int size, variableType t){
   // create temporary synch.Var struct
-  synchronisableVariable temp={size, var};
+  synchronisableVariable temp={size, var, t};
   // increase datasize
   datasize+=sizeof(int)+size;
@@ -65 +65 @@
   for(i=syncList.begin(); i!=syncList.end(); i++){
     // increase size (size of variable and size of size of variable ;)
-    totalsize+=sizeof(int)+i->size;
+    if(i->type == STRING)
+      totalsize+=sizeof(int)+((std::string *)i->var)->length()+1;
+    else
+      totalsize+=sizeof(int)+i->size;
   }
   syncData retVal;
@@ -77 +80 @@
   int n=0;
   for(i=syncList.begin(); n<totalsize && i!=syncList.end(); i++){
-        //CHANGED: i->size TO (const void*)(&(i->size)) memcpy WANTS A CONST VOID* SO CONVERT INT TO CONST VOID*
     std::memcpy(retVal.data+n, (const void*)(i->size), sizeof(int));
     n+=sizeof(int);
-    //CHANGED: i->var TO (const void*)(&(i->var)) SINCE var IS A POINTER, NO & BEFORE i
-    std::memcpy(retVal.data+n, (const void*)(i->var), i->size);
-    n+=i->size;
+    switch(i->type){
+    case STRING:
+      std::memcpy(retVal.data+n, (const void *)(((std::string *)i->var)->c_str()), ((std::string *)i->var)->length()+1);
+      n+=((std::string *)i->var)->length()+1;
+      break;
+    case DATA:
+      std::memcpy(retVal.data+n, ((const void*)i->var), i->size);
+      n+=i->size;
+      break;
+    }
   }
   return retVal;
@@ -107 +116 @@
   int n=0;
   for(i=syncList.begin(); n<datasize && i!=syncList.end(); i++){
-        //CHANGED: i->size TO (const void*)(&(i->size)) memcpy WANTS A CONST VOID* SO CONVERT INT TO CONST VOID*
     std::memcpy(retVal.data+n, (const void*)(i->size), sizeof(int));
     n+=sizeof(int);
-    //CHANGED: i->var TO (const void*)(&(i->var)) SINCE var IS A POINTER, NO & BEFORE i
-    std::memcpy(retVal.data+n, (const void*)(i->var), i->size);
-    n+=i->size;
+    switch(i->type){
+      case DATA:
+        std::memcpy(retVal.data+n, (const void*)(i->var), i->size);
+        n+=i->size;
+        break;
+      case STRING:
+        std::memcpy(retVal.data+n, (const void*)(((std::string *)i->var)->c_str()), ((std::string *)i->var)->length()+1);
+        n+=((std::string *) i->var)->length()+1;
+        break;
+    }
   }
   return retVal;
@@ -126 +141 @@
   std::list<synchronisableVariable>::iterator i;
   for(i=syncList.begin(); i!=syncList.end(); i++){
-    if((int)*data==i->size){
-      data+=sizeof(int);
-      //CHANGED: THIS FROM i->var TO (void*)i->var SINCE var IS A CONST VOID* AND memcpy NEEDS A VOID* AS FIRST ARGUMENT
-      memcpy((void*)i->var, data, i->size);
-      data+=i->size;
+    if((int)*data==i->size || i->type==STRING){
+      switch(i->type){
+      case DATA:
+        data+=sizeof(int);
+        memcpy((void*)i->var, data, i->size);
+        data+=i->size;
+        break;
+      case STRING:
+        i->size = (int)*data;
+        data+=sizeof(int);
+        *((std::string *)i->var) = std::string((const char*)data);
+        data += i->size;
+        break;
+      }
     } else
       return false; //there was some problem with registerVar
@@ -142 +166 @@
  */
 int Synchronisable::getSize(){
-  return datasize;
+  int tsize=0;
+  std::list<synchronisableVariable>::iterator i;
+  for(i=syncList.begin(); i!=syncList.end(); i++){
+    switch(i->type){
+    case DATA:
+      tsize+=i->size;
+      break;
+    case STRING:
+      tsize+=((std::string *)i->var)->length()+1;
+      break;
+    }
+  }
+  return tsize;
 }
 

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

@@ -15 +15 @@
 #include <list>
 #include <iostream>
+#include <string>
 
 #include "orxonox/core/CoreIncludes.h"
@@ -21 +22 @@
 namespace network {
 
+enum variableType{
+  DATA,
+  STRING,
+};
   
 struct syncData{
@@ -32 +37 @@
   int size;
   const void *var;
+  variableType type;
 }SYNCVAR;
 
@@ -40 +46 @@
  * @author Oliver Scheuss
 */
-class Synchronisable : public orxonox::OrxonoxClass{
+class Synchronisable : virtual public orxonox::OrxonoxClass{
 public:
-  Synchronisable();
 
   virtual ~Synchronisable();
@@ -48 +53 @@
   int classID;
     
-  void registerVar(const void *var, int size);
+  void registerVar(const void *var, int size, variableType t);
   syncData getData();
   syncData getData(unsigned char *mem);
   int getSize();
   bool updateData(syncData vars);
-  virtual void registerAllVariables() = 0;
-
+  virtual void registerAllVariables()=0;
+  virtual bool create(){return true;}
+protected:
+  Synchronisable();
 private:
 /*  bool removeObject(Iterator<Synchronisable> it);*/