Changeset 8595

Timestamp:

May 26, 2011, 2:02:05 PM (14 years ago)

Author:

dafrick

Message:

Cleanup. Replacing tabs with spaces.

Location:

code/branches/steering/src/orxonox/worldentities/pawns

Files:

• SpaceShip.cc (modified) (7 diffs)
• SpaceShip.h (modified) (2 diffs)

code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -54 +54 @@
         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;
@@ -65 +65 @@
         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;
@@ -83 +83 @@
 
 
-        
+    
 }
 
@@ -104 +104 @@
         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);
     }
 
@@ -174 +174 @@
                 }
             }
-        
+    
         }
     }
@@ -202 +202 @@
         this->steering_.y = value.x;
 
-
-
-
-
     }
 
@@ -221 +217 @@
 
         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)));}
-
-
-
 
     }

code/branches/steering/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -89 +89 @@
             float boostPowerRate_;
             float boostCooldownDuration_;
-            float lift_;
-            float stallSpeed_;
+            float lift_;
+            float stallSpeed_;
             Vector3 steering_;
             float primaryThrust_;
@@ -98 +98 @@
             btVector3 localAngularAcceleration_;
 
-          
+      
 
         private: