Changeset 6737 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jan 25, 2006, 9:29:45 PM (18 years ago)

Author:

patrick

Message:

trunk: merged network back to trunk

File:

• trunk/src/world_entities/space_ships/space_ship.cc (modified) (3 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -289 +289 @@
   this->weaponAction();
 
-  if( xMouse != 0 || yMouse != 0)
+  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner()==this->getHostID() )
    {
     if (xMouse > controlVelocityX) xMouse = controlVelocityX;
@@ -532 +532 @@
 
   byte b;
-  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 );
-    //SYNCHELP_READ_FLOAT( cycle );
-
-    return SYNCHELP_READ_N;
-  }
-
-
-  if ( b == DATA_flags /*&& this->getHostID()!=this->getOwner()*/ )
-  {
-    int flags = 0;
-    SYNCHELP_READ_INT( flags );
-
-    bUp = (flags & MASK_bUp) != 0;
-    bDown = (flags & MASK_bDown) != 0;
-    bLeft = (flags & MASK_bLeft) != 0;
-    bRight = (flags & MASK_bRight) != 0;
-    bAscend = (flags & MASK_bAscend) != 0;
-    bDescend = (flags & MASK_bDescend) != 0;
-    bFire = (flags & MASK_bFire) != 0;
-    bRollL = (flags & MASK_bRollL) != 0;
-    bRollR = (flags & MASK_bRollR) != 0;
-
-  }
+
+  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 );
+     //SYNCHELP_READ_FLOAT( cycle );
+
+      return SYNCHELP_READ_N;
+    }
+
+
+    //TODO: do not recieve data if you are the owner
+    if ( b == DATA_flags /*&& this->getHostID()!=this->getOwner()*/ )
+    {
+      int flags = 0;
+      SYNCHELP_READ_INT( flags );
+
+      //bUp = (flags & MASK_bUp) != 0;
+      //bDown = (flags & MASK_bDown) != 0;
+      //bLeft = (flags & MASK_bLeft) != 0;
+      //bRight = (flags & MASK_bRight) != 0;
+      //bAscend = (flags & MASK_bAscend) != 0;
+      //bDescend = (flags & MASK_bDescend) != 0;
+      //bFire = (flags & MASK_bFire) != 0;
+      //bRollL = (flags & MASK_bRollL) != 0;
+      //bRollR = (flags & MASK_bRollR) != 0;
+
+    }
+
+    //TODO: do not recieve data if you are the owner
+    if ( b == DATA_mouse /*&& this->getHostID()!=this->getOwner()*/ )
+    {
+      float asdf;
+      SYNCHELP_READ_FLOAT( asdf );
+      SYNCHELP_READ_FLOAT( asdf );
+      SYNCHELP_READ_FLOAT( asdf );
+      SYNCHELP_READ_FLOAT( asdf );
+      //SYNCHELP_READ_FLOAT( mouseDir.w );
+      //SYNCHELP_READ_FLOAT( mouseDir.v.x );
+      //SYNCHELP_READ_FLOAT( mouseDir.v.y );
+      //SYNCHELP_READ_FLOAT( mouseDir.v.z );
+    }
+  } while( b != 0 );
 
   /*if ( b == DATA_mouse && this->getHostID()!=this->getOwner() )
@@ -638 +657 @@
       SYNCHELP_WRITE_INT( mask );
     }
-    else
-    {
-      SYNCHELP_WRITE_BYTE( 0 );
-    }
-
-    /*if ( oldxMouse != xMouse || oldyMouse != yMouse )
-    {
-      oldxMouse = xMouse;
-      oldyMouse = yMouse;
+#define __OFFSET_ROT 0.05
+    if ( fabs( oldMouseDir.w - mouseDir.w ) > __OFFSET_ROT ||
+         fabs( oldMouseDir.v.x - mouseDir.v.x ) > __OFFSET_ROT ||
+         fabs( oldMouseDir.v.y - mouseDir.v.y ) > __OFFSET_ROT ||
+         fabs( oldMouseDir.v.z - mouseDir.v.z ) > __OFFSET_ROT )
+    {
+      oldMouseDir = mouseDir;
+
       SYNCHELP_WRITE_BYTE( DATA_mouse );
-      SYNCHELP_WRITE_FLOAT( xMouse );
-      SYNCHELP_WRITE_FLOAT( yMouse );
-      SYNCHELP_WRITE_FLOAT( mouseSensitivity );
-      SYNCHELP_WRITE_FLOAT( cycle );
-    }*/
-  }
-  else
-  {
-    SYNCHELP_WRITE_BYTE( 0 );
-  }
+      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( 0 );
+
 
   if ( this->getOwner() == this->getHostID() )