Changed naming scheme of basic shared structures.

[flightgear.git] / Slew / slew.c

diff --git a/Slew/slew.c b/Slew/slew.c
index 9c27575daa810da176331ce7da37f190a9420f3d..3f81dfb1748cf8fd4678f0def8a937fdbe415a86 100644 (file)
--- a/Slew/slew.c
+++ b/Slew/slew.c
@@ -28,10 +28,15 @@
 
 #include "slew.h"
 #include "../flight.h"
-#include "../../aircraft/aircraft.h"
-#include "../../controls/controls.h"
+#include "../../Aircraft/aircraft.h"
+#include "../../Controls/controls.h"
+#include "../../constants.h"
 
 
+#ifndef M_PI                                    
+#define M_PI        3.14159265358979323846      /* pi */
+#endif                                                           
+
 #ifndef PI2                                               
 #define PI2  (M_PI + M_PI)                      
 #endif        
@@ -39,11 +44,11 @@
 
 /* reset flight params to a specific position */
 void fgSlewInit(double pos_x, double pos_y, double pos_z, double heading) {
-    struct flight_params *f;
+    struct FLIGHT *f;
 
     f = &current_aircraft.flight;
 
-    f->pos_x = pos_x;
+    /*    f->pos_x = pos_x;
     f->pos_y = pos_y;
     f->pos_z = pos_z;
 
@@ -59,36 +64,48 @@ void fgSlewInit(double pos_x, double pos_y, double pos_z, double heading) {
     f->vel_Theta = 0.0;
     f->vel_Psi = 0.0;
 
-    f->Psi = heading;
+    f->Psi = heading; */
 }
 
 
 /* update position based on inputs, positions, velocities, etc. */
 void fgSlewUpdate() {
-    struct flight_params *f;
-    struct control_params *c;
+    struct FLIGHT *f;
+    struct CONTROLS *c;
 
     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.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.
  *