[Orxonox-commit 3921] r8595 - code/branches/steering/src/orxonox/worldentities/pawns

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-05-26 14:02:05 +0200 (Thu, 26 May 2011)
New Revision: 8595

Modified:
   code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc
   code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.h
Log:
Cleanup. Replacing tabs with spaces.


Modified: code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc
===================================================================
--- code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc	2011-05-26 11:57:01 UTC (rev 8594)
+++ code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc	2011-05-26 12:02:05 UTC (rev 8595)
@@ -53,7 +53,7 @@
 
         this->localLinearAcceleration_.setValue(0, 0, 0);
         this->localAngularAcceleration_.setValue(0, 0, 0);
-	this->bBoost_ = false;
+    this->bBoost_ = false;
         this->steering_ = Vector3::ZERO;
         this->engine_ = 0;
 
@@ -64,8 +64,8 @@
         this->boostCooldownDuration_ = 5.0;
         this->bBoostCooldown_ = false;
 
-	this->lift_ = 1.0f;                         // factor of the lift, standard is 1
-	this->stallSpeed_ = 220.0f;                 // max speed where lift is added
+        this->lift_ = 1.0f;                         // factor of the lift, standard is 1
+        this->stallSpeed_ = 220.0f;                 // max speed where lift is added
 
         this->bInvertYAxis_ = false;
 
@@ -82,7 +82,7 @@
 
 
 
-	
+    
 }
 
     SpaceShip::~SpaceShip()
@@ -103,8 +103,8 @@
         XMLPortParamVariable(SpaceShip, "boostPowerRate", boostPowerRate_, xmlelement, mode);
         XMLPortParamVariable(SpaceShip, "boostRate", boostRate_, xmlelement, mode);
         XMLPortParamVariable(SpaceShip, "boostCooldownDuration", boostCooldownDuration_, xmlelement, mode);
-	XMLPortParamVariable(SpaceShip, "lift", lift_, xmlelement, mode);
-	XMLPortParamVariable(SpaceShip, "stallSpeed", stallSpeed_, xmlelement, mode);
+        XMLPortParamVariable(SpaceShip, "lift", lift_, xmlelement, mode);
+        XMLPortParamVariable(SpaceShip, "stallSpeed", stallSpeed_, xmlelement, mode);
     }
 
     void SpaceShip::registerVariables()
@@ -173,7 +173,7 @@
                     this->timer_.setTimer(this->boostCooldownDuration_, false, createExecutor(createFunctor(&SpaceShip::boostCooledDown, this)));
                 }
             }
-	
+    
         }
     }
 
@@ -201,10 +201,6 @@
         this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() + value.x);
         this->steering_.y = value.x;
 
-
-
-
-
     }
 
     void SpaceShip::rotateYaw(const Vector2& value)
@@ -221,13 +217,9 @@
 
         Pawn::rotatePitch(value);
 
-
         //This function call adds a lift to the ship when it is pitching to make it's movement more "realistic" and enhance the feeling.
         if (abs(this-> getLocalVelocity().z) < stallSpeed_)  {this->moveUpDown(lift_ / 5 * value * sqrt(abs(this-> getLocalVelocity().z)));}
 
-
-
-
     }
 
     void SpaceShip::rotateRoll(const Vector2& value)

Modified: code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.h
===================================================================
--- code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.h	2011-05-26 11:57:01 UTC (rev 8594)
+++ code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.h	2011-05-26 12:02:05 UTC (rev 8595)
@@ -88,8 +88,8 @@
             float boostRate_;
             float boostPowerRate_;
             float boostCooldownDuration_;
-	    float lift_;
-	    float stallSpeed_;
+            float lift_;
+            float stallSpeed_;
             Vector3 steering_;
             float primaryThrust_;
             float auxilaryThrust_;
@@ -97,7 +97,7 @@
             btVector3 localLinearAcceleration_;
             btVector3 localAngularAcceleration_;
 
-	  
+      
 
         private:
             void registerVariables();