Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/planet.h

    r6634 r6959  
    2222  virtual ~Planet();
    2323
    24   void loadParams(const TiXmlElement* root);
     24  virtual void loadParams(const TiXmlElement* root);
    2525
    2626  void setSize(float size);

  • trunk/src/world_entities/playable.cc

    r6871 r6959  
    2828
    2929
     30#include "dot_emitter.h"
     31#include "sprite_particles.h"
     32
     33
    3034Playable::Playable()
    3135{
    … …  
    4347
    4448  this->setSynchronized(true);
     49
     50  this->score = 0;
     51  this->oldScore = 0;
     52
     53
     54  this->emitter = new DotEmitter(100, 5, M_2_PI);
     55  this->emitter->setParent(this);
     56  this->emitter->setSpread(M_PI, M_PI);
     57  this->emitter->setEmissionRate(300.0);
     58  this->emitter->setEmissionVelocity(50.0);
     59
     60  this->explosionParticles = new SpriteParticles(1000);
     61  this->explosionParticles->setName("LaserExplosionParticles");
     62  this->explosionParticles->setLifeSpan(.5, .3);
     63  this->explosionParticles->setRadius(0.0, 10.0);
     64  this->explosionParticles->setRadius(.5, 6.0);
     65  this->explosionParticles->setRadius(1.0, 3.0);
     66  this->explosionParticles->setColor(0.0, 1,1,0,.9);
     67  this->explosionParticles->setColor(0.5, .8,.8,0,.5);
     68  this->explosionParticles->setColor(1.0, .8,.8,.7,.0);
    4569}
    4670
    … …  
    101125void Playable::collidesWith(WorldEntity* entity, const Vector& location)
    102126{
    103   if (entity->isA(CL_PROJECTILE))
     127  if (entity->isA(CL_PROJECTILE) && !State::isOnline() )
    104128    this->decreaseHealth(entity->getHealth());
    105129
    106130  // EXTREME HACK
    107131  if (this->getHealth() == 0.0f)
    108     this->deactivateNode();
     132  {
     133    //this->deactivateNode();
     134    this->emitter->setSystem(explosionParticles);
     135    this->setAbsCoor(0, 0, 0);
     136    //this->setAbsDir(Vector(1,0,0), 0);
     137    this->emitter->setSystem(NULL);
     138  }
    109139}
    110140
    … …  
    248278}
    249279
     280#define DATA_FLAGS    1
     281#define DATA_SCORE    2
     282
    250283#define FLAGS_bFire   1
    251284
    … …  
    281314bool Playable::needsReadSync( )
    282315{
     316  //if ( score != oldScore )
     317  //  return true;
     318
    283319  byte flags = 0;
    284320

  • trunk/src/world_entities/playable.h

    r6871 r6959  
    1515
    1616class Weapon;
    17 
     17class DotEmitter;
    1818class Player;
     19class SpriteParticles;
    1920
    2021//! Basic controllable WorldEntity
    … …  
    5859    int       readSync(byte* data, int maxLength );
    5960    bool      needsReadSync();
     61   
     62    inline void setScore( int score ) { this->score = score; }
     63    inline int  getScore() { return this->score; }
    6064
    6165  protected:
    … …  
    7377    bool                  bFire;              //!< If the Ship is firing.
    7478    int                   oldFlags;           //!< Used for synchronisation
     79   
     80    int                   score;
     81    int                   oldScore;
    7582
     83    //HACK: explosion emitter
     84    DotEmitter*           emitter;
     85    SpriteParticles*      explosionParticles;
    7686};
    7787

  • trunk/src/world_entities/space_ships/space_ship.cc

    r6947 r6959  
    9696  {
    9797    //this->loadModel("models/ships/reap_#.obj");
    98     this->loadModel( "models/ships/fighter.obj" );
     98    ///HACK this is only for network multiplayer games.
     99    if( this->getOwner()%2 == 0)
     100    {
     101      this->loadModel("models/ships/reap_#.obj");
     102      this->toList(OM_GROUP_00);
     103    }
     104    else
     105    {
     106      this->loadModel( "models/ships/fighter.obj" );
     107      this->toList(OM_GROUP_01);
     108    }
    99109  }
    100110
    … …  
    275285{
    276286  Playable::collidesWith(entity, location);
     287
     288
    277289  if (entity->isA(CL_TURRET_POWER_UP) && entity != ref)
    278290  {
    279291    this->ADDWEAPON();
    280292    ref = entity;
    281     }
     293  }
     294
     295  if( entity->isA(CL_PROJECTILE) && entity != ref)
     296  {
     297    if ( isServer() )
     298    {
     299      networkCollisionList.push_back( entity->getHealth() );
     300      doCollideNetwork( entity->getHealth() );
     301    }
     302  }
    282303//  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
    283304}
    … …  
    320341
    321342  // spaceship controlled movement
    322   this->calculateVelocity(time);
     343  if (this->getOwner() == this->getHostID())
     344    this->calculateVelocity(time);
     345
    323346
    324347  Vector move = velocity*time;
    … …  
    450473  }
    451474
    452   velocity += accel;
     475  velocity += accel*time*10;
    453476  //rot.normalize();
    454477  //this->setRelDirSoft(Quaternion(rotVal, rot), 5);
    … …  
    526549#define DATA_velocity    5
    527550#define DATA_playables   6
     551#define DATA_collision   7
    528552
    529553int SpaceShip::writeBytes( const byte * data, int length, int sender )
    … …  
    561585        bRollL = (flags & MASK_bRollL) != 0;
    562586        bRollR = (flags & MASK_bRollR) != 0;
    563        
     587
    564588      }
    565589      else
    … …  
    603627        SYNCHELP_READ_FLOAT( velocity.y, NWT_SS_VELY );
    604628        SYNCHELP_READ_FLOAT( velocity.z, NWT_SS_VELZ );
    605       }     
     629      }
    606630      else
    607631        assert(false);
    608      
     632
    609633      continue;
    610634    }
    611    
     635
    612636    if ( b == DATA_playables )
    613637    {
    … …  
    619643        assert(false);
    620644    }
     645
     646    if ( b == DATA_collision )
     647    {
     648      int n;
     649      float energy;
     650      SYNCHELP_READ_INT( n, NWT_SS_CO_N );
     651
     652      for ( int i = 0; i<n; i++ )
     653      {
     654        SYNCHELP_READ_FLOAT( energy, NWT_SS_CO_CLID );
     655        doCollideNetwork( energy );
     656      }
     657    }
    621658  }
    622659
    … …  
    651688  }
    652689
    653   *reciever = -this->getOwner();
     690  *reciever = 0 - this->getOwner();
     691  //TODO: implement with SYNCHELP_WRITE_SENT()
    654692  bool sentSomething = false;
    655693
    656   if ( ( this->getHostID()==0 || this->getOwner() == this->getHostID() ) && PNode::needsReadSync() )
    657   {
     694  if ( PNode::needsReadSync() && ( this->getHostID()==0 || this->getOwner() == this->getHostID() ) )
     695  {
     696    PRINTF(0)("sending PNode::readSync\n");
    658697    SYNCHELP_WRITE_BYTE( DATA_sync, NWT_SS_B );
    659698    SYNCHELP_WRITE_FKT( PNode::readSync, NWT_SS_PN_SYNC );
     699    sentSomething = true;
    660700  }
    661701
    … …  
    683723    {
    684724      oldMask = mask;
     725      PRINTF(0)("sending mask\n");
    685726      sentSomething = true;
    686727      SYNCHELP_WRITE_BYTE( DATA_flags, NWT_SS_B );
    … …  
    705746    }
    706747#define __OFFSET_VEL 0.05
    707     if ( fabs( oldVelocity.x - velocity.x ) > __OFFSET_VEL*velocity.x ||
    708          fabs( oldVelocity.y - velocity.y ) > __OFFSET_VEL*velocity.y ||
    709          fabs( oldVelocity.z - velocity.z ) > __OFFSET_VEL*velocity.z )
    710     {
    711       oldVelocity = velocity;
    712       //PRINTF(0)("SENDING velocity\n");
    713       //SYNCHELP_WRITE_BYTE( DATA_velocity, NWT_SS_B );
    714       //SYNCHELP_WRITE_FLOAT( velocity.x, NWT_SS_VELX );
    715       //SYNCHELP_WRITE_FLOAT( velocity.y, NWT_SS_VELY );
    716       //SYNCHELP_WRITE_FLOAT( velocity.z, NWT_SS_VELZ );
    717     }
    718    
     748    if ( fabs( oldVelocity.x - velocity.x ) > __OFFSET_VEL*fabs(oldVelocity.x)+0.1 ||
     749         fabs( oldVelocity.y - velocity.y ) > __OFFSET_VEL*fabs(oldVelocity.y)+0.1 ||
     750         fabs( oldVelocity.z - velocity.z ) > __OFFSET_VEL*fabs(oldVelocity.z)+0.1 )
     751    {
     752      oldVelocity.x = velocity.x;
     753      oldVelocity.y = velocity.y;
     754      oldVelocity.z = velocity.z;
     755      PRINTF(0)("SENDING velocity\n");
     756      sentSomething = true;
     757      SYNCHELP_WRITE_BYTE( DATA_velocity, NWT_SS_B );
     758      SYNCHELP_WRITE_FLOAT( velocity.x, NWT_SS_VELX );
     759      SYNCHELP_WRITE_FLOAT( velocity.y, NWT_SS_VELY );
     760      SYNCHELP_WRITE_FLOAT( velocity.z, NWT_SS_VELZ );
     761    }
     762
    719763    if ( Playable::needsReadSync() )
    720764    {
    721765      sentSomething = true;
     766      PRINTF(0)("SYNCHELP_WRITE_FKT( Playable::readSync, NWT_SS_PL_SYNC )\n");
    722767      SYNCHELP_WRITE_BYTE( DATA_playables, NWT_SS_B );
    723768      SYNCHELP_WRITE_FKT( Playable::readSync, NWT_SS_PL_SYNC );
    … …  
    725770
    726771  }
    727  
     772
    728773  if ( !sentSomething )
    729     reciever = 0;
     774  {
     775    *reciever = 0;
     776
     777    if ( networkCollisionList.size()>0 )
     778    {
     779      SYNCHELP_WRITE_BYTE( DATA_collision, NWT_SS_B );
     780
     781      SYNCHELP_WRITE_INT( networkCollisionList.size(), NWT_SS_CO_N );
     782
     783      for ( std::list<float>::iterator it = networkCollisionList.begin(); it!=networkCollisionList.end(); it++ )
     784      {
     785        SYNCHELP_WRITE_FLOAT( *it, NWT_SS_CO_CLID );
     786      }
     787
     788      networkCollisionList.clear();
     789    }
     790  }
    730791
    731792  return SYNCHELP_WRITE_N;
    732793}
    733794
    734 
     795void SpaceShip::doCollideNetwork( float energy )
     796{
     797  this->decreaseHealth( energy );
     798}
     799
     800
     801

  • trunk/src/world_entities/space_ships/space_ship.h

    r6868 r6959  
    4747    void calculateVelocity(float time);
    4848
     49    void doCollideNetwork( float energy );
     50
    4951    // !! temporary !!
    5052    void ADDWEAPON();
    … …  
    8486    ParticleEmitter*      burstEmitter;
    8587    ParticleSystem*       burstSystem;
     88
     89    std::list<float>        networkCollisionList;
    8690};
    8791

  • trunk/src/world_entities/world_entity.cc

    r6815 r6959  
    280280
    281281/**
    282  *  this method is called by the world if the WorldEntity leaves valid gamespace
    283  *
    284  * For free entities this means it left the Track boundaries. With bound entities it means its Location adresses a
    285  * place that is not in the world anymore. In both cases you might have to take extreme measures (a.k.a. call destroy).
    286  *
    287  * NOT YET IMPLEMENTED
    288  */
    289 void WorldEntity::leftWorld ()
     282 *  this method is called by the world if the WorldEntity leaves the game
     283 */
     284void WorldEntity::leaveWorld ()
    290285{}
    291286

  • trunk/src/world_entities/world_entity.h

    r6700 r6959  
    5454
    5555  virtual void postSpawn ();
    56   virtual void leftWorld ();
     56  virtual void leaveWorld ();
    5757
    5858  virtual void tick (float time);
Note: See TracChangeset for help on using the changeset viewer.