Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 910


Ignore:
Timestamp:
Mar 20, 2008, 3:54:08 PM (17 years ago)
Author:
FelixSchulthess
Message:

removed some errors in particleinterface

Location:
code/trunk/src/orxonox/particle
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/particle/ParticleInterface.cc

    r790 r910  
    6969  {
    7070    //Abgleichen der anderen Emitter an die Variabeln
    71     for (int i=1; i < numberOfEmitters_; i++) {
     71    for (int i=0; i < numberOfEmitters_; i++) {
    7272      particleSystem_->getEmitter(i)->setColour( colour_ );
    7373      particleSystem_->getEmitter(i)->setTimeToLive( distance_ );
     
    8484  }
    8585
    86   void ParticleInterface::setRate(int r)
     86  void ParticleInterface::setRate(float r)
    8787  {
    8888    rate_ = r;
     
    127127  Vector3 ParticleInterface::getPositionOfEmitter ( int emitterNr )
    128128  {
    129     return particleSystem_->getEmitter(0)->getPosition();
     129    return particleSystem_->getEmitter(emitterNr)->getPosition();
    130130  }
    131131
  • code/trunk/src/orxonox/particle/ParticleInterface.h

    r790 r910  
    4848    void setVelocity( Real v );
    4949
    50     inline int getRate()
     50    inline float getRate()
    5151      { return rate_; };
    52     void setRate( int r );
     52    void setRate( float r );
    5353
    5454    inline Real getDistance()
     
    7171    Real distance_;
    7272    Real velocity_;
    73     int rate_;
     73    float rate_;
    7474    ColourValue colour_;
    7575    int numberOfEmitters_;
Note: See TracChangeset for help on using the changeset viewer.