Prepended "fg" on the name of all global structures that didn't have it yet.

[flightgear.git] / Aircraft / aircraft.c

diff --git a/Aircraft/aircraft.c b/Aircraft/aircraft.c
index d641ea8925427e8955b6002edaf48737b8a81ce0..e19a081862afaffb1683142b73661613e7da52cb 100644 (file)
--- a/Aircraft/aircraft.c
+++ b/Aircraft/aircraft.c
@@ -24,35 +24,67 @@
  **************************************************************************/
 
 
-#include <math.h>
 #include <stdio.h>
 
 #include "aircraft.h"
+#include "../constants.h"
+
+
+/* This is a record containing all the info for the aircraft currently
+   being operated */
+struct fgAIRCRAFT current_aircraft;
 
-#define FG_LON_2_DEG(RAD) ((RAD) * 180.0 / M_PI)
-#define FG_LAT_2_DEG(RAD) (-1.0 * (RAD) * 180.0 / M_PI)
 
 /* Display various parameters to stdout */
-void aircraft_debug(int type) {
-    struct flight_params *f;
-    struct control_params *c;
-
-    f = &current_aircraft.flight;
-    c = &current_aircraft.controls;
-
-    printf("Pos = (%.2f,%.2f,%.2f)  Dir = %.2f  Mach = %.2f\n", 
-           FG_LAT_2_DEG(FG_Latitude) * 3600.0, 
-          FG_LON_2_DEG(FG_Longitude) * 3600.0, 
-          FG_Altitude, FG_Psi, FG_Mach_number);
-    printf("Elev = %.2f, Aileron = %.2f, Rudder = %.2f\n", 
-          c->elev, c->aileron, c->rudder);
+void fgAircraftOutputCurrent(struct fgAIRCRAFT *a) {
+    struct fgFLIGHT *f;
+    struct fgCONTROLS *c;
+
+    f = &a->flight;
+    c = &a->controls;
+
+    printf("Pos = (%.2f,%.2f,%.2f)  (Phi,Theta,Psi)=(%.2f,%.2f,%.2f)\n",
+          FG_Longitude * 3600.0 * RAD_TO_DEG, 
+           FG_Latitude  * 3600.0 * RAD_TO_DEG,
+          FG_Altitude, FG_Phi, FG_Theta, FG_Psi);
+    printf("Kts = %.0f  Elev = %.2f, Aileron = %.2f, Rudder = %.2f  Power = %.2f\n", 
+          FG_V_equiv_kts, FG_Elevator, FG_Aileron, FG_Rudder, FG_Throttle[0]);
 }
 
 
 /* $Log$
-/* Revision 1.3  1997/05/29 22:39:56  curt
-/* Working on incorporating the LaRCsim flight model.
+/* Revision 1.12  1997/12/10 22:37:37  curt
+/* Prepended "fg" on the name of all global structures that didn't have it yet.
+/* i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
 /*
+ * Revision 1.11  1997/09/13 02:00:05  curt
+ * Mostly working on stars and generating sidereal time for accurate star
+ * placement.
+ *
+ * Revision 1.10  1997/08/27 03:29:56  curt
+ * Changed naming scheme of basic shared structures.
+ *
+ * Revision 1.9  1997/07/19 22:39:08  curt
+ * Moved PI to ../constants.h
+ *
+ * Revision 1.8  1997/06/25 15:39:45  curt
+ * Minor changes to compile with rsxnt/win32.
+ *
+ * Revision 1.7  1997/06/02 03:01:39  curt
+ * Working on views (side, front, back, transitions, etc.)
+ *
+ * Revision 1.6  1997/05/31 19:16:26  curt
+ * Elevator trim added.
+ *
+ * Revision 1.5  1997/05/30 19:30:14  curt
+ * The LaRCsim flight model is starting to look like it is working.
+ *
+ * Revision 1.4  1997/05/30 03:54:11  curt
+ * Made a bit more progress towards integrating the LaRCsim flight model.
+ *
+ * Revision 1.3  1997/05/29 22:39:56  curt
+ * Working on incorporating the LaRCsim flight model.
+ *
  * Revision 1.2  1997/05/23 15:40:29  curt
  * Added GNU copyright headers.
  *