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

[flightgear.git] / FDM / flight.h

diff --git a/FDM/flight.h b/FDM/flight.h
index 2f978bc75a39a62a2ffde094baf664d887b0a7b9..2ac8abbe5997db9f96d1cd6157836d170faea08c 100644 (file)
--- a/FDM/flight.h
+++ b/FDM/flight.h
@@ -28,37 +28,26 @@
 #define FLIGHT_H
 
 
-#include "slew/slew.h"
+#include "Slew/slew.h"
 #include "LaRCsim/ls_interface.h"
 
 
-/* Define the various supported flight models (not all implemented) */
-#define FG_SLEW      0
-#define FG_LARCSIM   1
-#define FG_ACM       2
-#define FG_HELO      3
-#define FG_BALLOON   4
-#define FG_PARACHUTE 5
-
-
-/* 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
+#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
+#define FG_EXTERN_NET  8
 
 
 typedef double FG_VECTOR_3[3];
 
 /* This is based heavily on LaRCsim/ls_generic.h */
-struct flight_params {
+struct fgFLIGHT {
 
 /*================== Mass properties and geometry values ==================*/
 
@@ -397,19 +386,39 @@ struct 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, struct 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, struct fgFLIGHT *f, int multiloop);
 
 
-#endif FLIGHT_H
+#endif /* FLIGHT_H */
 
 
 /* $Log$
-/* Revision 1.4  1997/05/29 22:39:57  curt
-/* Working on incorporating the LaRCsim flight model.
+/* 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.
+ *
+ * Revision 1.4  1997/05/29 22:39:57  curt
+ * Working on incorporating the LaRCsim flight model.
+ *
  * Revision 1.3  1997/05/29 02:32:25  curt
  * Starting to build generic flight model interface.
  *