Changeset 1170 for code/branches/network3/src

Timestamp:

Apr 24, 2008, 3:06:20 PM (17 years ago)

Author:

scheusso

Message:

changed synchronisable (size of data wont be sended anymore

Location:

code/branches/network3/src/network

Files:

• CMakeFiles/CMakeDirectoryInformation.cmake (modified) (1 diff)
• CMakeFiles/network.dir/DependInfo.cmake (modified) (1 diff)
• CMakeFiles/network.dir/build.make (modified) (1 diff)
• CMakeFiles/network.dir/depend.internal (modified) (2 diffs)
• CMakeFiles/network.dir/depend.make (modified) (2 diffs)
• CMakeFiles/network.dir/flags.make (modified) (1 diff)
• CMakeFiles/network.dir/link.txt (modified) (1 diff)
• Synchronisable.cc (modified) (4 diffs)

code/branches/network3/src/network/CMakeFiles/CMakeDirectoryInformation.cmake

@@ -18 +18 @@
   "src/."
   "src/orxonox"
-  "src/tolua"
+  "src/util/tolua"
   )
 SET(CMAKE_CXX_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})

code/branches/network3/src/network/CMakeFiles/network.dir/DependInfo.cmake

@@ -8 +8 @@
   "/home/scheusso/orxonox/network/src/network/ClientConnection.cc"
   "/home/scheusso/orxonox/network/src/network/CMakeFiles/network.dir/ClientConnection.o"
+  "/home/scheusso/orxonox/network/src/network/ConnectionManager.cc"
+  "/home/scheusso/orxonox/network/src/network/CMakeFiles/network.dir/ConnectionManager.o"
   "/home/scheusso/orxonox/network/src/network/ClientInformation.cc"
   "/home/scheusso/orxonox/network/src/network/CMakeFiles/network.dir/ClientInformation.o"
-  "/home/scheusso/orxonox/network/src/network/ConnectionManager.cc"
-  "/home/scheusso/orxonox/network/src/network/CMakeFiles/network.dir/ConnectionManager.o"
   "/home/scheusso/orxonox/network/src/network/GameStateManager.cc"
   "/home/scheusso/orxonox/network/src/network/CMakeFiles/network.dir/GameStateManager.o"

code/branches/network3/src/network/CMakeFiles/network.dir/build.make

@@ -349 +349 @@
 bin/lib/libnetwork.so: bin/lib/libcore.so
 bin/lib/libnetwork.so: bin/lib/libutil.so
-bin/lib/libnetwork.so: bin/lib/libtolualib.a
 bin/lib/libnetwork.so: /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib/liblua.so
 bin/lib/libnetwork.so: /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib/liblualib.so

code/branches/network3/src/network/CMakeFiles/network.dir/depend.internal

@@ -280 +280 @@
  src/./util/Sleep.h
  src/./util/UtilPrereqs.h
- src/orxonox/OrxonoxPlatform.h
-src/network/CMakeFiles/network.dir/ClientInformation.o
- /home/scheusso/orxonox/network/src/network/ClientInformation.cc
- /home/scheusso/orxonox/network/src/network/ClientInformation.h
- /home/scheusso/orxonox/network/src/network/NetworkPrereqs.h
- /usr/pack/enet-2007-sd/include/enet/callbacks.h
- /usr/pack/enet-2007-sd/include/enet/enet.h
- /usr/pack/enet-2007-sd/include/enet/list.h
- /usr/pack/enet-2007-sd/include/enet/protocol.h
- /usr/pack/enet-2007-sd/include/enet/types.h
- /usr/pack/enet-2007-sd/include/enet/unix.h
- /usr/pack/enet-2007-sd/include/enet/win32.h
  src/orxonox/OrxonoxPlatform.h
 src/network/CMakeFiles/network.dir/ConnectionManager.o
@@ -549 +537 @@
  src/./util/UtilPrereqs.h
  src/orxonox/OrxonoxPlatform.h
+src/network/CMakeFiles/network.dir/ClientInformation.o
+ /home/scheusso/orxonox/network/src/network/ClientInformation.cc
+ /home/scheusso/orxonox/network/src/network/ClientInformation.h
+ /home/scheusso/orxonox/network/src/network/NetworkPrereqs.h
+ /usr/pack/enet-2007-sd/include/enet/callbacks.h
+ /usr/pack/enet-2007-sd/include/enet/enet.h
+ /usr/pack/enet-2007-sd/include/enet/list.h
+ /usr/pack/enet-2007-sd/include/enet/protocol.h
+ /usr/pack/enet-2007-sd/include/enet/types.h
+ /usr/pack/enet-2007-sd/include/enet/unix.h
+ /usr/pack/enet-2007-sd/include/enet/win32.h
+ src/orxonox/OrxonoxPlatform.h
 src/network/CMakeFiles/network.dir/GameStateManager.o
  /home/scheusso/orxonox/network/src/network/ClientInformation.h

code/branches/network3/src/network/CMakeFiles/network.dir/depend.make

@@ -280 +280 @@
 src/network/CMakeFiles/network.dir/ClientConnection.o: src/./util/UtilPrereqs.h
 src/network/CMakeFiles/network.dir/ClientConnection.o: src/orxonox/OrxonoxPlatform.h
-
-src/network/CMakeFiles/network.dir/ClientInformation.o: src/network/ClientInformation.cc
-src/network/CMakeFiles/network.dir/ClientInformation.o: src/network/ClientInformation.h
-src/network/CMakeFiles/network.dir/ClientInformation.o: src/network/NetworkPrereqs.h
-src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/callbacks.h
-src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/enet.h
-src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/list.h
-src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/protocol.h
-src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/types.h
-src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/unix.h
-src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/win32.h
-src/network/CMakeFiles/network.dir/ClientInformation.o: src/orxonox/OrxonoxPlatform.h
 
 src/network/CMakeFiles/network.dir/ConnectionManager.o: src/network/ClientInformation.h
@@ -549 +537 @@
 src/network/CMakeFiles/network.dir/ConnectionManager.o: src/orxonox/OrxonoxPlatform.h
 
+src/network/CMakeFiles/network.dir/ClientInformation.o: src/network/ClientInformation.cc
+src/network/CMakeFiles/network.dir/ClientInformation.o: src/network/ClientInformation.h
+src/network/CMakeFiles/network.dir/ClientInformation.o: src/network/NetworkPrereqs.h
+src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/callbacks.h
+src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/enet.h
+src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/list.h
+src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/protocol.h
+src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/types.h
+src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/unix.h
+src/network/CMakeFiles/network.dir/ClientInformation.o: /usr/pack/enet-2007-sd/include/enet/win32.h
+src/network/CMakeFiles/network.dir/ClientInformation.o: src/orxonox/OrxonoxPlatform.h
+
 src/network/CMakeFiles/network.dir/GameStateManager.o: src/network/ClientInformation.h
 src/network/CMakeFiles/network.dir/GameStateManager.o: src/network/GameStateManager.cc

code/branches/network3/src/network/CMakeFiles/network.dir/flags.make

@@ -2 +2 @@
 # Generated by "Unix Makefiles" Generator, CMake Version 2.4
 
-CXX_FLAGS = -Dnetwork_EXPORTS  -O2 -Wall -g -ggdb -fPIC -I/usr/pack/ogre-1.4.5-sd/include -I/usr/pack/ogre-1.4.5-sd/include/OGRE -I/usr/pack/ois-1.0-sd/include/OIS -I/usr/pack/ois-1.0-sd/include -I/usr/pack/enet-2007-sd/include -I/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include -I/usr/pack/openal-0.0.8-cl/include -I/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/include -I/usr/pack/lua-5.0.3-sd/include -I/home/scheusso/orxonox/network/src/. -I/home/scheusso/orxonox/network/src/orxonox -I/home/scheusso/orxonox/network/src/tolua  
+CXX_FLAGS = -Dnetwork_EXPORTS  -O2 -Wall -g -ggdb -fPIC -I/usr/pack/ogre-1.4.5-sd/include -I/usr/pack/ogre-1.4.5-sd/include/OGRE -I/usr/pack/ois-1.0-sd/include/OIS -I/usr/pack/ois-1.0-sd/include -I/usr/pack/enet-2007-sd/include -I/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include -I/usr/pack/openal-0.0.8-cl/include -I/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/include -I/usr/pack/lua-5.0.3-sd/include -I/home/scheusso/orxonox/network/src/. -I/home/scheusso/orxonox/network/src/orxonox -I/home/scheusso/orxonox/network/src/util/tolua  
 

code/branches/network3/src/network/CMakeFiles/network.dir/link.txt

