Renamed class fgCONTROLS to class FGControls.

[flightgear.git] / Main / GLUTkey.cxx

diff --git a/Main/GLUTkey.cxx b/Main/GLUTkey.cxx
index de4e4547bfd46e4487fb65938cd0d32db8409fd3..e2f832a6ac122740b1c4ee2afbfc75a5fd610f5e 100644 (file)
--- a/Main/GLUTkey.cxx
+++ b/Main/GLUTkey.cxx
@@ -69,14 +69,14 @@ static void local_update_sky_and_lighting_params( void ) {
 
 // Handle keyboard events
 void GLUTkey(unsigned char k, int x, int y) {
-    fgFLIGHT *f;
+    FGState *f;
     fgTIME *t;
     fgVIEW *v;
     struct fgWEATHER *w;
     float fov, tmp;
     static bool winding_ccw = true;
 
-    f = current_aircraft.flight;
+    f = current_aircraft.fdm_state;
     t = &cur_time_params;
     v = &current_view;
     w = &current_weather;
@@ -205,17 +205,17 @@ void GLUTkey(unsigned char k, int x, int y) {
            controls.set_rudder(0.0);
            return;
        case 57: // numeric keypad 9 (Pg Up)
-           controls.move_throttle( fgCONTROLS::FG_ALL_ENGINES, 0.01 );
+           controls.move_throttle( FGControls::ALL_ENGINES, 0.01 );
            return;
        case 51: // numeric keypad 3 (Pg Dn)
-           controls.move_throttle( fgCONTROLS::FG_ALL_ENGINES, -0.01 );
+           controls.move_throttle( FGControls::ALL_ENGINES, -0.01 );
            return;
        case 98: // b key
            int b_ret;
            double b_set;
            b_ret = int( controls.get_brake( 0 ) );
            b_set = double(!b_ret);
-           controls.set_brake( fgCONTROLS::FG_ALL_WHEELS, b_set);
+           controls.set_brake( FGControls::ALL_WHEELS, b_set);
            return;
        case 104: // h key
            HUD_brightkey( false );
@@ -231,13 +231,13 @@ void GLUTkey(unsigned char k, int x, int y) {
            t->pause = !t->pause;
            // printf position and attitude information
            FG_LOG( FG_INPUT, FG_INFO,
-                   "Lon = " << FG_Longitude * RAD_TO_DEG
-                   << "  Lat = " << FG_Latitude * RAD_TO_DEG
-                   << "  Altitude = " << FG_Altitude * FEET_TO_METER );
+                   "Lon = " << f->get_Longitude() * RAD_TO_DEG
+                   << "  Lat = " << f->get_Latitude() * RAD_TO_DEG
+                   << "  Altitude = " << f->get_Altitude() * FEET_TO_METER );
            FG_LOG( FG_INPUT, FG_INFO,
-                   "Heading = " << FG_Psi * RAD_TO_DEG 
-                   << "  Roll = " << FG_Phi * RAD_TO_DEG
-                   << "  Pitch = " << FG_Theta * RAD_TO_DEG );
+                   "Heading = " << f->get_Psi() * RAD_TO_DEG 
+                   << "  Roll = " << f->get_Phi() * RAD_TO_DEG
+                   << "  Pitch = " << f->get_Theta() * RAD_TO_DEG );
            return;
        case 116: // t key
            t->warp_delta += 30;
@@ -375,10 +375,10 @@ void GLUTspecialkey(int k, int x, int y) {
            controls.set_rudder(0.0);
            return;
        case GLUT_KEY_PAGE_UP: // numeric keypad 9 (Pg Up)
-           controls.move_throttle( fgCONTROLS::FG_ALL_ENGINES, 0.01 );
+           controls.move_throttle( FGControls::ALL_ENGINES, 0.01 );
            return;
        case GLUT_KEY_PAGE_DOWN: // numeric keypad 3 (Pg Dn)
-           controls.move_throttle( fgCONTROLS::FG_ALL_ENGINES, -0.01 );
+           controls.move_throttle( FGControls::ALL_ENGINES, -0.01 );
            return;
        }
     }
@@ -386,6 +386,15 @@ void GLUTspecialkey(int k, int x, int y) {
 
 
 // $Log$
+// Revision 1.35  1998/12/05 16:13:17  curt
+// Renamed class fgCONTROLS to class FGControls.
+//
+// Revision 1.34  1998/12/05 15:54:17  curt
+// Renamed class fgFLIGHT to class FGState as per request by JSB.
+//
+// Revision 1.33  1998/12/03 01:17:12  curt
+// Converted fgFLIGHT to a class.
+//
 // Revision 1.32  1998/11/06 21:18:06  curt
 // Converted to new logstream debugging facility.  This allows release
 // builds with no messages at all (and no performance impact) by using