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

Timestamp:

Dec 30, 2007, 6:56:58 PM (17 years ago)

Author:

nicolasc

Message:

• various cleanup
• improved readability in PI
• fixed iterator in language

Location:

code/branches/FICN/src/orxonox/particle

Files:

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

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

@@ -67 +67 @@
   {
     //Abgleichen der anderen Emitter an die Variabeln
-    for (int i=1; i<numberOfEmitters_; i++) {
+    for (int i=1; i < numberOfEmitters_; i++) {
       particleSystem_->getEmitter(i)->setColour( colour_ );
       particleSystem_->getEmitter(i)->setTimeToLive( distance_ );
@@ -130 +130 @@
   void ParticleInterface::setDirection ( Vector3 direction )
   {
-    for(int i=0; i<numberOfEmitters_; i++) {
+    for(int i=0; i < numberOfEmitters_; i++) {
       particleSystem_->getEmitter(i)->setDirection(direction);
     }
@@ -137 +137 @@
   void ParticleInterface::switchEnable(){
     bool enable=(!(particleSystem_->getEmitter(0)->getEnabled()));
-    for(int i=0; i<numberOfEmitters_; i++) {
+    for(int i=0; i < numberOfEmitters_; i++) {
       particleSystem_->getEmitter(i)->setEnabled(enable);
     }

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

@@ -28 +28 @@
     ~ParticleInterface( void );
 
-    void inline addToSceneNode( Ogre::SceneNode* sceneNode ) { sceneNode_ = sceneNode; sceneNode_->attachObject(particleSystem_);};
-    void inline detachFromSceneNode( void ) { sceneNode_->detachObject(particleSystem_); sceneNode_ = NULL;};
+    inline void addToSceneNode( Ogre::SceneNode* sceneNode )
+        { sceneNode_ = sceneNode; sceneNode_->attachObject(particleSystem_);};
+    inline void detachFromSceneNode( void )
+        { sceneNode_->detachObject(particleSystem_); sceneNode_ = NULL;};
 
     Ogre::ParticleEmitter* getEmitter ( int emitterNr );
@@ -35 +37 @@
 
     Vector3 getPositionOfEmitter ( int emitterNr );
-    inline void setPositionOfEmitter ( int emitterNr, Vector3 position ) { particleSystem_->getEmitter(emitterNr)->setPosition(position); };
+    inline void setPositionOfEmitter ( int emitterNr, Vector3 position )
+        { particleSystem_->getEmitter(emitterNr)->setPosition(position); };
 
-    inline Vector3 getDirection ( void ) { return particleSystem_->getEmitter(0)->getDirection(); };
+    inline Vector3 getDirection ( void )
+        { return particleSystem_->getEmitter(0)->getDirection(); };
     void setDirection ( Vector3 direction );
 
-    inline Real getVelocity() {return velocity_; };
+    inline Real getVelocity()
+        {return velocity_; };
     void setVelocity( Real v );
 
-    inline int getRate() { return rate_; };
+    inline int getRate()
+      { return rate_; };
     void setRate( int r );
 
-    inline Real getDistance() { return distance_; };
+    inline Real getDistance()
+        { return distance_; };
     void setDistance( Real d );
 
-    inline ColourValue getColour( void ) {return colour_;};
+    inline ColourValue getColour( void )
+        {return colour_;};
     void setColour( ColourValue colour );
 
     void switchEnable();
 
-    inline Ogre::ParticleSystem* getParticleSystem() { return this->particleSystem_; };
+    inline Ogre::ParticleSystem* getParticleSystem()
+        { return this->particleSystem_; };
 
   private: