Changeset 659 for code/branches/FICN/src/orxonox/particle/ParticleInterface.cc

Timestamp:

Dec 20, 2007, 4:10:08 PM (16 years ago)

Author:

nicolasc

Message:

• a lot of inlining of getfunctions
• set libaudio to shared (not sure, if related: audioplayer + ingame sound == crash!)
• minor space cleanups

File:

• code/branches/FICN/src/orxonox/particle/ParticleInterface.cc (modified) (5 diffs)

code/branches/FICN/src/orxonox/particle/ParticleInterface.cc

@@ -43 +43 @@
 namespace particle {
 
-  ParticleInterface::~ParticleInterface(void)
-  {
-    sceneManager_->destroyParticleSystem(particleSystem_);
-  }
-
   ParticleInterface::ParticleInterface( SceneManager *sceneManager, String name, String templateName )
   {
@@ -62 +57 @@
     numberOfEmitters_ = particleSystem_->getNumEmitters();
     standardizeEmitters();
+  }
+
+  ParticleInterface::~ParticleInterface(void)
+  {
+    sceneManager_->destroyParticleSystem(particleSystem_);
   }
 
@@ -95 +95 @@
     distance_ = d;
     //partikel anpassen
-    for (int i=0; i<numberOfEmitters_; i++) {
+    for (int i=0; i < numberOfEmitters_; i++) {
       particleSystem_->getEmitter(i)->setTimeToLive(distance_);
     }
@@ -104 +104 @@
     colour_ = colour;
     //partikel anpassen
-    for (int i=0; i<numberOfEmitters_; i++) {
+    for (int i=0; i < numberOfEmitters_; i++) {
       particleSystem_->getEmitter(i)->setColour(colour_);
     }
@@ -111 +111 @@
   ParticleEmitter* ParticleInterface::getEmitter( int emitterNr )
   {
-    if (!(emitterNr<numberOfEmitters_)) return NULL;
+    if ( (emitterNr >= numberOfEmitters_) || (emitterNr < 0) ) return NULL;
     return particleSystem_->getEmitter(emitterNr);
   }
 
-  void ParticleInterface::newEmitter ( void )
+  void ParticleInterface::newEmitter ()
   {
     particleSystem_->addEmitter(particleSystem_->getEmitter(0)->getType());
-    numberOfEmitters_=numberOfEmitters_+1;
-    particleSystem_->getEmitter(0)->copyParametersTo( particleSystem_->getEmitter(numberOfEmitters_-1) );
+    particleSystem_->getEmitter(0)->copyParametersTo( particleSystem_->getEmitter(numberOfEmitters_) );
+    numberOfEmitters_++;
   }