Changeset 6634 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Jan 21, 2006, 1:18:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

Location:

trunk/src/world_entities/space_ships

Files:

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

trunk/src/world_entities/space_ships/space_ship.cc

@@ -40 +40 @@
 
 #include "plane.h"
+
+#include "state.h"
+#include "player.h"
 
 
@@ -272 +275 @@
 void SpaceShip::tick (float time)
 {
+  this->getWeaponManager()->tick(time);
+  // weapon system manipulation
+  this->weaponAction();
+
+//   if( this != State::getPlayer()->getControllable())
+//     return;
 
   // spaceship controlled movement
@@ -293 +302 @@
 
   //hoover effect
-  cycle += time;
-  this->shiftCoor(Vector(0,1,0)*cos(this->cycle*2.0)*0.02);
+  //cycle += time;
+  //this->shiftCoor(Vector(0,1,0)*cos(this->cycle*2.0)*0.02);
 
   //readjust
@@ -311 +320 @@
   this->shiftCoor (move);
 
-  this->getWeaponManager()->tick(time);
-  // weapon system manipulation
-  this->weaponAction();
+
 }
 
@@ -508 +515 @@
   SYNCHELP_READ_BYTE( b );
 
-  if ( b == DATA_state && this->getHostID()!=this->getOwner() )
-  {
+  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 );
-  }
-
-  if ( b == DATA_flags && this->getHostID()!=this->getOwner() )
-  {
-    int flags;
+    //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;
-  }
-
-  if ( b == DATA_mouse && this->getHostID()!=this->getOwner() )
+    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;
+
+  }
+
+  /*if ( b == DATA_mouse && this->getHostID()!=this->getOwner() )
   {
     SYNCHELP_READ_FLOAT( xMouse );
@@ -538 +550 @@
     SYNCHELP_READ_FLOAT( mouseSensitivity );
     SYNCHELP_READ_FLOAT( cycle );
-  }
+}*/
+
+  if ( this->getOwner() != this->getHostID() )
+    SYNCHELP_READ_FKT( PNode::writeSync );
 
   return SYNCHELP_READ_N;
@@ -549 +564 @@
   SYNCHELP_WRITE_BEGIN();
 
-  if ( isOutOfSync() && !requestedSync() && this->getHostID()!=this->getOwner() )
+  if ( isOutOfSync() && !requestedSync() /*&& this->getHostID()!=this->getOwner()*/ )
   {
     (NetworkGameManager::getInstance())->sync( this->getUniqueID(), this->getOwner() );
     setRequestedSync( true );
+    PRINTF(0)("REQUESTED STATE %d\n", this->getUniqueID());
   }
 
@@ -560 +576 @@
     *reciever = rec;
 
+    PRINTF(0)("SEND STATE %d %d\n", this->getUniqueID(), rec);
+
     SYNCHELP_WRITE_BYTE( (byte)DATA_state );
 
     SYNCHELP_WRITE_FKT( WorldEntity::readState );
-    SYNCHELP_WRITE_FLOAT( cycle );
+    //SYNCHELP_WRITE_FLOAT( cycle );
 
     return SYNCHELP_WRITE_N;
   }
-
 
   *reciever = 0;
@@ -592 +609 @@
       mask |= MASK_bRollR;
 
-    static int oldMask = mask+1; //so it is different the first time!
-    static float oldxMouse = xMouse + 1.0;
-    static float oldyMouse = yMouse + 1.0;
+
+    //static float oldxMouse = xMouse + 1.0;
+    //static float oldyMouse = yMouse + 1.0;
 
     if ( mask != oldMask )
@@ -602 +619 @@
       SYNCHELP_WRITE_INT( mask );
     }
-
-    if ( oldxMouse != xMouse || oldyMouse != yMouse )
+    else
+    {
+      SYNCHELP_WRITE_BYTE( 0 );
+    }
+
+    /*if ( oldxMouse != xMouse || oldyMouse != yMouse )
     {
       oldxMouse = xMouse;
@@ -612 +633 @@
       SYNCHELP_WRITE_FLOAT( mouseSensitivity );
       SYNCHELP_WRITE_FLOAT( cycle );
-    }
-  }
+    }*/
+  }
+  else
+  {
+    SYNCHELP_WRITE_BYTE( 0 );
+  }
+
+  if ( this->getOwner() == this->getHostID() )
+    SYNCHELP_WRITE_FKT( PNode::readSync );
 
   return SYNCHELP_WRITE_N;

trunk/src/world_entities/space_ships/space_ship.h

@@ -75 +75 @@
     float                 airViscosity;
 
+    int oldMask;
+
 };