Collapsed out the FGState variables not currently needed. They are just

[flightgear.git] / FDM / flight.cxx

diff --git a/FDM/flight.cxx b/FDM/flight.cxx
index 6a3004840b7723b39a738e7fb74e65825a1777bb..cadf164c7d2748b1ef3e99e4060f2892ba73b0ba 100644 (file)
--- a/FDM/flight.cxx
+++ b/FDM/flight.cxx
@@ -28,39 +28,42 @@
 #include "LaRCsim.hxx"
 
 #include <Debug/logstream.hxx>
+#include <Flight/External/external.hxx>
 #include <Flight/LaRCsim/ls_interface.h>
 #include <Include/fg_constants.h>
 #include <Math/fg_geodesy.hxx>
 
 
-fgFLIGHT cur_flight_params;
+FGState cur_fdm_state;
 
 
-/* Initialize the flight model parameters */
-int fgFlightModelInit(int model, fgFLIGHT& f, double dt) {
+// Initialize the flight model parameters
+int fgFlightModelInit(int model, FGState& f, double dt) {
     double save_alt = 0.0;
     int result;
 
     FG_LOG( FG_FLIGHT ,FG_INFO, "Initializing flight model" );
 
-    if ( model == FG_SLEW ) {
+    if ( model == FGState::FG_SLEW ) {
        // fgSlewInit(dt);
-    } else if ( model == FG_LARCSIM ) {
-       /* lets try to avoid really screwing up the LaRCsim model */
+    } else if ( model == FGState::FG_LARCSIM ) {
+       // lets try to avoid really screwing up the LaRCsim model
        if ( f.get_Altitude() < -9000.0 ) {
            save_alt = f.get_Altitude();
            f.set_Altitude( 0.0 );
        }
 
-       fgFlight_2_LaRCsim(f);  /* translate FG to LaRCsim structure */
+       FGState_2_LaRCsim(f);  // translate FG to LaRCsim structure
        fgLaRCsimInit(dt);
        FG_LOG( FG_FLIGHT, FG_INFO, "FG pos = " << f.get_Latitude() );
-       fgLaRCsim_2_Flight(f);  /* translate LaRCsim back to FG structure */
+       fgLaRCsim_2_FGState(f);  // translate LaRCsim back to FG structure
 
-       /* but lets restore our original bogus altitude when we are done */
+       // but lets restore our original bogus altitude when we are done
        if ( save_alt < -9000.0 ) {
            f.set_Altitude( save_alt );
        }
+    } else if ( model == FGState::FG_EXTERNAL ) {
+       fgExternalInit(f, dt);
     } else {
        FG_LOG( FG_FLIGHT, FG_WARN,
                  "Unimplemented flight model == " << model );
@@ -72,8 +75,8 @@ int fgFlightModelInit(int model, fgFLIGHT& f, double dt) {
 }
 
 
-/* Run multiloop iterations of the flight model */
-int fgFlightModelUpdate(int model, fgFLIGHT& f, int multiloop) {
+// Run multiloop iterations of the flight model
+int fgFlightModelUpdate(int model, FGState& f, int multiloop) {
     double time_step, start_elev, end_elev;
     int result;
     // printf("Altitude = %.2f\n", FG_Altitude * 0.3048);
@@ -81,10 +84,12 @@ int fgFlightModelUpdate(int model, fgFLIGHT& f, int multiloop) {
     time_step = (1.0 / DEFAULT_MODEL_HZ) * multiloop;
     start_elev = f.get_Altitude();
 
-    if ( model == FG_SLEW ) {
+    if ( model == FGState::FG_SLEW ) {
        // fgSlewUpdate(f, multiloop);
-    } else if ( model == FG_LARCSIM ) {
+    } else if ( model == FGState::FG_LARCSIM ) {
        fgLaRCsimUpdate(f, multiloop);
+    } else if ( model == FGState::FG_EXTERNAL ) {
+       // fgExternalUpdate(f, multiloop);
     } else {
        FG_LOG( FG_FLIGHT, FG_WARN,
                "Unimplemented flight model == " <<  model );
@@ -92,8 +97,10 @@ int fgFlightModelUpdate(int model, fgFLIGHT& f, int multiloop) {
 
     end_elev = f.get_Altitude();
 
-    // feet per second
-    f.set_Climb_Rate( (end_elev - start_elev) / time_step );
+    if ( time_step > 0.0 ) {
+       // feet per second
+       f.set_Climb_Rate( (end_elev - start_elev) / time_step );
+    }
 
     result = 1;
 
@@ -101,8 +108,8 @@ int fgFlightModelUpdate(int model, fgFLIGHT& f, int multiloop) {
 }
 
 
-/* Set the altitude (force) */
-void fgFlightModelSetAltitude(int model, fgFLIGHT& f, double alt_meters) {
+// Set the altitude (force)
+void fgFlightModelSetAltitude(int model, FGState& f, double alt_meters) {
     double sea_level_radius_meters;
     double lat_geoc;
     // Set the FG variables first
@@ -113,8 +120,8 @@ void fgFlightModelSetAltitude(int model, fgFLIGHT& f, double alt_meters) {
     f.set_Radius_to_vehicle( f.get_Altitude() + 
                              (sea_level_radius_meters * METER_TO_FEET) );
 
-    /* additional work needed for some flight models */
-    if ( model == FG_LARCSIM ) {
+    // additional work needed for some flight models
+    if ( model == FGState::FG_LARCSIM ) {
        ls_ForceAltitude( f.get_Altitude() );
     }
 
@@ -122,6 +129,19 @@ void fgFlightModelSetAltitude(int model, fgFLIGHT& f, double alt_meters) {
 
 
 // $Log$
+// Revision 1.7  1998/12/18 23:37:07  curt
+// Collapsed out the FGState variables not currently needed.  They are just
+// commented out and can be readded easily at any time.  The point of this
+// exersize is to determine which variables were or were not currently being
+// used.
+//
+// Revision 1.6  1998/12/05 15:54:11  curt
+// Renamed class fgFLIGHT to class FGState as per request by JSB.
+//
+// Revision 1.5  1998/12/04 01:29:39  curt
+// Stubbed in a new flight model called "External" which is expected to be driven
+// from some external source.
+//
 // Revision 1.4  1998/12/03 01:16:40  curt
 // Converted fgFLIGHT to a class.
 //