Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Aircraft / aircraft.c

diff --git a/Aircraft/aircraft.c b/Aircraft/aircraft.c
index 7ba67ad2a3f96a5cb6dcbe6d9ebfd8d2143d421b..54e47f539a9dc5545ced68168409eade185351ce 100644 (file)
--- a/Aircraft/aircraft.c
+++ b/Aircraft/aircraft.c
@@ -24,28 +24,28 @@
  **************************************************************************/
 
 
-#include <math.h>
 #include <stdio.h>
 
-#include "aircraft.h"
+#include <Aircraft/aircraft.h>
+#include <Include/constants.h>
 
-#ifndef M_PI
-#define M_PI        3.14159265358979323846     /* pi */
-#endif
 
-#define FG_RAD_2_DEG(RAD) ((RAD) * 180.0 / M_PI)
+/* This is a record containing all the info for the aircraft currently
+   being operated */
+struct fgAIRCRAFT current_aircraft;
+
 
 /* Display various parameters to stdout */
-void aircraft_debug(int type) {
-    struct flight_params *f;
-    struct control_params *c;
+void fgAircraftOutputCurrent(struct fgAIRCRAFT *a) {
+    struct fgFLIGHT *f;
+    struct fgCONTROLS *c;
 
-    f = &current_aircraft.flight;
-    c = &current_aircraft.controls;
+    f = &a->flight;
+    c = &a->controls;
 
     printf("Pos = (%.2f,%.2f,%.2f)  (Phi,Theta,Psi)=(%.2f,%.2f,%.2f)\n",
-          FG_RAD_2_DEG(FG_Longitude) * 3600.0, 
-           FG_RAD_2_DEG(FG_Latitude) * 3600.0, 
+          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]);
@@ -53,9 +53,31 @@ void aircraft_debug(int type) {
 
 
 /* $Log$
-/* Revision 1.8  1997/06/25 15:39:45  curt
-/* Minor changes to compile with rsxnt/win32.
+/* Revision 1.14  1998/01/19 19:26:56  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.13  1997/12/15 23:54:30  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * 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.)
  *