Changeset 659 for code/branches/FICN/src/orxonox/particle

Timestamp:

Dec 20, 2007, 4:10:08 PM (17 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

Location:

code/branches/FICN/src/orxonox/particle

Files:

• ParticleInterface.cc (modified) (5 diffs)
• ParticleInterface.h (modified) (2 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_++;
   }
 

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

@@ -19 +19 @@
  public:
 
-        ParticleInterface( Ogre::SceneManager *sceneManager, Ogre::String name, Ogre::String templateName );
-        ~ParticleInterface( void );
+  ParticleInterface( Ogre::SceneManager *sceneManager, Ogre::String name, Ogre::String templateName );
+  ~ParticleInterface( void );
 
   void inline addToSceneNode( Ogre::SceneNode* sceneNode ) { sceneNode_ = sceneNode; sceneNode_->attachObject(particleSystem_);};
   void inline detachFromSceneNode( void ) { sceneNode_->detachObject(particleSystem_); sceneNode_ = NULL;};
 
-        Ogre::ParticleEmitter* getEmitter ( int emitterNr );
-        void newEmitter ( void );
+  Ogre::ParticleEmitter* getEmitter ( int emitterNr );
+  void newEmitter ( void );
 
   Ogre::Vector3 getPositionOfEmitter ( int emitterNr );
@@ -32 +32 @@
 
   inline Ogre::Vector3 getDirection ( void ) { return particleSystem_->getEmitter(0)->getDirection(); };
-        void setDirection ( Ogre::Vector3 direction );
+  void setDirection ( Ogre::Vector3 direction );
 
-        inline Ogre::Real getVelocity() {return velocity_; };
-        void setVelocity( Ogre::Real v );
+  inline Ogre::Real getVelocity() {return velocity_; };
+  void setVelocity( Ogre::Real v );
 
-        inline int getRate() { return rate_; };
-        void setRate( int r );
+  inline int getRate() { return rate_; };
+  void setRate( int r );
 
-        inline Ogre::Real getDistance() { return distance_; };
-        void setDistance( Ogre::Real d );
+  inline Ogre::Real getDistance() { return distance_; };
+  void setDistance( Ogre::Real d );
 
-        inline Ogre::ColourValue getColour( void ) {return colour_;};
-        void setColour( Ogre::ColourValue colour );
+  inline Ogre::ColourValue getColour( void ) {return colour_;};
+  void setColour( Ogre::ColourValue colour );
 
-        void switchEnable( void );
+  void switchEnable();
 
-  inline Ogre::ParticleSystem* getParticleSystem() {return this->particleSystem_; };
+  inline Ogre::ParticleSystem* getParticleSystem() { return this->particleSystem_; };
 
  private:
-        Ogre::SceneNode *sceneNode_;
-        Ogre::SceneManager *sceneManager_;
+  Ogre::SceneNode *sceneNode_;
+  Ogre::SceneManager *sceneManager_;
   Ogre::ParticleSystem *particleSystem_;
-        Ogre::Real distance_;
-        Ogre::Real velocity_;
-        int rate_;
-        Ogre::ColourValue colour_;
-        int numberOfEmitters_;
+  Ogre::Real distance_;
+  Ogre::Real velocity_;
+  int rate_;
+  Ogre::ColourValue colour_;
+  int numberOfEmitters_;
 
-        void standardizeEmitters();
+  void standardizeEmitters();
 };
-
 
 }