Modifications to incorporate Jon S. Berndts flight model code.

[flightgear.git] / Aircraft / aircraft.cxx

diff --git a/Aircraft/aircraft.cxx b/Aircraft/aircraft.cxx
index 61b217f8fd7b56723406363bb75f0d1255d38ebe..ac4b067b08de0c18e3b36e85c4d54ba978ee4224 100644 (file)
--- a/Aircraft/aircraft.cxx
+++ b/Aircraft/aircraft.cxx
@@ -37,27 +37,29 @@ fgAIRCRAFT current_aircraft;
 void fgAircraftInit( void ) {
     FG_LOG( FG_AIRCRAFT, FG_INFO, "Initializing Aircraft structure" );
 
-    current_aircraft.flight   = &cur_flight_params;
+    current_aircraft.fdm_state   = &cur_fdm_state;
     current_aircraft.controls = &controls;
 }
 
 
 // Display various parameters to stdout
 void fgAircraftOutputCurrent(fgAIRCRAFT *a) {
-    fgFLIGHT *f;
+    FGInterface *f;
 
-    f = a->flight;
+    f = a->fdm_state;
 
     FG_LOG( FG_FLIGHT, FG_DEBUG,
            "Pos = ("
-           << (FG_Longitude * 3600.0 * RAD_TO_DEG) << "," 
-           << (FG_Latitude  * 3600.0 * RAD_TO_DEG) << ","
-           << FG_Altitude 
+           << (f->get_Longitude() * 3600.0 * RAD_TO_DEG) << "," 
+           << (f->get_Latitude()  * 3600.0 * RAD_TO_DEG) << ","
+           << f->get_Altitude() 
            << ")  (Phi,Theta,Psi)=("
-           << FG_Phi << "," << FG_Theta << "," << FG_Psi << ")" );
+           << f->get_Phi() << "," 
+           << f->get_Theta() << "," 
+           << f->get_Psi() << ")" );
 
     FG_LOG( FG_FLIGHT, FG_DEBUG,
-           "Kts = " << FG_V_equiv_kts 
+           "Kts = " << f->get_V_equiv_kts() 
            << "  Elev = " << controls.get_elevator() 
            << "  Aileron = " << controls.get_aileron() 
            << "  Rudder = " << controls.get_rudder() 
@@ -66,6 +68,15 @@ void fgAircraftOutputCurrent(fgAIRCRAFT *a) {
 
 
 // $Log$
+// Revision 1.7  1999/02/05 21:28:09  curt
+// Modifications to incorporate Jon S. Berndts flight model code.
+//
+// Revision 1.6  1998/12/05 15:53:59  curt
+// Renamed class fgFLIGHT to class FGState as per request by JSB.
+//
+// Revision 1.5  1998/12/03 01:14:58  curt
+// Converted fgFLIGHT to a class.
+//
 // Revision 1.4  1998/11/06 21:17:31  curt
 // Converted to new logstream debugging facility.  This allows release
 // builds with no messages at all (and no performance impact) by using