MSVC fixups.

[flightgear.git] / src / FDM / MagicCarpet.cxx

diff --git a/src/FDM/MagicCarpet.cxx b/src/FDM/MagicCarpet.cxx
index 67aeea398d27093855ff135d165c595ec09462bf..8450c45b37380de66d4b26615e8679a728f5edd9 100644 (file)
--- a/src/FDM/MagicCarpet.cxx
+++ b/src/FDM/MagicCarpet.cxx
@@ -33,7 +33,7 @@
 
 
 FGMagicCarpet::FGMagicCarpet( double dt ) {
-    set_delta_t( dt );
+//     set_delta_t( dt );
 }
 
 
@@ -44,55 +44,64 @@ FGMagicCarpet::~FGMagicCarpet() {
 // Initialize the Magic Carpet flight model, dt is the time increment
 // for each subsequent iteration through the EOM
 void FGMagicCarpet::init() {
-    // set valid time for this record
-    stamp_time();
+    common_init();
 }
 
 
 // Run an iteration of the EOM (equations of motion)
-bool FGMagicCarpet::update( int multiloop ) {
+void FGMagicCarpet::update( double dt ) {
     // cout << "FGLaRCsim::update()" << endl;
 
-    double time_step = get_delta_t() * multiloop;
+    if (is_suspended())
+      return;
+
+    int multiloop = _calc_multiloop(dt);
+
+    double time_step = dt;
 
     // speed and distance traveled
-    double speed = controls.get_throttle( 0 ) * 2000; // meters/sec
+    double speed = globals->get_controls()->get_throttle( 0 ) * 2000; // meters/sec
+    if ( globals->get_controls()->get_brake( 0 ) ) {
+        speed = -speed;
+    }
+
     double dist = speed * time_step;
-    double kts = speed * METER_TO_NM * 3600.0;
+    double kts = speed * SG_METER_TO_NM * 3600.0;
     _set_V_equiv_kts( kts );
     _set_V_calibrated_kts( kts );
     _set_V_ground_speed( kts );
 
     // angle of turn
-    double turn_rate = controls.get_aileron() * FG_PI_4; // radians/sec
+    double turn_rate = globals->get_controls()->get_aileron() * SGD_PI_4; // radians/sec
     double turn = turn_rate * time_step;
 
     // update euler angles
-    _set_Euler_Angles( get_Phi(), get_Theta(), fmod(get_Psi() + turn, FG_2PI) );
+    _set_Euler_Angles( get_Phi(), get_Theta(),
+                       fmod(get_Psi() + turn, SGD_2PI) );
     _set_Euler_Rates(0,0,0);
 
     // update (lon/lat) position
     double lat2, lon2, az2;
-    if ( speed > FG_EPSILON ) {
+    if ( fabs( speed ) > SG_EPSILON ) {
        geo_direct_wgs_84 ( get_Altitude(),
-                           get_Latitude() * RAD_TO_DEG,
-                           get_Longitude() * RAD_TO_DEG,
-                           get_Psi() * RAD_TO_DEG,
+                           get_Latitude() * SGD_RADIANS_TO_DEGREES,
+                           get_Longitude() * SGD_RADIANS_TO_DEGREES,
+                           get_Psi() * SGD_RADIANS_TO_DEGREES,
                            dist, &lat2, &lon2, &az2 );
 
-       _set_Longitude( lon2 * DEG_TO_RAD );
-       _set_Latitude( lat2 * DEG_TO_RAD );
+       _set_Longitude( lon2 * SGD_DEGREES_TO_RADIANS );
+       _set_Latitude( lat2 * SGD_DEGREES_TO_RADIANS );
     }
 
-    // cout << "lon error = " << fabs(end.x()*RAD_TO_DEG - lon2)
-    //      << "  lat error = " << fabs(end.y()*RAD_TO_DEG - lat2)
+    // cout << "lon error = " << fabs(end.x()*SGD_RADIANS_TO_DEGREES - lon2)
+    //      << "  lat error = " << fabs(end.y()*SGD_RADIANS_TO_DEGREES - lat2)
     //      << endl;
 
     double sl_radius, lat_geoc;
     sgGeodToGeoc( get_Latitude(), get_Altitude(), &sl_radius, &lat_geoc );
 
     // update altitude
-    double real_climb_rate = -controls.get_elevator() * 5000; // feet/sec
+    double real_climb_rate = -globals->get_controls()->get_elevator() * 5000; // feet/sec
     _set_Climb_Rate( real_climb_rate / 500.0 );
     double climb = real_climb_rate * time_step;
 
@@ -100,8 +109,6 @@ bool FGMagicCarpet::update( int multiloop ) {
                             sl_radius + get_Altitude() + climb );
     // cout << "sea level radius (ft) = " << sl_radius << endl;
     // cout << "(setto) sea level radius (ft) = " << get_Sea_level_radius() << endl;
-    _set_Sea_level_radius( sl_radius * METER_TO_FEET);
+    _set_Sea_level_radius( sl_radius * SG_METER_TO_FEET);
     _set_Altitude( get_Altitude() + climb );
-
-    return true;
 }