Changeset 11687 for OpenSceneGraph/trunk/include/osgParticle/Emitter

Timestamp:

07/30/10 18:06:22 (19 months ago)

Author:

robert

Message:

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

Files:

• OpenSceneGraph/trunk/include/osgParticle/Emitter (modified) (3 diffs)

OpenSceneGraph/trunk/include/osgParticle/Emitter

@@ -28 +28 @@
 {
 
-    /**    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.
@@ -64 +64 @@
         inline void process(double dt);
         
-        virtual void emit(double dt) = 0;
+        virtual void emitParticles(double dt) = 0;
         
         bool _usedeftemp;
@@ -95 +95 @@
     inline void Emitter::process(double dt)
     {
-        emit(dt);
+        emitParticles(dt);
     }