Changeset 6623 in orxonox.OLD for trunk/src/lib/particles/particle_system.h

Timestamp:

Jan 20, 2006, 12:54:20 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: particle Systems and Emitters are loaded and cleaned up nicely

File:

• trunk/src/lib/particles/particle_system.h (modified) (4 diffs)

trunk/src/lib/particles/particle_system.h

@@ -58 +58 @@
  public:
   ParticleSystem(unsigned int maxCount = PARTICLE_DEFAULT_MAX_COUNT);
-  ParticleSystem(const TiXmlElement* root);
   virtual ~ParticleSystem();
 
   void init();
   virtual void loadParams(const TiXmlElement* root);
+  void loadEmitters(const TiXmlElement* root);
 
-  void setMaterial(Material* material);
-  void setMaterialTexture(const char* textureFile);
-  void setModel(const char* modelName = NULL);
   void setLifeSpan(float lifeSpan, float randomLifeSpan = 0.0);
   void setConserve(float conserve);
@@ -76 +73 @@
   void setColor(float lifeCycleTime, float red, float green, float blue, float alpha);
 
-  /** @returns the Material that lies on this particles */
-  inline const Material* getMaterial() const { return this->material; };
   /** @returns the lifespan of the particles */
   inline float getLifeSpan() const { return this->lifeSpan; };
@@ -92 +87 @@
 
   void addEmitter(ParticleEmitter* emitter);
-  void addEmitterXML(const TiXmlElement* emitterRoot);
   void removeEmitter(ParticleEmitter* emitter);
 
@@ -115 +109 @@
   int               maxCount;            //!< The maximum count of Particles.
   int               count;               //!< The current count of Particles.
-  Material*         material;            //!< A Material for all the Particles.
   Particle*         particles;           //!< A list of particles of this System.
   Particle*         deadList;            //!< A list of dead Particles in the System.
-
-  GLuint*           glID;                //!< A List of different gl-List-ID's
-  GLuint            dialectCount;        //!< How many different types of particles are there in the Particle System
 
   std::list<ParticleEmitter*> emitters;  //!< The Emitters that do emit into this System.