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

Timestamp:

Feb 1, 2006, 4:40:34 PM (19 years ago)

Author:

patrick

Message:

trunk: merged network branche into trunk

Location:

trunk/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (12 diffs)
• space_ship.h (modified) (2 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -96 +96 @@
   {
     //this->loadModel("models/ships/reap_#.obj");
-    this->loadModel( "models/ships/fighter.obj" );
+    ///HACK this is only for network multiplayer games.
+    if( this->getOwner()%2 == 0)
+    {
+      this->loadModel("models/ships/reap_#.obj");
+      this->toList(OM_GROUP_00);
+    }
+    else
+    {
+      this->loadModel( "models/ships/fighter.obj" );
+      this->toList(OM_GROUP_01);
+    }
   }
 
@@ -275 +285 @@
 {
   Playable::collidesWith(entity, location);
+
+
   if (entity->isA(CL_TURRET_POWER_UP) && entity != ref)
   {
     this->ADDWEAPON();
     ref = entity;
-    }
+  }
+
+  if( entity->isA(CL_PROJECTILE) && entity != ref)
+  {
+    if ( isServer() )
+    {
+      networkCollisionList.push_back( entity->getHealth() );
+      doCollideNetwork( entity->getHealth() );
+    }
+  }
 //  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
 }
@@ -320 +341 @@
 
   // spaceship controlled movement
-  this->calculateVelocity(time);
+  if (this->getOwner() == this->getHostID())
+    this->calculateVelocity(time);
+
 
   Vector move = velocity*time;
@@ -450 +473 @@
   }
 
-  velocity += accel;
+  velocity += accel*time*10;
   //rot.normalize();
   //this->setRelDirSoft(Quaternion(rotVal, rot), 5);
@@ -526 +549 @@
 #define DATA_velocity    5
 #define DATA_playables   6
+#define DATA_collision   7
 
 int SpaceShip::writeBytes( const byte * data, int length, int sender )
@@ -561 +585 @@
         bRollL = (flags & MASK_bRollL) != 0;
         bRollR = (flags & MASK_bRollR) != 0;
-        
+
       }
       else
@@ -603 +627 @@
         SYNCHELP_READ_FLOAT( velocity.y, NWT_SS_VELY );
         SYNCHELP_READ_FLOAT( velocity.z, NWT_SS_VELZ );
-      }      
+      }
       else
         assert(false);
-      
+
       continue;
     }
-    
+
     if ( b == DATA_playables )
     {
@@ -619 +643 @@
         assert(false);
     }
+
+    if ( b == DATA_collision )
+    {
+      int n;
+      float energy;
+      SYNCHELP_READ_INT( n, NWT_SS_CO_N );
+
+      for ( int i = 0; i<n; i++ )
+      {
+        SYNCHELP_READ_FLOAT( energy, NWT_SS_CO_CLID );
+        doCollideNetwork( energy );
+      }
+    }
   }
 
@@ -651 +688 @@
   }
 
-  *reciever = -this->getOwner();
+  *reciever = 0 - this->getOwner();
+  //TODO: implement with SYNCHELP_WRITE_SENT()
   bool sentSomething = false;
 
-  if ( ( this->getHostID()==0 || this->getOwner() == this->getHostID() ) && PNode::needsReadSync() )
-  {
+  if ( PNode::needsReadSync() && ( this->getHostID()==0 || this->getOwner() == this->getHostID() ) )
+  {
+    PRINTF(0)("sending PNode::readSync\n");
     SYNCHELP_WRITE_BYTE( DATA_sync, NWT_SS_B );
     SYNCHELP_WRITE_FKT( PNode::readSync, NWT_SS_PN_SYNC );
+    sentSomething = true;
   }
 
@@ -683 +723 @@
     {
       oldMask = mask;
+      PRINTF(0)("sending mask\n");
       sentSomething = true;
       SYNCHELP_WRITE_BYTE( DATA_flags, NWT_SS_B );
@@ -705 +746 @@
     }
 #define __OFFSET_VEL 0.05
-    if ( fabs( oldVelocity.x - velocity.x ) > __OFFSET_VEL*velocity.x ||
-         fabs( oldVelocity.y - velocity.y ) > __OFFSET_VEL*velocity.y ||
-         fabs( oldVelocity.z - velocity.z ) > __OFFSET_VEL*velocity.z )
-    {
-      oldVelocity = velocity;
-      //PRINTF(0)("SENDING velocity\n");
-      //SYNCHELP_WRITE_BYTE( DATA_velocity, NWT_SS_B );
-      //SYNCHELP_WRITE_FLOAT( velocity.x, NWT_SS_VELX );
-      //SYNCHELP_WRITE_FLOAT( velocity.y, NWT_SS_VELY );
-      //SYNCHELP_WRITE_FLOAT( velocity.z, NWT_SS_VELZ );
-    }
-    
+    if ( fabs( oldVelocity.x - velocity.x ) > __OFFSET_VEL*fabs(oldVelocity.x)+0.1 ||
+         fabs( oldVelocity.y - velocity.y ) > __OFFSET_VEL*fabs(oldVelocity.y)+0.1 ||
+         fabs( oldVelocity.z - velocity.z ) > __OFFSET_VEL*fabs(oldVelocity.z)+0.1 )
+    {
+      oldVelocity.x = velocity.x;
+      oldVelocity.y = velocity.y;
+      oldVelocity.z = velocity.z;
+      PRINTF(0)("SENDING velocity\n");
+      sentSomething = true;
+      SYNCHELP_WRITE_BYTE( DATA_velocity, NWT_SS_B );
+      SYNCHELP_WRITE_FLOAT( velocity.x, NWT_SS_VELX );
+      SYNCHELP_WRITE_FLOAT( velocity.y, NWT_SS_VELY );
+      SYNCHELP_WRITE_FLOAT( velocity.z, NWT_SS_VELZ );
+    }
+
     if ( Playable::needsReadSync() )
     {
       sentSomething = true;
+      PRINTF(0)("SYNCHELP_WRITE_FKT( Playable::readSync, NWT_SS_PL_SYNC )\n");
       SYNCHELP_WRITE_BYTE( DATA_playables, NWT_SS_B );
       SYNCHELP_WRITE_FKT( Playable::readSync, NWT_SS_PL_SYNC );
@@ -725 +770 @@
 
   }
-  
+
   if ( !sentSomething )
-    reciever = 0;
+  {
+    *reciever = 0;
+
+    if ( networkCollisionList.size()>0 )
+    {
+      SYNCHELP_WRITE_BYTE( DATA_collision, NWT_SS_B );
+
+      SYNCHELP_WRITE_INT( networkCollisionList.size(), NWT_SS_CO_N );
+
+      for ( std::list<float>::iterator it = networkCollisionList.begin(); it!=networkCollisionList.end(); it++ )
+      {
+        SYNCHELP_WRITE_FLOAT( *it, NWT_SS_CO_CLID );
+      }
+
+      networkCollisionList.clear();
+    }
+  }
 
   return SYNCHELP_WRITE_N;
 }
 
-
+void SpaceShip::doCollideNetwork( float energy )
+{
+  this->decreaseHealth( energy );
+}
+
+
+

trunk/src/world_entities/space_ships/space_ship.h

@@ -47 +47 @@
     void calculateVelocity(float time);
 
+    void doCollideNetwork( float energy );
+
     // !! temporary !!
     void ADDWEAPON();
@@ -84 +86 @@
     ParticleEmitter*      burstEmitter;
     ParticleSystem*       burstSystem;
+
+    std::list<float>        networkCollisionList;
 };