Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6822 in orxonox.OLD for trunk


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
Files:
11 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r6818 r6822  
    256256  CL_FONT                       =    0x00000802,
    257257
    258   CL_PARTICLE_EMITTER           =    0x00201852,
    259   CL_PARTICLE_SYSTEM            =    0x00202000,
     258  CL_PARTICLE_EMITTER           =    0x00801000,
     259  CL_PARTICLE_SYSTEM            =    0x00802000,
    260260  CL_SPRITE_PARTICLES           =    0x00000853,
    261261  CL_SPARK_PARTICLES            =    0x00000854,
    … …  
    263263  CL_DOT_PARTICLES              =    0x00000856,
    264264  CL_MODEL_PARTICLES            =    0x00000857,
    265 //  CL_TEMPLATE_PARTICLES         =    0x00000857,
     265  CL_DOT_EMITTER                =    0x00000861,
     266  CL_BOX_EMITTER                =    0x00000862,
     267  CL_SPHERE_EMITTER             =    0x00000863,
     268  CL_MODEL_EMITTER              =    0x00000864,
    266269
    267270  CL_MATERIAL                   =    0x00000804,
    … …  
    278281  CL_ENVIRONMENT                =    0x00000821,
    279282  CL_SHADER                     =    0x00000822,
    280   CL_FOG_EFFECT                 =    0x70000001,
    281   CL_LENSE_FLARE                =    0x70000002,
     283  CL_FOG_EFFECT                 =    0x00000841,
     284  CL_LENSE_FLARE                =    0x00000842,
    282285
    283286  /// GL-GUI
    … …  
    287290  CL_GLGUI_CHECKBUTTON          =    0x00000904,
    288291  CL_GLGUI_RADIOBUTTON          =    0x00000905,
    289   CL_GLGUI_CONTAINER            =    0x00002906,
     292  CL_GLGUI_CONTAINER            =    0x00002000,
    290293  CL_GLGUI_BOX                  =    0x00000907,
    291294  CL_GLGUI_FRAME                =    0x00000908,

  • trunk/src/lib/particles/Makefile.am

    r6652 r6822  
    66libORXparticles_a_SOURCES = \
    77                        particle_emitter.cc \
     8                        dot_emitter.cc \
    89                        \
    910                        particle_system.cc \
    … …  
    1819noinst_HEADERS = \
    1920                        particle_emitter.h \
     21                        dot_emitter.h \
    2022                        \
    2123                        particle_system.h \

  • trunk/src/lib/particles/dot_emitter.cc

    r6820 r6822  
    1616#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
    1717
    18 #include "particle_emitter.h"
     18#include "dot_emitter.h"
    1919
    2020#include "particle_system.h"
    … …  
    2828
    2929
    30 CREATE_FACTORY(ParticleEmitter, CL_PARTICLE_EMITTER);
     30CREATE_FACTORY(DotEmitter, CL_DOT_EMITTER);
    3131
    3232/**
    3333 *  standard constructor
    3434*/
    35 ParticleEmitter::ParticleEmitter(const Vector& direction, float angle, float emissionRate,
    36                   float velocity)
     35DotEmitter::DotEmitter(const Vector& direction, float angle, float emissionRate,
     36                       float velocity)
     37  : ParticleEmitter(direction, angle, emissionRate, velocity)
    3738{
    3839  this->init();
    39 
    40   this->direction = direction;
    41   this->setSpread(angle);
    42   this->setEmissionRate(emissionRate);
    43   this->setEmissionVelocity(velocity);
    4440}
    4541
    4642/**
    47  *  constructs and loads a ParticleEmitter from a XML-element
     43 *  constructs and loads a DotEmitter from a XML-element
    4844 * @param root the XML-element to load from
    4945*/
    50 ParticleEmitter::ParticleEmitter(const TiXmlElement* root)
     46DotEmitter::DotEmitter(const TiXmlElement* root)
     47  : ParticleEmitter()
    5148{
    5249  this->init();
    … …  
    6158   removes the EmitterSystem from the ParticleEngine
    6259*/
    63 ParticleEmitter::~ParticleEmitter ()
     60DotEmitter::~DotEmitter ()
    6461{
    6562  this->setSystem(NULL);
    … …  
    6966  @brief initializes default values of a ParitcleEmitter
    7067*/
    71 void ParticleEmitter::init()
     68void DotEmitter::init()
    7269{
    73   this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
    74 
    75   this->type = PARTICLE_EMITTER_DEFAULT_TYPE;
    76   this->emitterSize = PARTICLE_EMITTER_DEFAULT_SIZE;
    77   this->setInheritSpeed(PARTICLE_EMITTER_DEFAULT_INHERIT_SPEED);
    78   this->setEmissionRate(PARTICLE_EMITTER_DEFAULT_EMISSION_RATE);
    79   this->setSize(PARTICLE_EMITTER_DEFAULT_SIZE);
    80   this->setEmissionMomentum(0);
    81   this->setEmissionVelocity(1.0);
    82   this->setSpread(M_PI);
    83 
    84   this->system = NULL;
    85 
    86   this->saveTime = 0.0;
     70  this->setClassID(CL_DOT_EMITTER, "DotEmitter");
    8771}
    8872
    89 /**
    90  *  loads a ParticleEmitter from a XML-element
    91  * @param root the XML-element to load from
    92 */
    93 void ParticleEmitter::loadParams(const TiXmlElement* root)
     73void DotEmitter::emitParticles(unsigned int count) const
    9474{
    95   PNode::loadParams(root);
     75  Vector inheritVelocity = this->getVelocity() * this->inheritSpeed;
    9676
    97   LoadParam(root, "type", this, ParticleEmitter, setType)
    98     .describe("What type of emitter is this [dot, plane, cube, sphere].");
     77  for (unsigned int i = 0; i < count; i++)
     78  {
     79    Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
     80    randDir.normalize();
     81    randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->direction);
     82    Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
    9983
    100   LoadParam(root, "size", this, ParticleEmitter, setSize)
    101     .describe("How big the emitter is (no effect on dot-emitters)");
     84    // ROTATIONAL CALCULATION (this must not be done for all types of particles.)
     85    randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
     86    randDir.normalize();
     87    Quaternion orient = Quaternion(M_PI, randDir);
     88    Quaternion moment = Quaternion(this->momentum + this->momentumRandom, randDir);
    10289
    103   LoadParam(root, "rate", this, ParticleEmitter, setEmissionRate)
    104     .describe("How many particles should be emittet from this emitter");
     90    this->getSystem()->addParticle(this->getAbsCoor(), velocityV, orient, moment);
    10591
    106   LoadParam(root, "inherit-speed", this, ParticleEmitter, setInheritSpeed)
    107     .describe("the extent, the speed of the emitter has on the particles");
    108 
    109   LoadParam(root, "emission-velocity", this, ParticleEmitter, setEmissionVelocity)
    110     .describe("How fast the particles are emittet (their initial speed)");
    111 
    112   LoadParam(root, "emission-momentum", this, ParticleEmitter, setEmissionMomentum)
    113       .describe("How fast the particles rotation is at emissiontime (their initial momentum)");
    114 
    115   LoadParam(root, "spread", this, ParticleEmitter, setSpread)
    116     .describe("The angle the particles are emitted from (angle, deviation)");
    117 
    118 
    119   LoadParam(root, "emission-direction", this, ParticleEmitter, setDirection);
    120 }
    121 
    122 void ParticleEmitter::setSystem(ParticleSystem* system)
    123 {
    124   if (system != NULL)
    125     system->addEmitter(this);
    126   else if (this->system != NULL)
    127     this->system->removeEmitter(this);
    128 }
    129 
    130 /**
    131  *  this start the emitter
    132 */
    133 void ParticleEmitter::start() {}
    134 
    135 
    136 /**
    137  *  this stops the emitter
    138 */
    139 void ParticleEmitter::stop() {}
    140 
    141 
    142 
    143 
    144 
    145 /**
    146  * @param type the new Type of this emitter
    147 */
    148 void ParticleEmitter::setType(EMITTER_TYPE type)
    149 {
    150   this->type = type;
    151 }
    152 
    153 /**
    154  *  sets the type of emitter
    155  * @param type the type as a const char*
    156    dot: EMITTER_DOT, plane: EMITTER_PLANE, cube: EMITTER_CUBE, sphere, EMITTER_SPHERE;
    157 */
    158 void ParticleEmitter::setType(const char* type)
    159 {
    160   if (!strcmp(type, "plane"))
    161     this->setType(EMITTER_PLANE);
    162   else if (!strcmp(type, "cube"))
    163     this->setType(EMITTER_CUBE);
    164   else if (!strcmp(type, "sphere"))
    165     this->setType(EMITTER_SPHERE);
    166   else
    167     this->setType(EMITTER_DOT);
    168 }
    169 
    170 const char* ParticleEmitter::getTypeC() const
    171 {
    172   if (this->type == EMITTER_PLANE)
    173     return "EMITTER_PLANE";
    174   else if (this->type == EMITTER_CUBE)
    175     return "EMITTER_CUBE";
    176   else if (this->type == EMITTER_SPHERE)
    177     return "EMITTER_SPHERE";
    178   else
    179     return "EMITTER_DOT";
    180 }
    181 
    182 /**
    183  *  sets a new size to the emitter
    184 */
    185 void ParticleEmitter::setSize(float emitterSize)
    186 {
    187   if (emitterSize > 0.0)
    188     this->emitterSize = emitterSize;
    189   else
    190     emitterSize = 0.0;
    191 }
    192 
    193 /**
    194  *  set the emission rate
    195  * @param emissionRate: sets the number of particles emitted per second
    196 
    197    if you want to change the value of this variable during emission time (to make it more dynamic)
    198    you may want to use the animation class
    199 */
    200 void ParticleEmitter::setEmissionRate(float emissionRate)
    201 {
    202   if (emissionRate > 0.0)
    203     this->emissionRate = emissionRate;
    204   else
    205     this->emissionRate = 0.0;
    206 }
    207 
    208 /**
    209  *  how much of the speed from the ParticleEmitter should flow onto the ParticleSystem
    210  * @param value a Value between zero and one
    211 
    212    if you want to change the value of this variable during emission time (to make it more dynamic)
    213    you may want to use the animation class
    214 */
    215 void ParticleEmitter::setInheritSpeed(float value)
    216 {
    217   if (unlikely(value > 1.0))
    218     this->inheritSpeed = 1;
    219   else if (unlikely(value < 0.0))
    220     this->inheritSpeed = 0;
    221   else
    222     this->inheritSpeed = value;
    223 }
    224 
    225 /**
    226  *  set the angle of the emitter
    227  * @param angle around the direction in which there are particles to be emitted
    228  * @param randomAngle A random spread-angle, the +- randomness of this option
    229 
    230    if you want to change the value of this variable during emission time (to make it more dynamic)
    231    you may want to use the animation class
    232 */
    233 void ParticleEmitter::setSpread(float angle, float randomAngle)
    234 {
    235   this->angle = angle;
    236   this->randomAngle = randomAngle;
    237 }
    238 
    239 /**
    240  *  sets the initial velocity of all particles emitted
    241  * @param velocity The starting velocity of the emitted particles
    242  * @param randomVelocity A random starting velocity, the +- randomness of this option
    243 
    244    if you want to change the value of this variable during emission time (to make it more dynamic)
    245    you may want to use the animation class
    246 */
    247 void ParticleEmitter::setEmissionVelocity(float velocity, float randomVelocity)
    248 {
    249   this->velocity = velocity;
    250   this->randomVelocity = randomVelocity;
    251 }
    252 
    253 /**
    254  *  sets the initial Momentum of all particles emitted
    255  * @param momentum the new Momentum (just a float for being not too complicated).
    256  * @param randomMomentum variation from the given value.
    257  */
    258 void ParticleEmitter::setEmissionMomentum(float momentum, float randomMomentum)
    259 {
    260   this->momentum = momentum;
    261   this->momentumRandom = randomMomentum;
    262 }
    263 
    264 /**
    265  *  this set the time to life of a particle, after which it will die
    266  * @param dt: the time to live in seconds
    267  * @param system: the system into which to emitt
    268 
    269    if you want to change the value of this variable during emission time (to make it more dynamic)
    270    you may want to use the animation class
    271 */
    272 void ParticleEmitter::tick(float dt)
    273 {
    274   assert (this->system != NULL);
    275   if (likely(dt > 0.0 && this->emissionRate > 0.0))
    276   {
    277     // saving the time (particles only partly emitted in this timestep)
    278     float count = (dt+this->saveTime) * this->emissionRate;
    279     this->saveTime = modff(count, &count) / this->emissionRate;
    280     PRINTF(5)("emitting %f particles, saving %f seconds for the next timestep\n", count, this->saveTime);
    281 
    282     if (likely(count > 0))
    283     {
    284       Vector inheritVelocity = this->getVelocity() * this->inheritSpeed;
    285       for (int i = 0; i < (int)count; i++)
    286       {
    287         Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
    288         randDir.normalize();
    289         randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->direction);
    290         Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
    291 
    292         // this should spread the Particles evenly. if the Emitter is moved around quickly
    293         Vector equalSpread = this->getVelocity() * rand()/RAND_MAX * dt;
    294         Vector extension; // the Vector for different fields.
    295 
    296         if (this->type & EMITTER_PLANE)
    297         {
    298           extension = Vector(this->emitterSize * ((float)rand()/RAND_MAX -.5), 0, this->emitterSize * ((float)rand()/RAND_MAX - .5));
    299           extension = this->getAbsDir().apply(extension);
    300         }
    301         else if (this->type & EMITTER_CUBE)
    302         {
    303           extension = Vector((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * this->emitterSize;
    304         }
    305 
    306 
    307         // ROTATIONAL CALCULATION (this must not be done for all types of particles.)
    308         randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
    309         randDir.normalize();
    310         Quaternion orient = Quaternion(M_PI, randDir);
    311         Quaternion moment = Quaternion(this->momentum + this->momentumRandom, randDir);
    312 
    313         this->system->addParticle(this->getAbsCoor() + extension - equalSpread, velocityV, orient, moment);
    314       }
    315     }
    31692  }
    31793}
    318 
    319 /**
    320  *  outputs some nice debug information
    321 */
    322 void ParticleEmitter::debug() const
    323 {
    324   PRINT(0)(" Emitter %s\n", this->getName());
    325   PRINT(0)("  EmissionRate: %f, Speed: %f, SpreadAngle: %f\n", this->getEmissionRate(), this->getEmissionVelocity(), this->getSpread());
    326   PRINT(0)("  Size %f, Type: %s\n", this->getSize(), this->getTypeC());
    327 }

  • trunk/src/lib/particles/dot_emitter.h

    r6820 r6822  
    11/*!
    2  * @file particle_emitter.h
    3   *  Definition of a ParticleEmitter
    4 */
     2 * @file dot_emitter.h
     3 *  Definition of a DotEmitter
     4 */
    55
    6 #ifndef _PARTICLE_EMITTER_H
    7 #define _PARTICLE_EMITTER_H
     6#ifndef _DOT_EMITTER_H
     7#define _DOT_EMITTER_H
    88
    9 #include "p_node.h"
    10 
    11 // FORWARD DECLARATION
    12 class ParticleSystem;
    13 class TiXmlElement;
     9#include "particle_emitter.h"
    1410
    1511// Default values
    16 #define PARTICLE_EMITTER_DEFAULT_SIZE              1.0
    17 #define PARTICLE_EMITTER_DEFAULT_EMISSION_RATE     50
    18 #define PARTICLE_EMITTER_DEFAULT_TYPE              EMITTER_DOT
    19 #define PARTICLE_EMITTER_DEFAULT_INHERIT_SPEED     0.0
    20 #define PARTICLE_EMITTER_DEFAULT_SPREAD            M_PI
    21 
    22 //! The form of the Emitter to emit from
    23 typedef enum EMITTER_TYPE
    24 {
    25   EMITTER_DOT     = 1,
    26   EMITTER_PLANE   = 2,
    27   EMITTER_SPHERE  = 4,
    28   EMITTER_CUBE    = 8
    29 };
     12#define DOT_EMITTER_DEFAULT_SIZE              1.0
    3013
    3114//! A class to handle an Emitter.
    32 class ParticleEmitter : public PNode
     15class DotEmitter : public ParticleEmitter
    3316{
    3417  friend class ParticleSystem;
    3518public:
    36   ParticleEmitter(const Vector& direction, float angle = .5,
    37                   float emissionRate = 1.0, float velocity = 1.0);
    38   ParticleEmitter(const TiXmlElement* root);
    39   virtual ~ParticleEmitter();
     19  DotEmitter(const Vector& direction, float angle = .5,
     20             float emissionRate = 1.0, float velocity = 1.0);
     21  DotEmitter(const TiXmlElement* root);
     22  virtual ~DotEmitter();
    4023
    41   void init();
    42   virtual void loadParams(const TiXmlElement* root);
    4324
    4425  /* controlling the emitter: interface */
    45   void start();
    46   void stop();
    4726  void tick(float dt);
    4827
    49   void setSystem(ParticleSystem* system);
    50   ParticleSystem* getSystem() const { return this->system; };
    51 
    52   /* controlling the behavour: these can be used as Animation interfaces */
    53   void setType(EMITTER_TYPE type);
    54   void setType(const char* type);
    55   void setSize(float emitterSize);
    56   void setEmissionRate(float emissionRate);
    57   void setInheritSpeed(float value);
    58   void setSpread(float angle, float randomAngle = 0.0);
    59   void setEmissionVelocity(float velocity, float randomVelocity = 0.0);
    60   void setEmissionMomentum(float momentum, float randomMomentum = 0.0);
    61 
    62   void setDirection(float x, float y, float z) { this->direction = Vector(x,y,z); }
    63   ; //!< todo this should be done via PNODE
    64 
    65   /** @returns the type of the emitter */
    66   inline EMITTER_TYPE getType() const { return this->type; };
    67   /** @returns the Type as a const char * */
    68   const char* getTypeC() const;
    69   /** @returns the Size of the emitter */
    70   inline float getSize() const { return this->emitterSize; };
    71   /** @returns the emissionRate */
    72   inline float getEmissionRate() const { return this->emissionRate; };
    73   /** @returns the inherit-speed-factor */
    74   inline float getInheritSpeed() const { return this->inheritSpeed; };
    75   /** @returns the SpreadAngle of the emitter */
    76   inline float getSpread() const { return this->angle; };
    77   /** @returns the EmissionVelocity of the emitter */
    78   inline float getEmissionVelocity() const { return this->velocity; };
    79   /** @returns the EmissionMomentum of this emitter */
    80   inline float getEmissionMomentum() const { return this->momentum; };
    81 
    82   void debug() const;
    83 
     28  virtual void emitParticles(unsigned int count) const;
    8429
    8530private:
    86   ParticleSystem* system;            //!< The ParticleSystem this Emitter Emits into.
     31  void init();
    8732
    88   EMITTER_TYPE    type;              //!< The type of emitter this is.
    89   float           emitterSize;       //!< The size of the emitter (not for EMITTER_DOT).
    90   float           inheritSpeed;      //!< How much speed the particle inherits from the Emitters speed.
    91   Vector          direction;         //!< emition direction.
    92   float           angle;             //!< max angle from the direction of the emitter
    93   float           randomAngle;       //!< random emission angle (angle +- angleRandom is the emitted angle.
    94   float           emissionRate;      //!< amount of particles per seconds emitted by emitter.
    95   float           velocity;          //!< the initial speed of a Particles.
    96   float           randomVelocity;    //!< the random variation from the initial Speed.
    97   float           momentum;          //!< The Initial spped of the Rotation.
    98   float           momentumRandom;    //!< The random variation of the Momentum.
     33private:
     34  Vector          emitterSize;       //!< The size of the emitter (not for EMITTER_DOT).
    9935
    100   float           saveTime;          //!< The time that was missing by the last Tick (otherwise there would be no emission when framefate is too big).
    10136};
    10237
    103 #endif /* _PARTICLE_EMITTER_H */
     38#endif /* _DOT_EMITTER_H */

  • trunk/src/lib/particles/particle_emitter.cc

    r6627 r6822  
    2121
    2222#include "load_param.h"
    23 #include "factory.h"
    2423#include "debug.h"
    2524#include "stdlibincl.h"
    … …  
    2726using namespace std;
    2827
    29 
    30 CREATE_FACTORY(ParticleEmitter, CL_PARTICLE_EMITTER);
    31 
    3228/**
    3329 *  standard constructor
    … …  
    3632                  float velocity)
    3733{
    38   this->init();
    39 
     34  this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
     35
     36  this->system = NULL;
     37
     38  this->setInheritSpeed(PARTICLE_EMITTER_DEFAULT_INHERIT_SPEED);
     39  this->setEmissionMomentum(0);
    4040  this->direction = direction;
    4141  this->setSpread(angle);
    4242  this->setEmissionRate(emissionRate);
    4343  this->setEmissionVelocity(velocity);
    44 }
    45 
    46 /**
    47  *  constructs and loads a ParticleEmitter from a XML-element
    48  * @param root the XML-element to load from
    49 */
    50 ParticleEmitter::ParticleEmitter(const TiXmlElement* root)
    51 {
    52   this->init();
    53 
    54    if (root != NULL)
    55      this->loadParams(root);
     44
     45  this->saveTime = 0.0;
    5646}
    5747
    … …  
    6454{
    6555  this->setSystem(NULL);
    66 }
    67 
    68 /**
    69   @brief initializes default values of a ParitcleEmitter
    70 */
    71 void ParticleEmitter::init()
    72 {
    73   this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
    74 
    75   this->type = PARTICLE_EMITTER_DEFAULT_TYPE;
    76   this->emitterSize = PARTICLE_EMITTER_DEFAULT_SIZE;
    77   this->setInheritSpeed(PARTICLE_EMITTER_DEFAULT_INHERIT_SPEED);
    78   this->setEmissionRate(PARTICLE_EMITTER_DEFAULT_EMISSION_RATE);
    79   this->setSize(PARTICLE_EMITTER_DEFAULT_SIZE);
    80   this->setEmissionMomentum(0);
    81   this->setEmissionVelocity(1.0);
    82   this->setSpread(M_PI);
    83 
    84   this->system = NULL;
    85 
    86   this->saveTime = 0.0;
    8756}
    8857
    … …  
    9463{
    9564  PNode::loadParams(root);
    96 
    97   LoadParam(root, "type", this, ParticleEmitter, setType)
    98     .describe("What type of emitter is this [dot, plane, cube, sphere].");
    99 
    100   LoadParam(root, "size", this, ParticleEmitter, setSize)
    101     .describe("How big the emitter is (no effect on dot-emitters)");
    10265
    10366  LoadParam(root, "rate", this, ParticleEmitter, setEmissionRate)
    … …  
    139102void ParticleEmitter::stop() {}
    140103
    141 
    142 
    143 
    144 
    145 /**
    146  * @param type the new Type of this emitter
    147 */
    148 void ParticleEmitter::setType(EMITTER_TYPE type)
    149 {
    150   this->type = type;
    151 }
    152 
    153 /**
    154  *  sets the type of emitter
    155  * @param type the type as a const char*
    156    dot: EMITTER_DOT, plane: EMITTER_PLANE, cube: EMITTER_CUBE, sphere, EMITTER_SPHERE;
    157 */
    158 void ParticleEmitter::setType(const char* type)
    159 {
    160   if (!strcmp(type, "plane"))
    161     this->setType(EMITTER_PLANE);
    162   else if (!strcmp(type, "cube"))
    163     this->setType(EMITTER_CUBE);
    164   else if (!strcmp(type, "sphere"))
    165     this->setType(EMITTER_SPHERE);
    166   else
    167     this->setType(EMITTER_DOT);
    168 }
    169 
    170 const char* ParticleEmitter::getTypeC() const
    171 {
    172   if (this->type == EMITTER_PLANE)
    173     return "EMITTER_PLANE";
    174   else if (this->type == EMITTER_CUBE)
    175     return "EMITTER_CUBE";
    176   else if (this->type == EMITTER_SPHERE)
    177     return "EMITTER_SPHERE";
    178   else
    179     return "EMITTER_DOT";
    180 }
    181 
    182 /**
    183  *  sets a new size to the emitter
    184 */
    185 void ParticleEmitter::setSize(float emitterSize)
    186 {
    187   if (emitterSize > 0.0)
    188     this->emitterSize = emitterSize;
    189   else
    190     emitterSize = 0.0;
    191 }
    192104
    193105/**
    … …  
    280192    PRINTF(5)("emitting %f particles, saving %f seconds for the next timestep\n", count, this->saveTime);
    281193
    282     if (likely(count > 0))
     194    if (likely(count > 0.0f))
    283195    {
    284       Vector inheritVelocity = this->getVelocity() * this->inheritSpeed;
     196      this->emitParticles((unsigned int)count);
     197
     198/*      Vector inheritVelocity = this->getVelocity() * this->inheritSpeed;
    285199      for (int i = 0; i < (int)count; i++)
    286200      {
    … …  
    294208        Vector extension; // the Vector for different fields.
    295209
    296         if (this->type & EMITTER_PLANE)
    297         {
    298           extension = Vector(this->emitterSize * ((float)rand()/RAND_MAX -.5), 0, this->emitterSize * ((float)rand()/RAND_MAX - .5));
    299           extension = this->getAbsDir().apply(extension);
    300         }
    301         else if (this->type & EMITTER_CUBE)
    302         {
    303           extension = Vector((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * this->emitterSize;
    304         }
     210//         if (this->type & EMITTER_PLANE)
     211//         {
     212//           extension = Vector(this->emitterSize * ((float)rand()/RAND_MAX -.5), 0, this->emitterSize * ((float)rand()/RAND_MAX - .5));
     213//           extension = this->getAbsDir().apply(extension);
     214//         }
     215//         else if (this->type & EMITTER_CUBE)
     216//         {
     217//           extension = Vector((float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5, (float)rand()/RAND_MAX -.5) * this->emitterSize;
     218//         }
    305219
    306220
    … …  
    312226
    313227        this->system->addParticle(this->getAbsCoor() + extension - equalSpread, velocityV, orient, moment);
    314       }
     228      } */
    315229    }
    316230  }
    … …  
    322236void ParticleEmitter::debug() const
    323237{
    324   PRINT(0)(" Emitter %s\n", this->getName());
     238  PRINT(0)(" ParticleEmitter %s::%s\n", this->getClassName(), this->getName());
    325239  PRINT(0)("  EmissionRate: %f, Speed: %f, SpreadAngle: %f\n", this->getEmissionRate(), this->getEmissionVelocity(), this->getSpread());
    326   PRINT(0)("  Size %f, Type: %s\n", this->getSize(), this->getTypeC());
    327 }
     240}

  • trunk/src/lib/particles/particle_emitter.h

    r6620 r6822  
    1616#define PARTICLE_EMITTER_DEFAULT_SIZE              1.0
    1717#define PARTICLE_EMITTER_DEFAULT_EMISSION_RATE     50
    18 #define PARTICLE_EMITTER_DEFAULT_TYPE              EMITTER_DOT
    1918#define PARTICLE_EMITTER_DEFAULT_INHERIT_SPEED     0.0
    2019#define PARTICLE_EMITTER_DEFAULT_SPREAD            M_PI
    21 
    22 //! The form of the Emitter to emit from
    23 typedef enum EMITTER_TYPE
    24 {
    25   EMITTER_DOT     = 1,
    26   EMITTER_PLANE   = 2,
    27   EMITTER_SPHERE  = 4,
    28   EMITTER_CUBE    = 8
    29 };
    3020
    3121//! A class to handle an Emitter.
    … …  
    3424  friend class ParticleSystem;
    3525public:
    36   ParticleEmitter(const Vector& direction, float angle = .5,
     26  ParticleEmitter(const Vector& direction = Vector(1.0,0.0,0.0) , float angle = .5,
    3727                  float emissionRate = 1.0, float velocity = 1.0);
    38   ParticleEmitter(const TiXmlElement* root);
    3928  virtual ~ParticleEmitter();
    4029
    41   void init();
    42   virtual void loadParams(const TiXmlElement* root);
     30  virtual void loadParams(const TiXmlElement* root = NULL);
    4331
    4432  /* controlling the emitter: interface */
    … …  
    5139
    5240  /* controlling the behavour: these can be used as Animation interfaces */
    53   void setType(EMITTER_TYPE type);
    54   void setType(const char* type);
    55   void setSize(float emitterSize);
    5641  void setEmissionRate(float emissionRate);
    5742  void setInheritSpeed(float value);
    … …  
    6045  void setEmissionMomentum(float momentum, float randomMomentum = 0.0);
    6146
    62   void setDirection(float x, float y, float z) { this->direction = Vector(x,y,z); }
    63   ; //!< todo this should be done via PNODE
     47  void setDirection(float x, float y, float z) { this->direction = Vector(x,y,z); }; //!< todo this should be done via PNODE
    6448
    65   /** @returns the type of the emitter */
    66   inline EMITTER_TYPE getType() const { return this->type; };
    67   /** @returns the Type as a const char * */
    68   const char* getTypeC() const;
    69   /** @returns the Size of the emitter */
    70   inline float getSize() const { return this->emitterSize; };
    7149  /** @returns the emissionRate */
    7250  inline float getEmissionRate() const { return this->emissionRate; };
    … …  
    8058  inline float getEmissionMomentum() const { return this->momentum; };
    8159
     60  virtual void emitParticles(unsigned int count) const = 0;
     61
    8262  void debug() const;
    8363
     64protected:
    8465
    85 private:
    86   ParticleSystem* system;            //!< The ParticleSystem this Emitter Emits into.
    87 
    88   EMITTER_TYPE    type;              //!< The type of emitter this is.
    89   float           emitterSize;       //!< The size of the emitter (not for EMITTER_DOT).
    9066  float           inheritSpeed;      //!< How much speed the particle inherits from the Emitters speed.
    9167  Vector          direction;         //!< emition direction.
    9268  float           angle;             //!< max angle from the direction of the emitter
    9369  float           randomAngle;       //!< random emission angle (angle +- angleRandom is the emitted angle.
    94   float           emissionRate;      //!< amount of particles per seconds emitted by emitter.
    9570  float           velocity;          //!< the initial speed of a Particles.
    9671  float           randomVelocity;    //!< the random variation from the initial Speed.
    … …  
    9873  float           momentumRandom;    //!< The random variation of the Momentum.
    9974
     75private:
     76  ParticleSystem* system;            //!< The ParticleSystem this Emitter Emits into.
    10077  float           saveTime;          //!< The time that was missing by the last Tick (otherwise there would be no emission when framefate is too big).
     78  float           emissionRate;      //!< amount of particles per seconds emitted by emitter.
    10179};
    10280

  • 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.