diff --git a/include/osgParticle/Emitter b/include/osgParticle/Emitter
index 940bd347c..4c8340457 100644
--- a/include/osgParticle/Emitter
+++ b/include/osgParticle/Emitter
@@ -27,8 +27,8 @@
namespace osgParticle
{
- /** An abstract base class for particle emitters.
- Descendant classes must override the emit() method to generate new particles by
+ /** An abstract base class for particle emitters.
+ Descendant classes must override the emitParticles() method to generate new particles by
calling the ParticleSystem::createParticle() 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);
}
diff --git a/include/osgParticle/ModularEmitter b/include/osgParticle/ModularEmitter
index 874b60419..a9584f782 100644
--- a/include/osgParticle/ModularEmitter
+++ b/include/osgParticle/ModularEmitter
@@ -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:
diff --git a/src/osgParticle/ModularEmitter.cpp b/src/osgParticle/ModularEmitter.cpp
index ef543fabd..ed114b79e 100644
--- a/src/osgParticle/ModularEmitter.cpp
+++ b/src/osgParticle/ModularEmitter.cpp
@@ -21,7 +21,7 @@ osgParticle::ModularEmitter::ModularEmitter(const ModularEmitter& copy, const os
{
}
-void osgParticle::ModularEmitter::emit(double dt)
+void osgParticle::ModularEmitter::emitParticles(double dt)
{
ConnectedParticleSystem* cps = dynamic_cast(getParticleSystem());