@@ -1 @@
-g++-4.1.1  -fPIC  -O2 -Wall -g -ggdb  --no-undefined -shared -Wl,-soname,libnetwork.so -o ../../bin/lib/libnetwork.so "CMakeFiles/network.dir/Client.o" "CMakeFiles/network.dir/ClientConnection.o" "CMakeFiles/network.dir/ClientInformation.o" "CMakeFiles/network.dir/ConnectionManager.o" "CMakeFiles/network.dir/GameStateManager.o" "CMakeFiles/network.dir/GameStateClient.o" "CMakeFiles/network.dir/PacketBuffer.o" "CMakeFiles/network.dir/PacketDecoder.o" "CMakeFiles/network.dir/PacketGenerator.o" "CMakeFiles/network.dir/Server.o" "CMakeFiles/network.dir/Synchronisable.o" -L/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib -L/usr/pack/ois-1.0-sd/i686-debian-linux3.1/lib -L/usr/pack/enet-2007-sd/i686-debian-linux3.1/lib/libenet.a -L/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib -L/home/scheusso/orxonox/network/bin/lib -L/usr/pack/enet-2007-sd/i686-debian-linux3.1/lib -L/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib -lz -Wl,-Bstatic -lenet -Wl,-Bdynamic -lboost_thread-gcc41-mt -lcore -lutil -lOgreMain -Wl,-Bstatic -ltolualib -Wl,-Bdynamic -llua -llualib -lOIS -Wl,-rpath,/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib:/usr/pack/ois-1.0-sd/i686-debian-linux3.1/lib:/usr/pack/enet-2007-sd/i686-debian-linux3.1/lib/libenet.a:/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib:/home/scheusso/orxonox/network/bin/lib:/usr/pack/enet-2007-sd/i686-debian-linux3.1/lib:/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib 
+g++-4.1.1  -fPIC  -O2 -Wall -g -ggdb  --no-undefined -shared -Wl,-soname,libnetwork.so -o ../../bin/lib/libnetwork.so "CMakeFiles/network.dir/Client.o" "CMakeFiles/network.dir/ClientConnection.o" "CMakeFiles/network.dir/ClientInformation.o" "CMakeFiles/network.dir/ConnectionManager.o" "CMakeFiles/network.dir/GameStateManager.o" "CMakeFiles/network.dir/GameStateClient.o" "CMakeFiles/network.dir/PacketBuffer.o" "CMakeFiles/network.dir/PacketDecoder.o" "CMakeFiles/network.dir/PacketGenerator.o" "CMakeFiles/network.dir/Server.o" "CMakeFiles/network.dir/Synchronisable.o" -L/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib -L/usr/pack/ois-1.0-sd/i686-debian-linux3.1/lib -L/usr/pack/enet-2007-sd/i686-debian-linux3.1/lib/libenet.a -L/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib -L/home/scheusso/orxonox/network/bin/lib -L/usr/pack/enet-2007-sd/i686-debian-linux3.1/lib -L/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib -lz -Wl,-Bstatic -lenet -Wl,-Bdynamic -lboost_thread-gcc41-mt -lcore -lOIS -lutil -lOgreMain -llua -llualib -Wl,-rpath,/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib:/usr/pack/ois-1.0-sd/i686-debian-linux3.1/lib:/usr/pack/enet-2007-sd/i686-debian-linux3.1/lib/libenet.a:/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib:/home/scheusso/orxonox/network/bin/lib:/usr/pack/enet-2007-sd/i686-debian-linux3.1/lib:/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib 

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

@@ -151 +151 @@
     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) );
-      n+=sizeof(int);
       switch((*i)->type){
       case DATA:
@@ -159 +157 @@
         break;
       case STRING:
+        memcpy( (void *)(retVal.data+n), (const void *)&((*i)->size), sizeof(int) );
+        n+=sizeof(int);
         std::memcpy( retVal.data+n, (const void*)( ( (std::string *) (*i)->var)->c_str()), (*i)->size);
         n+=(*i)->size;
@@ -182 +182 @@
     for(i=syncList->begin(); i!=syncList->end(); i++){
       COUT(5) << "Synchronisable: element size: " << (*i)->size << " type: " << (*i)->type << std::endl;
-      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
+      switch((*i)->type){
+      case DATA:
+        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;
+      }
     }
     return true;
@@ -212 +208 @@
       switch((*i)->type){
       case DATA:
-        tsize+=sizeof(int);
         tsize+=(*i)->size;
         break;