Changeset 6825 in orxonox.OLD for trunk/src/lib

Timestamp:

Jan 29, 2006, 1:07:01 PM (18 years ago)

Author:

bensch

Message:

trunk: new interface to ParticleEmitters

Location:

trunk/src/lib/particles

Files:

• box_emitter.cc (modified) (2 diffs)
• box_emitter.h (modified) (3 diffs)
• dot_emitter.cc (modified) (2 diffs)
• dot_emitter.h (modified) (1 diff)
• particle_emitter.cc (modified) (3 diffs)
• particle_emitter.h (modified) (4 diffs)

trunk/src/lib/particles/box_emitter.cc

@@ -33 +33 @@
  *  standard constructor
 */
-BoxEmitter::BoxEmitter(const Vector& size)
+BoxEmitter::BoxEmitter(const Vector& size, float emissionRate, float velocity, float angle)
+    :  ParticleEmitter(emissionRate, velocity, angle)
 {
   this->init();
@@ -88 +89 @@
     Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
     randDir.normalize();
-    randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->direction);
+    randDir = (Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->getAbsDirX());
     Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
 

trunk/src/lib/particles/box_emitter.h

@@ -9 +9 @@
 #include "particle_emitter.h"
 
+#define BOX_EMITTER_DEFAULT_SIZE Vector(1.0f, 1.0f, 1.0f)
+
 //! A class to handle an Emitter.
 class BoxEmitter : public ParticleEmitter
@@ -14 +16 @@
   friend class ParticleSystem;
 public:
-  BoxEmitter(const Vector& size);
+  BoxEmitter(const Vector& size = BOX_EMITTER_DEFAULT_SIZE,
+             float emissionRate = PARTICLE_EMITTER_DEFAULT_EMISSION_RATE,
+             float velocity = PARTICLE_EMITTER_DEFAULT_VELOCITY,
+             float angle = PARTICLE_EMITTER_DEFAULT_SPREAD);
   BoxEmitter(const TiXmlElement* root);
   virtual ~BoxEmitter();
@@ -23 +28 @@
   void setSize(const Vector& size) { this->setSize(size.x, size.y, size.z); };
 
+protected:
   virtual void emitParticles(unsigned int count) const;
 

trunk/src/lib/particles/dot_emitter.cc

@@ -33 +33 @@
  *  standard constructor
 */
-DotEmitter::DotEmitter(const Vector& direction, float angle, float emissionRate,
-                       float velocity)
-  : ParticleEmitter(direction, angle, emissionRate, velocity)
+DotEmitter::DotEmitter(float emissionRate, float velocity, float angle)
+  : ParticleEmitter( emissionRate, velocity, angle)
 {
   this->init();
@@ -79 +78 @@
     Vector randDir = Vector(rand()-RAND_MAX/2, rand()-RAND_MAX/2, rand()-RAND_MAX/2);
     randDir.normalize();
-    randDir = (this->getAbsDir()*Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->direction);
+    randDir = (Quaternion(angle + randomAngle *((float)rand()/RAND_MAX -.5), randDir)).apply(this->getAbsDirX());
     Vector velocityV = randDir.getNormalized()*this->velocity + inheritVelocity;
 

trunk/src/lib/particles/dot_emitter.h

@@ -14 +14 @@
   friend class ParticleSystem;
 public:
-  DotEmitter(const Vector& direction, float angle = .5,
-             float emissionRate = 1.0, float velocity = 1.0);
+  DotEmitter(float emissionRate = 1.0, float velocity = 1.0, float angle = .5);
   DotEmitter(const TiXmlElement* root);
   virtual ~DotEmitter();
 
-
+protected:
   virtual void emitParticles(unsigned int count) const;
 

trunk/src/lib/particles/particle_emitter.cc

@@ -29 +29 @@
  *  standard constructor
 */
-ParticleEmitter::ParticleEmitter(const Vector& direction, float angle, float emissionRate,
-                  float velocity)
+ParticleEmitter::ParticleEmitter(float emissionRate, float velocity, float angle)
 {
   this->setClassID(CL_PARTICLE_EMITTER, "ParticleEmitter");
@@ -38 +37 @@
   this->setInheritSpeed(PARTICLE_EMITTER_DEFAULT_INHERIT_SPEED);
   this->setEmissionMomentum(0);
-  this->direction = direction;
   this->setSpread(angle);
   this->setEmissionRate(emissionRate);
@@ -78 +76 @@
   LoadParam(root, "spread", this, ParticleEmitter, setSpread)
     .describe("The angle the particles are emitted from (angle, deviation)");
-
-
-  LoadParam(root, "emission-direction", this, ParticleEmitter, setDirection);
 }
 

trunk/src/lib/particles/particle_emitter.h

@@ -18 +18 @@
 #define PARTICLE_EMITTER_DEFAULT_INHERIT_SPEED     0.0
 #define PARTICLE_EMITTER_DEFAULT_SPREAD            M_PI
+#define PARTICLE_EMITTER_DEFAULT_VELOCITY          1.0
 
 //! A class to handle an Emitter.
@@ -24 +25 @@
   friend class ParticleSystem;
 public:
-  ParticleEmitter(const Vector& direction = Vector(1.0,0.0,0.0) , float angle = .5,
-                  float emissionRate = 1.0, float velocity = 1.0);
+  ParticleEmitter(float emissionRate = PARTICLE_EMITTER_DEFAULT_EMISSION_RATE,
+                  float velocity = PARTICLE_EMITTER_DEFAULT_VELOCITY,
+                  float angle = PARTICLE_EMITTER_DEFAULT_SPREAD);
   virtual ~ParticleEmitter();
 
@@ -45 +47 @@
   void setEmissionMomentum(float momentum, float randomMomentum = 0.0);
 
-  void setDirection(float x, float y, float z) { this->direction = Vector(x,y,z); }; //!< todo this should be done via PNODE
-
   /** @returns the emissionRate */
   inline float getEmissionRate() const { return this->emissionRate; };
@@ -58 +58 @@
   inline float getEmissionMomentum() const { return this->momentum; };
 
-  virtual void emitParticles(unsigned int count) const = 0;
 
   void debug() const;
 
 protected:
+  virtual void emitParticles(unsigned int count) const = 0;
 
+protected:
   float           inheritSpeed;      //!< How much speed the particle inherits from the Emitters speed.
-  Vector          direction;         //!< emition direction.
   float           angle;             //!< max angle from the direction of the emitter
   float           randomAngle;       //!< random emission angle (angle +- angleRandom is the emitted angle.