Changeset 3930 in orxonox.OLD

Timestamp:

Apr 22, 2005, 11:23:48 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: some more definitions of the particleSystem/Emitter

Location:

orxonox/branches/particleEngine/src/lib/graphics/particles

Files:

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

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

@@ -29 +29 @@
    this->setClassName ("ParticleEmitter");
    this->direction = direction;
-   this->angle = angle;
+   this->setSpread(angle);
    this->emissionRate = emissionRate;
    this->velocity = velocity;
-   this->timeToLive = ttl;
 }
 
@@ -64 +63 @@
    \brief set the angle of the emitter
    \param angle around the direction in which there are particles to be emitted
+   \param random A random spread-angle, the +- randomness of this option
 
    if you want to change the value of this variable during emission time (to make it more dynamic)
-   you will have to use the animation class
+   you may want to use the animation class
 */
-void ParticleEmitter::setAngle(float angle)
+void ParticleEmitter::setSpread(float angle, float random)
 {}
 
@@ -75 +75 @@
    \brief set the emission rate
    \param sets the number of particles emitted per second
+   \param random A random emissionRate, the +- randomness of this option
 
    if you want to change the value of this variable during emission time (to make it more dynamic)
-   you will have to use the animation class
+   you may want to use the animation class
 */
-void ParticleEmitter::setEmissionRate(float emissionRate)
+void ParticleEmitter::setEmissionRate(float emissionRate, float random)
 {}
 
@@ -85 +86 @@
 /**
    \brief sets the velocity of all particles emitted
-   \param velocity of the emitted particles
+   \param velocity The starting velocity of the emitted particles
+   \param random A random starting velocity, the +- randomness of this option
 
    if you want to change the value of this variable during emission time (to make it more dynamic)
-   you will have to use the animation class
+   you may want to use the animation class
 */
-void ParticleEmitter::setVelocity(float velocity)
+void ParticleEmitter::setVelocity(float velocity, float random)
 {}
 
@@ -98 +100 @@
 
    if you want to change the value of this variable during emission time (to make it more dynamic)
-   you will have to use the animation class
+   you may want to use the animation class
 */
-void ParticleEmitter::setTTL(float ttl)
-{}
-
 
 /**

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

@@ -27 +27 @@
 
   /* controlling the behavour: these can be used as Animation interfaces */
-  void setAngle(float angle);
-  void setEmissionRate(float emissionRate);
-  void setVelocity(float velocity);
-  void setTTL(float ttl);
+  void setSpread(float angle, float random = 0.0);
+  void setEmissionRate(float emissionRate, float random = 0.0);
+  void setVelocity(float velocity, float random = 0.0);
 
   /* some functions needed for internal use */
@@ -40 +39 @@
   float emissionRate;   //!< amount of particles per seconds emitted by emiter
   float velocity;       //!< the contant speed a particle gets if been emitted
-  float timeToLive;     //!< this is the global time to live (ttl) definition
 };
 

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_engine.cc

@@ -18 +18 @@
 #include "particle_engine.h"
 
+#include "list.h"
+
 using namespace std;
-
 
 /**
@@ -28 +29 @@
    this->setClassName ("ParticleEngine");
 
+   this->partSysList = new tList<ParticleSystem>;
 }
 
@@ -51 +53 @@
 ParticleEngine::~ParticleEngine () 
 {
+  delete this->partSysList;
+
+
   ParticleEngine::singletonRef = NULL;
-
 }

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_engine.h

@@ -28 +28 @@
 
   tList<ParticleSystem>* partSysList;
-
 };
 

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.cc

@@ -18 +18 @@
 #include "particle_system.h"
 
+#include "particle_emitter.h"
+#include "particle_engine.h"
+
 using namespace std;
 
@@ -23 +26 @@
 /**
    \brief standard constructor
+   \param count the Count of particles in the System
+   \param type The Type of the ParticleSystem
+
    \todo this constructor is not jet implemented - do it
 */
-ParticleSystem::ParticleSystem () 
+ParticleSystem::ParticleSystem (unsigned int count, PARTICLE_TYPE type) 
 {
    this->setClassName ("ParticleSystem");
+
+   this->particleType = type;
 }
 

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

@@ -9 +9 @@
 #include "base_object.h"
 #include "vector.h"
+
+//! An enumerator for the different types of particles.
+typedef enum PARTICLE_TYPE {PARTICLE_DOT,
+                            PARTICLE_SPRITE,
+                            PARTICLE_OBJECT,
+                            PARTICLE_OBJECT_ARRAY,
+                            PARTICLE_PRIMITIVE};
+
+#define PARTICLE_DEFAULT_COUNT 200             //!< a default count of particles in the system.
+#define PARTICLE_DEFAULT_TYPE  PARTICLE_SPRITE //!< A default type of the system.
+
 // FORWARD DEFINITION
-
 class Material;
-class Vector;
+class ParticleEmitter;
 
 
@@ -18 +28 @@
 typedef struct Particle
 {
-  float timeToLive;
-  Vector position;
-  Quaternion rotation;
-  Material* material;  
+  float timeToLive;           //!< The time this particle lives from NOW on.
+  Vector position;            //!< The current position of this particle.
+  Vector velocity;            //!< The current velocity of this particle.
+  Quaternion rotation;        //!< The current rotation of this particle.
+
+  //  Particle* next;            //!< pointer to the next particle in the List. (NULL if no preceding one)
 };
 
@@ -28 +40 @@
 
  public:
-  ParticleSystem();
+  ParticleSystem(unsigned int particleCount = PARTICLE_DEFAULT_COUNT, PARTICLE_TYPE type = PARTICLE_DEFAULT_TYPE);
   virtual ~ParticleSystem();
 
+  void setMaterial(Material* material);
+  void addEmitter(ParticleEmitter* emitter);
 
  private:
+  int particleCount;         //!< the count of Particles for this ParticleSystem.
+  PARTICLE_TYPE particleType;//!< A type for the Particles
+  Particle* particles;       //!< A list of particles of this System.
+  Material* material;        //!< A Material for all the Particles.
 
-  int particleCount;
-
-  Particle* particles;
+  ParticleEmitter* emitter;  //!< An emitter for this particleSystem.
 };