Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 2, 2015, 5:09:15 PM (9 years ago)
Author:
landauf
Message:

removed unnecessary macro + static variable

Location:
code/branches/core7/src/libraries/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core7/src/libraries/tools/ParticleInterface.cc

    r10382 r10411  
    4949{
    5050    unsigned int ParticleInterface::counter_s = 0;
    51     ParticleInterface* ParticleInterface::currentParticleInterface_s = 0;
    5251
    5352    RegisterAbstractClass(ParticleInterface).inheritsFrom<TimeFactorListener>();
  • code/branches/core7/src/libraries/tools/ParticleInterface.h

    r5781 r10411  
    3434#include "util/OgreForwardRefs.h"
    3535#include "tools/interfaces/TimeFactorListener.h"
    36 
    37 #define getAllEmitters() \
    38   storeThisAsCurrentParticleInterface(); \
    39   for (unsigned int i = 0; i < ParticleInterface::getCurrentParticleInterface()->getNumEmitters(); ++i) \
    40     ParticleInterface::getCurrentParticleInterface()->getEmitter(i)
    4136
    4237namespace orxonox
     
    8075            void setDetailLevel(unsigned int level);
    8176
    82             inline void storeThisAsCurrentParticleInterface()
    83                 { ParticleInterface::currentParticleInterface_s = this; }
    84             inline static ParticleInterface* getCurrentParticleInterface()
    85                 { return ParticleInterface::currentParticleInterface_s; }
    86 
    8777        protected:
    8878            virtual void changedTimeFactor(float factor_new, float factor_old);
     
    10393            unsigned int              globalDetailLevel_; //!< Global maximum detail level of particle effects (0: off, 1: low, 2: normal, 3: high)
    10494
    105             static ParticleInterface* currentParticleInterface_s;
    10695            static unsigned int       counter_s;
    10796    };
Note: See TracChangeset for help on using the changeset viewer.