C++-ifying.

[flightgear.git] / LaRCsim / ls_interface.c

diff --git a/LaRCsim/ls_interface.c b/LaRCsim/ls_interface.c
index 8a8dd993b17757cddbcda1f14ca44c99c97ea4a3..0a12df1dd6acf09ca3efc6ee49714e7b883039ba 100644 (file)
--- a/LaRCsim/ls_interface.c
+++ b/LaRCsim/ls_interface.c
@@ -240,8 +240,11 @@ $Original log: LaRCsim.c,v $
 #include "ls_aux.h"
 #include "ls_model.h"
 #include "ls_init.h"
-#include <Flight/flight.h>
-#include <Aircraft/aircraft.h>
+
+// #include <Flight/flight.h>
+// #include <Aircraft/aircraft.h>
+// #include <Debug/fg_debug.h>
+
 
 /* global variable declarations */
 
@@ -252,7 +255,6 @@ COCKPIT         cockpit_;
 
 SCALAR                 Simtime;
 
-/* #define DEFAULT_TERM_UPDATE_HZ 20 */ /* original value */
 #define DEFAULT_TERM_UPDATE_HZ 20
 #define DEFAULT_MODEL_HZ 120
 #define DEFAULT_END_TIME 3600.
@@ -496,17 +498,17 @@ void ls_loop( SCALAR dt, int initialize ) {
 
 
 int ls_cockpit( void ) {
-    fgCONTROLS *c;
+    // fgCONTROLS *c;
 
     sim_control_.paused = 0;
 
-    c = current_aircraft.controls;
+    // c = current_aircraft.controls;
 
-    Lat_control = FG_Aileron;
-    Long_control = FG_Elevator;
-    Long_trim = FG_Elev_Trim;
-    Rudder_pedal = FG_Rudder;
-    Throttle_pct = FG_Throttle[0];
+    // Lat_control = FG_Aileron;
+    // Long_control = FG_Elevator;
+    // Long_trim = FG_Elev_Trim;
+    // Rudder_pedal = FG_Rudder;
+    // Throttle_pct = FG_Throttle[0];
 
     /* printf("Mach = %.2f  ", Mach_number);
     printf("%.4f,%.4f,%.2f  ", Latitude, Longitude, Altitude);
@@ -518,7 +520,7 @@ int ls_cockpit( void ) {
 
 /* Initialize the LaRCsim flight model, dt is the time increment for
    each subsequent iteration through the EOM */
-int fgLaRCsimInit(double dt) {
+int ls_toplevel_init(double dt) {
     model_dt = dt;
 
     ls_setdefopts();           /* set default options */
@@ -530,11 +532,11 @@ int fgLaRCsimInit(double dt) {
        return 1;
     }
 
-    printf("LS pre Init pos = %.2f\n", Latitude);
+    /* printf("LS pre Init pos = %.2f\n", Latitude); */
 
     ls_init();
 
-    printf("LS post Init pos = %.2f\n", Latitude);
+    /* printf("LS post Init pos = %.2f\n", Latitude); */
 
     if (speedup > 0) {
        /* Initialize (get) cockpit (controls) settings */
@@ -546,7 +548,7 @@ int fgLaRCsimInit(double dt) {
 
 
 /* Run an iteration of the EOM (equations of motion) */
-int fgLaRCsimUpdate(int multiloop) {
+int ls_update(int multiloop) {
     int        i;
 
     if (speedup > 0) {
@@ -557,10 +559,11 @@ int fgLaRCsimUpdate(int multiloop) {
        ls_loop( model_dt, 0);
     }
 
-    return(1);
+    return 1;
 }
 
 
+#if 0
 /* Convert from the fgFLIGHT struct to the LaRCsim generic_ struct */
 int fgFlight_2_LaRCsim (fgFLIGHT *f) {
     Mass =      FG_Mass;
@@ -911,10 +914,51 @@ int fgLaRCsim_2_Flight (fgFLIGHT *f) {
 
     return ( 0 );
 }
+#endif
+
+/* Set the altitude (force) */
+int ls_ForceAltitude(double alt_feet) {
+    Altitude = alt_feet;
+    ls_geod_to_geoc( Latitude, Altitude, &Sea_level_radius, &Lat_geocentric);
+    Radius_to_vehicle = Altitude + Sea_level_radius;
+}
+
 
 /* Flight Gear Modification Log
  *
  * $Log$
+ * Revision 1.23  1998/10/16 23:27:44  curt
+ * C++-ifying.
+ *
+ * Revision 1.22  1998/09/29 02:02:59  curt
+ * Added a brake + autopilot mods.
+ *
+ * Revision 1.21  1998/08/22  14:49:56  curt
+ * Attempting to iron out seg faults and crashes.
+ * Did some shuffling to fix a initialization order problem between view
+ * position, scenery elevation.
+ *
+ * Revision 1.20  1998/07/12 03:11:03  curt
+ * Removed some printf()'s.
+ * Fixed the autopilot integration so it should be able to update it's control
+ *   positions every time the internal flight model loop is run, and not just
+ *   once per rendered frame.
+ * Added a routine to do the necessary stuff to force an arbitrary altitude
+ *   change.
+ * Gave the Navion engine just a tad more power.
+ *
+ * Revision 1.19  1998/05/11 18:17:28  curt
+ * Output message tweaking.
+ *
+ * Revision 1.18  1998/04/21 16:59:38  curt
+ * Integrated autopilot.
+ * Prepairing for C++ integration.
+ *
+ * Revision 1.17  1998/02/23 19:07:58  curt
+ * Incorporated Durk's Astro/ tweaks.  Includes unifying the sun position
+ * calculation code between sun display, and other FG sections that use this
+ * for things like lighting.
+ *
  * Revision 1.16  1998/02/07 15:29:38  curt
  * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
  * <chotchkiss@namg.us.anritsu.com>