Changed emit() to emitParticles() to avoid collision with Qt.

This commit is contained in:
Robert Osfield
2010-07-30 16:06:22 +00:00
parent de955d2ed8
commit a71877bf2f
3 changed files with 6 additions and 6 deletions

View File

@@ -27,8 +27,8 @@
namespace osgParticle
{
/** An abstract base class for particle emitters.
Descendant classes must override the <CODE>emit()</CODE> method to generate new particles by
/** An abstract base class for particle emitters.
Descendant classes must override the <CODE>emitParticles()</CODE> method to generate new particles by
calling the <CODE>ParticleSystem::createParticle()</CODE> method on the particle system associated
to the emitter.
*/
@@ -63,7 +63,7 @@ namespace osgParticle
inline void process(double dt);
virtual void emit(double dt) = 0;
virtual void emitParticles(double dt) = 0;
bool _usedeftemp;
Particle _ptemp;
@@ -94,7 +94,7 @@ namespace osgParticle
inline void Emitter::process(double dt)
{
emit(dt);
emitParticles(dt);
}

View File

@@ -86,7 +86,7 @@ namespace osgParticle
virtual ~ModularEmitter() {}
ModularEmitter &operator=(const ModularEmitter &) { return *this; }
virtual void emit(double dt);
virtual void emitParticles(double dt);
private: