Changeset 7793 in orxonox.OLD

Timestamp:

May 24, 2006, 12:22:20 PM (18 years ago)

Author:

rennerc

Message:

fixed da bug

Location:

branches/network/src/lib

Files:

• coord/p_node.cc (modified) (2 diffs)
• network/synchronizeable.cc (modified) (2 diffs)
• network/synchronizeable_var/synchronizeable_vector.cc (modified) (2 diffs)

branches/network/src/lib/coord/p_node.cc

@@ -1093 +1093 @@
   if ( std::find( id.begin(), id.end(), relCoordinate_handle ) != id.end() )
   {
+    if ( getLeafClassID() == CL_SPACE_SHIP )
+    {
+      PRINTF(0)("SET COOR\n");
+      relCoordinate_write.debug();
+    }
     setRelCoor( relCoordinate_write );
   }
@@ -1098 +1103 @@
   if ( std::find( id.begin(), id.end(), relDirection_handle ) != id.end() )
   {
+    if ( getLeafClassID() == CL_SPACE_SHIP )
+    {
+      PRINTF(0)("SET DIR\n");
+      relDirection_write.debug();
+    }
     setRelDir( relDirection_write );
   }

branches/network/src/lib/network/synchronizeable.cc

@@ -136 +136 @@
   while ( it != sentStates[userId].end() && (*it)->stateId != fromStateId )
     it++;
+  
+//  if ( getLeafClassID() == CL_SPACE_SHIP )
+//  {
+//    PRINTF(0)("getStateDiff:SpaceShip from: %d stateId: %d\n", (it == sentStates[userId].end())?-1:fromStateId, stateId);
+//  }
 
   if ( it == sentStates[userId].end() )
@@ -257 +262 @@
   while ( it != recvStates[userId].end() && (*it)->stateId != fromStateId )
     it++;
+  
+//  if ( getLeafClassID() == CL_SPACE_SHIP )
+//  {
+//    PRINTF(0)("setStateDiff:SpaceShip from: %d stateId: %d\n", (it == recvStates[userId].end())?-1:fromStateId, stateId);
+//  }
 
   if ( it == recvStates[userId].end() )

branches/network/src/lib/network/synchronizeable_var/synchronizeable_vector.cc

@@ -79 +79 @@
   int res;
   int n = 0;
+  
+  Vector oldVec = *vPtrOut;
 
   res = Converter::byteArrayToFloat( buf + n, &x );
@@ -93 +95 @@
 
   *vPtrOut = Vector( x, y, z );
+  
+  setHasChanged( !(*vPtrOut == oldVec) );
 
   assert( n == 3*FLOATSIZE );