Changeset 1082 for code/branches/network/src

Timestamp:

Apr 16, 2008, 5:14:58 PM (16 years ago)

Author:

scheusso

Message:

added a lot of debug output

Location:

code/branches/network/src

Files:

• network/Synchronisable.cc (modified) (7 diffs)
• network/Synchronisable.h (modified) (1 diff)
• orxonox/objects/Model.cc (modified) (1 diff)

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

@@ -27 +27 @@
     datasize=0;
     objectID=idCounter++;
+    syncList = new std::list<synchronisableVariable *>;
     //registerAllVariables();
   }
@@ -49 +50 @@
     datasize+=sizeof(int)+size;
     //std::cout << "push temp to syncList (at the bottom) " << datasize << std::endl;
-    syncList.push_back(temp);
+    COUT(5) << "objectID: " << objectID << " this: " << this << " name: " << this->getIdentifier()->getName() << " networkID: " << this->getIdentifier()->getNetworkID() << std::endl;
+    syncList->push_back(temp);
   }
 
@@ -65 +67 @@
   //   int totalsize=0;
   //   //figure out size of data to be allocated
-  //   for(i=syncList.begin(); i!=syncList.end(); i++){
+  //   for(i=syncList->begin(); i!=syncList->end(); i++){
   //     // increase size (size of variable and size of size of variable ;)
   //     if(i->type == STRING)
@@ -81 +83 @@
   //   //CHANGED: REMOVED DECLARATION int n=0 FROM LOOP
   //   int n=0;
-  //   for(i=syncList.begin(); n<totalsize && i!=syncList.end(); i++){
+  //   for(i=syncList->begin(); n<totalsize && i!=syncList->end(); i++){
   //     std::memcpy(retVal.data+n, (const void*)(i->size), sizeof(int));
   //     n+=sizeof(int);
@@ -117 +119 @@
     // copy to location
     int n=0;
-    for(i=syncList.begin(); n<datasize && i!=syncList.end(); ++i){
+    for(i=syncList->begin(); n<datasize && i!=syncList->end(); ++i){
       //(std::memcpy(retVal.data+n, (const void*)(&(i->size)), sizeof(int));
       memcpy( (void *)(retVal.data+n), (const void *)&((*i)->size), sizeof(int) );
@@ -143 +145 @@
     unsigned char *data=vars.data;
     std::list<synchronisableVariable *>::iterator i;
-    if(syncList.empty()){
+    if(syncList->empty()){
       COUT(4) << "Synchronisable::updateData syncList is empty" << std::endl;
       return false;
     }
     COUT(5) << "Synchronisable: synchronising data" << std::endl;
-    i=syncList.begin();
-    COUT(5) << "element size: " << (*syncList.begin())->size << std::endl;
+    i=syncList->begin();
+    COUT(5) << "element size: " << (*syncList->begin())->size << std::endl;
     COUT(5) << "*i.size" << (*i)->size << std::endl;
-    for(; i!=syncList.end(); i++){
+    for(; i!=syncList->end(); i++){
       if(*(int *)data==(*i)->size || (*i)->type==STRING){
         switch((*i)->type){
@@ -179 +181 @@
     int tsize=0;
     std::list<synchronisableVariable *>::iterator i;
-    for(i=syncList.begin(); i!=syncList.end(); i++){
+    for(i=syncList->begin(); i!=syncList->end(); i++){
       switch((*i)->type){
       case DATA:

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

@@ -63 +63 @@
     /*  bool removeObject(Iterator<Synchronisable> it);*/
 
-    std::list<synchronisableVariable *> syncList;
+    std::list<synchronisableVariable *> *syncList;
     int datasize;
   };

code/branches/network/src/orxonox/objects/Model.cc

@@ -95 +95 @@
 
     void Model::registerAllVariables(){
-      WorldEntity::registerAllVariables();
+//       WorldEntity::registerAllVariables();
+      COUT(5) << "registering new meshsrc with size: " << meshSrc_.length()+1 << std::endl;
       registerVar(&meshSrc_, meshSrc_.length() + 1, network::STRING);
     }