Changeset 10411

Timestamp:

May 2, 2015, 5:09:15 PM (10 years ago)

Author:

landauf

Message:

removed unnecessary macro + static variable

Location:

code/branches/core7/src

Files:

• libraries/tools/ParticleInterface.cc (modified) (1 diff)
• libraries/tools/ParticleInterface.h (modified) (3 diffs)
• modules/weapons/projectiles/ParticleProjectile.cc (modified) (1 diff)

code/branches/core7/src/libraries/tools/ParticleInterface.cc

@@ -49 +49 @@
 {
     unsigned int ParticleInterface::counter_s = 0;
-    ParticleInterface* ParticleInterface::currentParticleInterface_s = 0;
 
     RegisterAbstractClass(ParticleInterface).inheritsFrom<TimeFactorListener>();

code/branches/core7/src/libraries/tools/ParticleInterface.h

@@ -34 +34 @@
 #include "util/OgreForwardRefs.h"
 #include "tools/interfaces/TimeFactorListener.h"
-
-#define getAllEmitters() \
-  storeThisAsCurrentParticleInterface(); \
-  for (unsigned int i = 0; i < ParticleInterface::getCurrentParticleInterface()->getNumEmitters(); ++i) \
-    ParticleInterface::getCurrentParticleInterface()->getEmitter(i)
 
 namespace orxonox
@@ -80 +75 @@
             void setDetailLevel(unsigned int level);
 
-            inline void storeThisAsCurrentParticleInterface()
-                { ParticleInterface::currentParticleInterface_s = this; }
-            inline static ParticleInterface* getCurrentParticleInterface()
-                { return ParticleInterface::currentParticleInterface_s; }
-
         protected:
             virtual void changedTimeFactor(float factor_new, float factor_old);
@@ -103 +93 @@
             unsigned int              globalDetailLevel_; //!< Global maximum detail level of particle effects (0: off, 1: low, 2: normal, 3: high)
 
-            static ParticleInterface* currentParticleInterface_s;
             static unsigned int       counter_s;
     };

code/branches/core7/src/modules/weapons/projectiles/ParticleProjectile.cc

@@ -54 +54 @@
             this->particles_->setKeepParticlesInLocalSpace(0);
 
-            this->particles_->getAllEmitters()->setDirection(-WorldEntity::FRONT);
+            for (unsigned int i = 0; i < this->particles_->getNumEmitters(); ++i)
+                this->particles_->getEmitter(i)->setDirection(-WorldEntity::FRONT);
         }
         else