Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jan 29, 2006, 1:57:03 AM (19 years ago)
Author:
bensch
Message:

trunk: ParticleEmitters now splitted into SubClasses.
Also fixed a little Boeg in the ClassID

Location:
trunk/src/world_entities
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/projectiles/bomb.cc

    r6700 r6822  
    2525#include "object_manager.h"
    2626
    27 #include "particle_emitter.h"
     27#include "dot_emitter.h"
    2828#include "particle_system.h"
    2929
    … …  
    5050  this->lifeSpan = 15;
    5151
    52   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
     52  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
    5353  this->emitter->setParent(this);
    5454  this->emitter->setSpread(M_PI, M_PI);

  • trunk/src/world_entities/projectiles/guided_missile.cc

    r6760 r6822  
    2323#include "class_list.h"
    2424
    25 #include "particle_emitter.h"
     25#include "dot_emitter.h"
    2626#include "sprite_particles.h"
    2727
    … …  
    4646  this->maxVelocity = 75;
    4747
    48   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
     48  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
    4949  this->emitter->setParent(this);
    5050  this->emitter->setSpread(M_PI, M_PI);

  • trunk/src/world_entities/projectiles/hyperblast.cc

    r6821 r6822  
    2323#include "class_list.h"
    2424
    25 #include "particle_emitter.h"
     25#include "dot_emitter.h"
    2626#include "sprite_particles.h"
    2727#include "spark_particles.h"
    … …  
    4747  this->size = 4.0;
    4848
    49   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
    50   this->emitter->setType( EMITTER_CUBE );
    51   this->emitter->setSize(10);
     49  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
    5250  this->emitter->setParent(this);
    5351  this->emitter->setSpread(M_PI, M_PI);

  • trunk/src/world_entities/projectiles/laser.cc

    r6753 r6822  
    2626#include "model.h"
    2727
    28 #include "particle_emitter.h"
     28#include "dot_emitter.h"
    2929#include "sprite_particles.h"
    30 #include <cassert>
    3130
    3231#include <cassert>
    33 
    3432
    3533using namespace std;
    … …  
    5048  this->lifeSpan = 5.0;
    5149
    52   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
     50  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
    5351  this->emitter->setParent(this);
    5452  this->emitter->setSpread(M_PI, M_PI);

  • trunk/src/world_entities/projectiles/rocket.cc

    r6700 r6822  
    2323#include "class_list.h"
    2424
    25 #include "particle_emitter.h"
     25#include "dot_emitter.h"
    2626#include "sprite_particles.h"
    2727
    … …  
    4545  this->lifeSpan = 5;
    4646
    47   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
     47  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
    4848  this->emitter->setParent(this);
    4949  this->emitter->setSpread(M_PI, M_PI);

  • trunk/src/world_entities/projectiles/test_bullet.cc

    r6700 r6822  
    2323#include "class_list.h"
    2424
    25 #include "particle_emitter.h"
     25#include "dot_emitter.h"
    2626#include "sprite_particles.h"
    2727
    … …  
    4545  this->lifeSpan = 2;
    4646
    47   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
     47  this->emitter = new DotEmitter(Vector(0,1,0), M_2_PI, 100, 5);
    4848  this->emitter->setParent(this);
    4949  this->emitter->setSpread(M_PI, M_PI);

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

    r6815 r6822  
    2828#include "weapons/cannon.h"
    2929
    30 #include "particle_emitter.h"
     30#include "dot_emitter.h"
    3131#include "sprite_particles.h"
    3232
    … …  
    205205  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
    206206
    207   this->burstEmitter = new ParticleEmitter(Vector(1,0,0), .01, 200, 0.0);
     207  this->burstEmitter = new DotEmitter(Vector(1,0,0), .01, 200, 0.0);
    208208  this->burstEmitter->setParent(this);
    209209  this->burstEmitter->setRelCoor(-1, .5, 0);
    … …  
    531531
    532532  byte b;
    533  
     533
    534534  while ( SYNCHELP_READ_REMAINING()>0 )
    535535  {
    536536    SYNCHELP_READ_BYTE( b, NWT_SS_B );
    537    
     537
    538538    if ( b == DATA_state )
    539539    {
    … …  
    544544      continue;
    545545    }
    546    
     546
    547547    if ( b == DATA_flags )
    548548    {
    … …  
    559559      bRollL = (flags & MASK_bRollL) != 0;
    560560      bRollR = (flags & MASK_bRollR) != 0;
    561      
     561
    562562      continue;
    563563    }
    564    
     564
    565565    if ( b == DATA_mouse )
    566566    {
    … …  
    569569      SYNCHELP_READ_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
    570570      SYNCHELP_READ_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
    571      
     571
    572572      continue;
    573573    }
    574    
     574
    575575    if ( b == DATA_sync )
    576576    {
    577577      if ( this->getOwner() != this->getHostID() )
    578578        SYNCHELP_READ_FKT( PNode::writeSync, NWT_SS_PN_SYNC );
    579      
     579
    580580      continue;
    581581    }
    582    
     582
    583583    if ( b == DATA_velocity )
    584584    {
    … …  
    588588    }
    589589  }
    590  
     590
    591591  return SYNCHELP_READ_N;
    592592}
    … …  
    621621
    622622  *reciever = 0;
    623  
     623
    624624  if ( this->getOwner() == this->getHostID() && PNode::needsReadSync() )
    625625  {
Note: See TracChangeset for help on using the changeset viewer.