Changeset 4394 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

May 30, 2005, 2:05:21 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: PhysicsEngine is now aware of the existing fields and interfaces

Location:

orxonox/trunk/src/lib/graphics/particles

Files:

• particle_engine.h (modified) (2 diffs)
• particle_system.h (modified) (3 diffs)

orxonox/trunk/src/lib/graphics/particles/particle_engine.h

@@ -20 +20 @@
 };
 
-//! A default singleton class.
+//! The physicsEngine handles and stores Systems and Emitters.
+/**
+   It is responsible for driving on the Particles (tick)
+   It draw particles (draw)
+   and it emitts particles into the system
+*/
 class ParticleEngine : public BaseObject {
 
@@ -48 +53 @@
  private:
   ParticleEngine(void);
-  static ParticleEngine* singletonRef;
+  static ParticleEngine* singletonRef;        //!< The reference to the engine.
 
-  tList<ParticleSystem>* systemList;
-  tList<ParticleEmitter>* emitterList;
+  tList<ParticleSystem>* systemList;          //!< A list of Systems handled by the ParticleEngine.
+  tList<ParticleEmitter>* emitterList;        //!< A list of Emitters handled by the ParticleEngine.
 
-  tList<ParticleConnection>* connectionList;
+  tList<ParticleConnection>* connectionList;  //!< A list of Connections between Systems and Emitters.
 };
 

orxonox/trunk/src/lib/graphics/particles/particle_system.h

@@ -57 +57 @@
 };
 
-//! A class to handle particle Systems
+//! A class to handle ParticleSystems
 class ParticleSystem : public PhysicsInterface {
-  friend class ParticleEmitter;
 
  public:
@@ -100 +99 @@
   virtual void applyField(Field* field, float dt);
 
+  void addParticle(const Vector& position, const Vector& velocity, unsigned int data = 0);
+
   void tick(float dt);
   void draw(void) const;
@@ -132 +133 @@
 
   GLuint* glID;              //!< A List of different gl-List-ID's
-  GLuint dialectCount;       //!< How many different types of particles are there in the Particle System
-
-  void addParticle(const Vector& position, const Vector& velocity, unsigned int data = 0);
-  
+  GLuint dialectCount;       //!< How many different types of particles are there in the Particle System  
 };