Port over remaining Point3D usage to the more type and unit safe SG* classes.

[flightgear.git] / src / FDM / YASim / Launchbar.cpp

diff --git a/src/FDM/YASim/Launchbar.cpp b/src/FDM/YASim/Launchbar.cpp
index ebe599999026f50451d3a4049cdda7e0219a4e79..697fa5a1b72fb91c1deba5951b352ce8a4b1c1a2 100644 (file)
--- a/src/FDM/YASim/Launchbar.cpp
+++ b/src/FDM/YASim/Launchbar.cpp
@@ -5,11 +5,10 @@
 
 #include "Launchbar.hpp"
 
-using namespace std;
 namespace yasim {
 
-  static const float YASIM_PI2 = 3.14159265358979323846/2;
-  static const float YASIM_PI = 3.14159265358979323846;
+  static const float YASIM_PI2 = 3.14159265358979323846f/2;
+  static const float YASIM_PI = 3.14159265358979323846f;
   static const float RAD2DEG = 180/YASIM_PI;
 
 Launchbar::Launchbar()
@@ -246,7 +245,7 @@ void Launchbar::getPosOnCat(float perc, float* lpos, float* lvel,
     
     float tmp[3];
     Math::mul3(perc, lendvels[0], lvel);
-    Math::mul3(1.0-perc, lendvels[1], tmp);
+    Math::mul3(1.0f-perc, lendvels[1], tmp);
     Math::add3(tmp, lvel, lvel);
 }
 
@@ -380,7 +379,7 @@ void Launchbar::calcForce(Ground *g_cb, RigidBody* body, State* s, float* lv, fl
     float llbdir[3];
     Math::sub3(llbtip, _launchbar_mount, llbdir);
     float lblen = Math::mag3(llbdir);
-    Math::mul3(1.0/lblen, llbdir, llbdir);
+    Math::mul3(1.0f/lblen, llbdir, llbdir);
 
     // Check if we are near enough to the cat.
     if (_state == Unmounted && dist < 0.6) {
@@ -458,7 +457,7 @@ void Launchbar::calcForce(Ground *g_cb, RigidBody* body, State* s, float* lv, fl
 
             // The spring force the holdback will apply to the gear
             float tmp[3];
-        Math::mul3(1e1*(hldbklen - _holdback_length), lhldbkdir,
+        Math::mul3(10.f*(hldbklen - _holdback_length), lhldbkdir,
           _holdback_force);
 
             // The damping force here ...