Changeset 6784 in orxonox.OLD for branches/network/src/world_entities/space_ships

Timestamp:

Jan 26, 2006, 8:03:40 PM (19 years ago)

Author:

rennerc

Message:

sync: added debug feature

Location:

branches/network/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (8 diffs)
• space_ship.h (modified) (1 diff)

branches/network/src/world_entities/space_ships/space_ship.cc

@@ -557 +557 @@
 
   byte b;
-
-  do
-  {
-    SYNCHELP_READ_BYTE( b );
-
-    if ( b == DATA_state /*&& (this->getHostID()!=this->getOwner() || sender==0)*/ )
-    {
-     PRINTF(0)("GOT STATE %d\n", this->getUniqueID());
-     setRequestedSync( false );
-     setIsOutOfSync( false );
-     SYNCHELP_READ_FKT( WorldEntity::writeState );
+  
+  if ( SYNCHELP_READ_REMAINING()>0 && SYNCHELP_READ_NEXTBYTE() == DATA_state /*&& (this->getHostID()!=this->getOwner() || sender==0)*/ )
+  {
+    PRINTF(0)("GOT STATE %d\n", this->getUniqueID());
+    setRequestedSync( false );
+    setIsOutOfSync( false );
+    SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_SS_WE_STATE );
      //SYNCHELP_READ_FLOAT( cycle );
 
-      return SYNCHELP_READ_N;
-    }
-
+    return SYNCHELP_READ_N;
+  }
+  
+  if ( this->getOwner() != this->getHostID() )
+    SYNCHELP_READ_FKT( PNode::writeSync, NWT_SS_PN_SYNC );
+
+  while ( SYNCHELP_READ_REMAINING()>0 )
+  {
+    SYNCHELP_READ_BYTE( b, NWT_SS_B );
 
     //TODO: do not recieve data if you are the owner
@@ -578 +580 @@
     {
       int flags = 0;
-      SYNCHELP_READ_INT( flags );
+      SYNCHELP_READ_INT( flags, NWT_SS_FLAGS );
 
       bUp = (flags & MASK_bUp) != 0;
@@ -595 +597 @@
     if ( b == DATA_mouse /*&& this->getHostID()!=this->getOwner()*/ )
     {
-      SYNCHELP_READ_FLOAT( mouseDir.w );
-      SYNCHELP_READ_FLOAT( mouseDir.v.x );
-      SYNCHELP_READ_FLOAT( mouseDir.v.y );
-      SYNCHELP_READ_FLOAT( mouseDir.v.z );
+      SYNCHELP_READ_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
+      SYNCHELP_READ_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
+      SYNCHELP_READ_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
+      SYNCHELP_READ_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
     }
-  } while( b != 0 );
+  };
 
   /*if ( b == DATA_mouse && this->getHostID()!=this->getOwner() )
@@ -610 +612 @@
 }*/
 
-  if ( this->getOwner() != this->getHostID() )
-    SYNCHELP_READ_FKT( PNode::writeSync );
-
   return SYNCHELP_READ_N;
 }
@@ -636 +635 @@
     PRINTF(0)("SEND STATE %d %d\n", this->getUniqueID(), rec);
 
-    SYNCHELP_WRITE_BYTE( (byte)DATA_state );
-
-    SYNCHELP_WRITE_FKT( WorldEntity::readState );
+    SYNCHELP_WRITE_BYTE( (byte)DATA_state, NWT_SS_B );
+
+    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_SS_WE_STATE );
     //SYNCHELP_WRITE_FLOAT( cycle );
 
@@ -645 +644 @@
 
   *reciever = 0;
+  
+  if ( this->getOwner() == this->getHostID() )
+    SYNCHELP_WRITE_FKT( PNode::readSync, NWT_SS_PN_SYNC );
 
   if ( this->getHostID()==this->getOwner() )
@@ -674 +676 @@
     {
       oldMask = mask;
-      SYNCHELP_WRITE_BYTE( DATA_flags );
-      SYNCHELP_WRITE_INT( mask );
+      SYNCHELP_WRITE_BYTE( DATA_flags, NWT_SS_B );
+      SYNCHELP_WRITE_INT( mask, NWT_SS_FLAGS );
     }
 #define __OFFSET_ROT 0.05
@@ -685 +687 @@
       oldMouseDir = mouseDir;
 
-      SYNCHELP_WRITE_BYTE( DATA_mouse );
-      SYNCHELP_WRITE_FLOAT( mouseDir.w );
-      SYNCHELP_WRITE_FLOAT( mouseDir.v.x );
-      SYNCHELP_WRITE_FLOAT( mouseDir.v.y );
-      SYNCHELP_WRITE_FLOAT( mouseDir.v.z );
+      SYNCHELP_WRITE_BYTE( DATA_mouse, NWT_SS_B );
+      SYNCHELP_WRITE_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
     }
 
   }
 
-  SYNCHELP_WRITE_BYTE( 0 );
-
-
-  if ( this->getOwner() == this->getHostID() )
-    SYNCHELP_WRITE_FKT( PNode::readSync );
-
   return SYNCHELP_WRITE_N;
 }
+
+int SpaceShip::writeState(const byte* data, int length, int sender)
+{
+  SYNCHELP_READ_BEGIN();
+  
+  return SYNCHELP_READ_N;
+}
+
+int SpaceShip::readState(byte* data, int maxLength )
+{
+  SYNCHELP_WRITE_BEGIN();
+  
+  return SYNCHELP_WRITE_N;
+}
+
+int SpaceShip::writeSync(const byte* data, int length, int sender)
+{
+  SYNCHELP_READ_BEGIN();
+  
+  return SYNCHELP_READ_N;
+}
+
+int SpaceShip::readSync(byte* data, int maxLength )
+{
+  SYNCHELP_WRITE_BEGIN();
+  
+  return SYNCHELP_WRITE_N;
+}

branches/network/src/world_entities/space_ships/space_ship.h

@@ -44 +44 @@
     virtual int       writeBytes(const byte* data, int length, int sender);
     virtual int       readBytes(byte* data, int maxLength, int * reciever);
+    
+    int       writeState(const byte* data, int length, int sender);
+    int       readState(byte* data, int maxLength );
+    int       writeSync(const byte* data, int length, int sender);
+    int       readSync(byte* data, int maxLength );