Changeset 4746 in orxonox.OLD for orxonox/trunk/src/lib/particles

Timestamp:

Jul 1, 2005, 12:48:48 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: changed (void) → ()

Location:

orxonox/trunk/src/lib/particles

Files:

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

orxonox/trunk/src/lib/particles/particle_emitter.cc

@@ -159 +159 @@
 }
 
-const char* ParticleEmitter::getTypeC(void) const
+const char* ParticleEmitter::getTypeC() const
 {
   if (this->type == EMITTER_PLANE)
@@ -310 +310 @@
    \brief outputs some nice debug information
 */
-void ParticleEmitter::debug(void) const
+void ParticleEmitter::debug() const
 {
   PRINT(0)(" Emitter %s\n", this->getName());

orxonox/trunk/src/lib/particles/particle_emitter.h

@@ -36 +36 @@
                   float emissionRate = 1.0, float velocity = 1.0);
   ParticleEmitter(const TiXmlElement* root);
-  virtual ~ParticleEmitter(void);
+  virtual ~ParticleEmitter();
 
   void init();
@@ -59 +59 @@
 
   /** \returns the type of the emitter */
-  inline EMITTER_TYPE getType(void) const { return this->type; };
+  inline EMITTER_TYPE getType() const { return this->type; };
   /** \returns the Type as a const char * */
-  const char* getTypeC(void) const;
+  const char* getTypeC() const;
   /** \returns the Size of the emitter */
-  inline float getSize(void) const { return this->emitterSize; };
+  inline float getSize() const { return this->emitterSize; };
   /** \returns the emissionRate */
-  inline float getEmissionRate(void) const { return this->emissionRate; };
+  inline float getEmissionRate() const { return this->emissionRate; };
   /** \returns the inherit-speed-factor */
-  inline float getInheritSpeed(void) const { return this->inheritSpeed; };
+  inline float getInheritSpeed() const { return this->inheritSpeed; };
   /** \returns the SpreadAngle of the emitter */
-  inline float getSpread(void) const { return this->angle; };
+  inline float getSpread() const { return this->angle; };
   /** \returns the EmissionVelocity of the emitter */
-  inline float getEmissionVelocity(void) const { return this->velocity; };
+  inline float getEmissionVelocity() const { return this->velocity; };
   /** \returns the EmissionMomentum of this emitter */
-  inline float getEmissionMomentum(void) const { return this->momentum; };
+  inline float getEmissionMomentum() const { return this->momentum; };
 
-  void debug(void) const;
+  void debug() const;
 
  private:

orxonox/trunk/src/lib/particles/particle_engine.cc

@@ -389 +389 @@
    \brief outputs some nice debug information
 */
-void ParticleEngine::debug(void)
+void ParticleEngine::debug()
 {
   PRINT(0)("+-----------------------------------+\n");

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

@@ -33 +33 @@
 
  public:
-  virtual ~ParticleEngine(void);
+  virtual ~ParticleEngine();
   /** \returns a Pointer to the only object of this Class */
-  inline static ParticleEngine* getInstance(void) { if (!singletonRef) singletonRef = new ParticleEngine();  return singletonRef; };
+  inline static ParticleEngine* getInstance() { if (!singletonRef) singletonRef = new ParticleEngine();  return singletonRef; };
 
   void loadParams(const TiXmlElement* root);
 
   void tick(float dt);
-  void draw(void) const;
+  void draw() const;
 
   void addSystem(ParticleSystem* system);
@@ -61 +61 @@
 
  private:
-  ParticleEngine(void);
+  ParticleEngine();
   static ParticleEngine* singletonRef;        //!< The reference to the engine.
 

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -89 +89 @@
   \brief initializes the ParticleSystem with default values
 */
-void ParticleSystem::init(void)
+void ParticleSystem::init()
 {
   this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
@@ -367 +367 @@
  * \returns the count of Faces of this ParticleSystem
  */
-unsigned int ParticleSystem::getFaceCount(void) const
+unsigned int ParticleSystem::getFaceCount() const
 {
   switch (this->particleType)
@@ -389 +389 @@
    This is just the fastest Way to do this, but will most likely be changed in the future.
  */
-void ParticleSystem::draw(void) const
+void ParticleSystem::draw() const
 {
   glPushAttrib(GL_ENABLE_BIT);
@@ -581 +581 @@
    \brief outputs some nice debug information
 */
-void ParticleSystem::debug(void) const
+void ParticleSystem::debug() const
 {
   PRINT(0)("  ParticleSystem %s, type: ", this->getName());

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

@@ -73 +73 @@
   virtual ~ParticleSystem();
 
-  void init(void);
+  void init();
   void loadParams(const TiXmlElement* root);
 
@@ -90 +90 @@
 
   /** \returns the Type of the particles */
-  inline PARTICLE_TYPE getType(void) const { return this->particleType; };
+  inline PARTICLE_TYPE getType() const { return this->particleType; };
   /** \returns the Material that lies on this particles */
-  inline const Material* getMaterial(void) const { return this->material; };
+  inline const Material* getMaterial() const { return this->material; };
   /** \returns the lifespan of the particles */
-  inline float getLifeSpan(void) const { return this->lifeSpan; };
+  inline float getLifeSpan() const { return this->lifeSpan; };
   /** \returns the starting-radius of the particles */
-  inline float getStartRadius(void) { return this->radiusAnim.getValue(0.0); };
+  inline float getStartRadius() { return this->radiusAnim.getValue(0.0); };
   /** \returns the end-radius of the particles */
-  inline float getEndRadius(void) { return this->radiusAnim.getValue(1.0); };
+  inline float getEndRadius() { return this->radiusAnim.getValue(1.0); };
   /** \returns the conserve-factor of the particles */
-  inline float getConserve(void) const { return this->conserve; };
+  inline float getConserve() const { return this->conserve; };
   /** \returns the initial mass of the particles */
-  inline float getMass(void) const { return this->initialMass; };
+  inline float getMass() const { return this->initialMass; };
 
-  virtual unsigned int getFaceCount(void) const;
+  virtual unsigned int getFaceCount() const;
 
 
@@ -114 +114 @@
 
   virtual void tick(float dt);
-  virtual void draw(void) const;
+  virtual void draw() const;
 
-  void debug(void) const;
+  void debug() const;
 
  private:

orxonox/trunk/src/lib/particles/quick_animation.cc

@@ -30 +30 @@
    \brief standard constructor
 */
-QuickAnimation::QuickAnimation (void)
+QuickAnimation::QuickAnimation ()
 {
    this->setClassID(CL_QUICK_ANIMATION, "QuickAnimation");
@@ -45 +45 @@
    \brief deletes all the deconstructor stuff
 */
-QuickAnimation::~QuickAnimation (void)
+QuickAnimation::~QuickAnimation ()
 {
   this->current = this->first;
@@ -228 +228 @@
    \brief outputs some nice information about this class
 */
-void QuickAnimation::debug(void)
+void QuickAnimation::debug()
 {
   this->current = this->first;

orxonox/trunk/src/lib/particles/quick_animation.h

@@ -49 +49 @@
   float getValue(float position);
 
-  void debug(void);
+  void debug();
 
  private: