Changeset 4307 in orxonox.OLD for orxonox/branches/physics/src/lib

Timestamp:

May 26, 2005, 8:26:49 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: new definitions of particle-return-values

Location:

orxonox/branches/physics/src/lib/graphics/particles

Files:

• particle_emitter.cc (modified) (2 diffs)
• particle_emitter.h (modified) (1 diff)
• particle_system.h (modified) (1 diff)

orxonox/branches/physics/src/lib/graphics/particles/particle_emitter.cc

@@ -37 +37 @@
    this->setSpread(angle);
    this->setEmissionRate(emissionRate);
-   this->setVelocity(velocity);
+   this->setEmissionVelocity(velocity);
 
    this->saveTime = 0.0;
@@ -119 +119 @@
    you may want to use the animation class
 */
-void ParticleEmitter::setVelocity(float velocity, float randomVelocity)
+void ParticleEmitter::setEmissionVelocity(float velocity, float randomVelocity)
 {
   this->velocity = velocity;

orxonox/branches/physics/src/lib/graphics/particles/particle_emitter.h

@@ -37 +37 @@
   void setEmissionRate(float emissionRate);
   void setSpread(float angle, float randomAngle = 0.0);
-  void setVelocity(float velocity, float randomVelocity = 0.0);
+  void setEmissionVelocity(float velocity, float randomVelocity = 0.0);
+
+  /** \returns the type of the emitter */
+  inline EMITTER_TYPE getType(void) const { return this->type; };
+  /** \returns the Size of the emitter */
+  inline float getSize(void) const { return this->emitterSize; };
+  /** \returns the emissionRate */
+  inline float getEmissionRate(void) const { return this->emissionRate; };
+  /** \returns the SpreadAngle of the emitter */
+  inline float getSpread(void) { return this->angle; };
+  /** \returns the EmissionVelocity of the emitter */
+  inline float getEmissionVelocity(void) { return this->velocity; };
 
   void debug(void);

orxonox/branches/physics/src/lib/graphics/particles/particle_system.h

@@ -78 +78 @@
                 GLfloat er, GLfloat eg, GLfloat eb, GLfloat ea);
 
+  /** \returns the Type of the particles */
+  inline PARTICLE_TYPE getType(void) const { return this->particleType; };
+  /** \returns the Material that lies on this particles */
+  inline const Material* getMaterial(void) const { return this->material; };
+  /** \returns the inherit-speed-factor */
+  inline float getInheritSpeed(void) const { return this->inheritSpeed; };
+  /** \returns the lifespan of the particles */
+  inline float getLifeSpan(void) const { return this->lifeSpan; };
+  /** \returns the starting-radius of the particles */
+  inline float getStartRadius(void) const { return this->startRadius; };
+  /** \returns the end-radius of the particles */
+  inline float getEndRadius(void) const { return this->endRadius; };
+  /** \returns the conserve-factor of the particles */
+  inline float getConserve(void) const { return this->conserve; };
+  /** \returns the initial mass of the particles */
+  inline float getMass(void) const { return this->initialMass; };
+
   void applyField(float dt, Field* field);