Tweaks to Gnu automake/autoconf system.

[flightgear.git] / Slew / slew.c

diff --git a/Slew/slew.c b/Slew/slew.c
index 9c27575daa810da176331ce7da37f190a9420f3d..ca1d3533a5a93005055af44655c3ff952b26cc8c 100644 (file)
--- a/Slew/slew.c
+++ b/Slew/slew.c
@@ -26,23 +26,20 @@
 
 #include <math.h>
 
-#include "slew.h"
-#include "../flight.h"
-#include "../../aircraft/aircraft.h"
-#include "../../controls/controls.h"
-
-
-#ifndef PI2                                               
-#define PI2  (M_PI + M_PI)                      
-#endif        
+#include <Flight/Slew/slew.h>
+#include <Flight/flight.h>
+#include <Aircraft/aircraft.h>
+#include <Controls/controls.h>
+#include <Include/fg_constants.h>
 
 
 /* reset flight params to a specific position */
 void fgSlewInit(double pos_x, double pos_y, double pos_z, double heading) {
-    struct flight_params *f;
+    fgFLIGHT *f;
 
-    f = &current_aircraft.flight;
+    f = current_aircraft.flight;
 
+    /*
     f->pos_x = pos_x;
     f->pos_y = pos_y;
     f->pos_z = pos_z;
@@ -60,35 +57,71 @@ void fgSlewInit(double pos_x, double pos_y, double pos_z, double heading) {
     f->vel_Psi = 0.0;
 
     f->Psi = heading;
+    */
 }
 
 
 /* update position based on inputs, positions, velocities, etc. */
-void fgSlewUpdate() {
-    struct flight_params *f;
-    struct control_params *c;
+void fgSlewUpdate( void ) {
+    fgFLIGHT *f;
+    fgCONTROLS *c;
 
-    f = &current_aircraft.flight;
-    c = &current_aircraft.controls;
+    f = current_aircraft.flight;
+    c = current_aircraft.controls;
 
-    f->Psi += ( c->aileron / 8 );
-    if ( f->Psi > PI2 ) {
-       f->Psi -= PI2;
+    /* f->Psi += ( c->aileron / 8 );
+    if ( f->Psi > FG_2PI ) {
+       f->Psi -= FG_2PI;
     } else if ( f->Psi < 0 ) {
-       f->Psi += PI2;
+       f->Psi += FG_2PI;
     }
 
     f->vel_x = -c->elev;
 
     f->pos_x = f->pos_x + (cos(f->Psi) * f->vel_x);
-    f->pos_y = f->pos_y + (sin(f->Psi) * f->vel_x);
+    f->pos_y = f->pos_y + (sin(f->Psi) * f->vel_x); */
 }
 
 
 /* $Log$
-/* Revision 1.2  1997/05/29 12:30:19  curt
-/* Some initial mods to work better in a timer environment.
+/* Revision 1.12  1998/04/08 23:35:30  curt
+/* Tweaks to Gnu automake/autoconf system.
 /*
+ * Revision 1.11  1998/02/07 15:29:39  curt
+ * Incorporated HUD changes and struct/typedef changes from Charlie Hotchkiss
+ * <chotchkiss@namg.us.anritsu.com>
+ *
+ * Revision 1.10  1998/01/27 00:47:53  curt
+ * Incorporated Paul Bleisch's <bleisch@chromatic.com> new debug message
+ * system and commandline/config file processing code.
+ *
+ * Revision 1.9  1998/01/19 19:27:06  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.8  1998/01/19 18:40:30  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
+ * Revision 1.7  1997/12/15 23:54:42  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.6  1997/08/27 03:30:11  curt
+ * Changed naming scheme of basic shared structures.
+ *
+ * Revision 1.5  1997/07/19 22:35:06  curt
+ * Moved fiddled with PI to avoid compiler warnings.
+ *
+ * Revision 1.4  1997/06/21 17:12:51  curt
+ * Capitalized subdirectory names.
+ *
+ * Revision 1.3  1997/05/29 22:40:00  curt
+ * Working on incorporating the LaRCsim flight model.
+ *
+ * Revision 1.2  1997/05/29 12:30:19  curt
+ * Some initial mods to work better in a timer environment.
+ *
  * Revision 1.1  1997/05/29 02:29:42  curt
  * Moved to their own directory.
  *