C++ - ifing the code a bit.

[flightgear.git] / FDM / flight.h

diff --git a/FDM/flight.h b/FDM/flight.h
index dcad05c2338e2414aba7f6435e0ac35272c0db79..04087fb17f3bf9b792c29ab28ecc5344878c4c96 100644 (file)
--- a/FDM/flight.h
+++ b/FDM/flight.h
@@ -24,43 +24,36 @@
  **************************************************************************/
 
 
-#ifndef FLIGHT_H
-#define FLIGHT_H
+#ifndef _FLIGHT_H
+#define _FLIGHT_H
 
 
-#include "Slew/slew.h"
-#include "LaRCsim/ls_interface.h"
+#include <Flight/Slew/slew.h>
 
 
-/* Define the various supported flight models (not all implemented) */
-#define FG_LARCSIM     0
-#define FG_ACM         1
-#define FG_HELICOPTER  2
-#define FG_AUTOGYRO    3
-#define FG_BALLOON     4
-#define FG_PARACHUTE   5
-#define FG_SLEW        6
-#define FG_EXTERN_GPS  7
-
+#ifdef __cplusplus                                                          
+extern "C" {                            
+#endif                                   
 
-/* Define a structure containing the shared flight model parameters */
-/* struct flight_params {
-    double pos_x, pos_y, pos_z;
-    double vel_x, vel_y, vel_z;
 
-    double Phi;
-    double Theta;
-    double Psi;
-    double vel_Phi;
-    double vel_Theta;
-    double vel_Psi;
-}; */
+/* Define the various supported flight models (most not yet implemented) */
+#define FG_LARCSIM     0   /* The only one that is currently implemented */
+#define FG_ACM         1
+#define FG_SUPER_SONIC 2
+#define FG_HELICOPTER  3
+#define FG_AUTOGYRO    4
+#define FG_BALLOON     5
+#define FG_PARACHUTE   6
+#define FG_SLEW        7    /* Slew (in MS terminology) */
+#define FG_EXTERN_GPS  8    /* Driven via a serially connected GPS */
+#define FG_EXTERN_NET  9    /* Driven externally via the net */
+#define FG_EXTERN_NASA 10   /* Track the space shuttle ? */
 
 
 typedef double FG_VECTOR_3[3];
 
 /* This is based heavily on LaRCsim/ls_generic.h */
-struct flight_params {
+typedef struct {
 
 /*================== Mass properties and geometry values ==================*/
 
@@ -393,26 +386,68 @@ struct flight_params {
 #define FG_Y_pilot_rwy             f->d_pilot_rwy_rwy_v[1]
 #define FG_H_pilot_rwy             f->d_pilot_rwy_rwy_v[2]
 
-};
+} fgFLIGHT, *pfgFlight;
+
+
+extern fgFLIGHT cur_flight_params;
 
 
 /* General interface to the flight model routines */
 
 /* Initialize the flight model parameters */
-int fgFlightModelInit(int model, struct flight_params *f, double dt);
+int fgFlightModelInit(int model, fgFLIGHT *f, double dt);
 
 /* Run multiloop iterations of the flight model */
-int fgFlightModelUpdate(int model, struct flight_params *f, int multiloop);
+int fgFlightModelUpdate(int model, fgFLIGHT *f, int multiloop);
 
 
-#endif FLIGHT_H
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _FLIGHT_H */
 
 
 /* $Log$
-/* Revision 1.6  1997/06/21 17:52:22  curt
-/* Continue directory shuffling ... everything should be compilable/runnable
-/* again.
+/* Revision 1.16  1998/04/22 13:26:20  curt
+/* C++ - ifing the code a bit.
 /*
+ * Revision 1.15  1998/04/21 16:59:33  curt
+ * Integrated autopilot.
+ * Prepairing for C++ integration.
+ *
+ * Revision 1.14  1998/02/07 15:29:37  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.13  1998/01/24 00:04:59  curt
+ * misc. tweaks.
+ *
+ * Revision 1.12  1998/01/22 02:59:32  curt
+ * Changed #ifdef FILE_H to #ifdef _FILE_H
+ *
+ * Revision 1.11  1998/01/19 19:27:03  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.10  1997/12/10 22:37:43  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.9  1997/09/04 02:17:33  curt
+ * Shufflin' stuff.
+ *
+ * Revision 1.8  1997/08/27 03:30:06  curt
+ * Changed naming scheme of basic shared structures.
+ *
+ * Revision 1.7  1997/07/23 21:52:19  curt
+ * Put comments around the text after an #endif for increased portability.
+ *
+ * Revision 1.6  1997/06/21 17:52:22  curt
+ * Continue directory shuffling ... everything should be compilable/runnable
+ * again.
+ *
  * Revision 1.5  1997/06/21 17:12:49  curt
  * Capitalized subdirectory names.
  *