Changeset 1037 for code/trunk/src/orxonox/particle

Timestamp:

Apr 13, 2008, 2:24:00 PM (17 years ago)

Author:

landauf

Message:

moved tolua from util to core because of circular dependencies
reverted some bugfixes in ParticleInterface

Location:

code/trunk/src/orxonox/particle

Files:

• ParticleInterface.cc (modified) (3 diffs)
• ParticleInterface.h (modified) (2 diffs)

code/trunk/src/orxonox/particle/ParticleInterface.cc

@@ -69 +69 @@
   {
     //Abgleichen der anderen Emitter an die Variabeln
-    for (int i=1; i < numberOfEmitters_; i++) {
+    for (int i=0; i < numberOfEmitters_; i++) {
       particleSystem_->getEmitter(i)->setColour( colour_ );
       particleSystem_->getEmitter(i)->setTimeToLive( distance_ );
@@ -84 +84 @@
   }
 
-  void ParticleInterface::setRate(int r)
+  void ParticleInterface::setRate(float r)
   {
     rate_ = r;
@@ -127 +127 @@
   Vector3 ParticleInterface::getPositionOfEmitter ( int emitterNr )
   {
-    return particleSystem_->getEmitter(0)->getPosition();
+    return particleSystem_->getEmitter(emitterNr)->getPosition();
   }
 

code/trunk/src/orxonox/particle/ParticleInterface.h

@@ -48 +48 @@
     void setVelocity( Real v );
 
-    inline int getRate()
+    inline float getRate()
       { return rate_; };
-    void setRate( int r );
+    void setRate( float r );
 
     inline Real getDistance()
@@ -71 +71 @@
     Real distance_;
     Real velocity_;
-    int rate_;
+    float rate_;
     ColourValue colour_;
     int numberOfEmitters_;