Changeset 11687

Show
Ignore:
Timestamp:
07/30/10 18:06:22 (5 weeks ago)
Author:
robert
Message:

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

Location:
OpenSceneGraph/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/include/osgParticle/Emitter

    r5328 r11687  
    2828{ 
    2929 
    30     /**    An abstract base class for particle emitters. 
    31         Descendant classes must override the <CODE>emit()</CODE> method to generate new particles by 
     30    /** An abstract base class for particle emitters. 
     31        Descendant classes must override the <CODE>emitParticles()</CODE> method to generate new particles by 
    3232        calling the <CODE>ParticleSystem::createParticle()</CODE> method on the particle system associated 
    3333        to the emitter. 
    … …  
    6464        inline void process(double dt); 
    6565         
    66         virtual void emit(double dt) = 0; 
     66        virtual void emitParticles(double dt) = 0; 
    6767         
    6868        bool _usedeftemp; 
    … …  
    9595    inline void Emitter::process(double dt) 
    9696    { 
    97         emit(dt); 
     97        emitParticles(dt); 
    9898    } 
    9999 

  • OpenSceneGraph/trunk/include/osgParticle/ModularEmitter

    r7038 r11687  
    8787        ModularEmitter &operator=(const ModularEmitter &) { return *this; } 
    8888         
    89         virtual void emit(double dt); 
     89        virtual void emitParticles(double dt); 
    9090         
    9191    private: 

  • OpenSceneGraph/trunk/src/osgParticle/ModularEmitter.cpp

    r11482 r11687  
    2222} 
    2323 
    24 void osgParticle::ModularEmitter::emit(double dt)  
     24void osgParticle::ModularEmitter::emitParticles(double dt) 
    2525{ 
    2626    ConnectedParticleSystem* cps = dynamic_cast<ConnectedParticleSystem*>(getParticleSystem());