Encapsulate the interpolstion version of FGEnvironment and fix some bugs

[flightgear.git] / src / FDM / JSBSim / JSBSim.hxx

diff --git a/src/FDM/JSBSim/JSBSim.hxx b/src/FDM/JSBSim/JSBSim.hxx
index 67bdae4cfa68f31db9f38a1c575382156d52f485..3e11f54ab78ad7bcdcd9f64bd7b07183dd699f5a 100644 (file)
--- a/src/FDM/JSBSim/JSBSim.hxx
+++ b/src/FDM/JSBSim/JSBSim.hxx
@@ -53,10 +53,11 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <simgear/misc/props.hxx>
+#include <simgear/props/props.hxx>
 
 #include <FDM/JSBSim/FGFDMExec.h>
 
+namespace JSBSim {
 class FGState;
 class FGAtmosphere;
 class FGFCS;
@@ -71,10 +72,9 @@ class FGPosition;
 class FGAuxiliary;
 class FGOutput;
 class FGInitialCondition;
+}
 
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+using namespace JSBSim;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DOCUMENTATION
@@ -181,31 +181,27 @@ public:
     //@{
     /** Sets the atmospheric static pressure
         @param p pressure in psf */
-    void set_Static_pressure(double p);
+//     void set_Static_pressure(double p);
 
     /** Sets the atmospheric temperature
         @param T temperature in degrees rankine */
-    void set_Static_temperature(double T);
+//     void set_Static_temperature(double T);
 
     /** Sets the atmospheric density.
         @param rho air density slugs/cubic foot */
-    void set_Density(double rho);
+//     void set_Density(double rho);
 
     /** Sets the velocity of the local airmass for wind modeling.
         @param wnorth velocity north in fps
         @param weast velocity east in fps
         @param wdown velocity down in fps*/
-    void set_Velocities_Local_Airmass (double wnorth,
-                                      double weast,
-                                      double wdown );
     /// @name Position Parameter Update
     //@{
 
 
     /** Update the position based on inputs, positions, velocities, etc.
-        @param multiloop number of times to loop through the FDM
-             @return true if successful */
-    void update( int multiloop );
+        @param dt delta time in seconds. */
+    void update(double dt);
     bool ToggleDataLogging(bool state);
     bool ToggleDataLogging(void);
     void do_trim(void);
@@ -253,9 +249,21 @@ private:
     SGPropertyNode *right_aileron_pos_pct;
     SGPropertyNode *rudder_pos_pct;
     SGPropertyNode *flap_pos_pct;
+    SGPropertyNode *speedbrake_pos_pct;
+    SGPropertyNode *spoilers_pos_pct;
     
     SGPropertyNode *gear_pos_pct;
     
+    SGPropertyNode *temperature;
+    SGPropertyNode *pressure;
+    SGPropertyNode *density;
+    SGPropertyNode *turbulence_gain;
+    SGPropertyNode *turbulence_rate;
+    
+    SGPropertyNode *wind_from_north;
+    SGPropertyNode *wind_from_east;
+    SGPropertyNode *wind_from_down;
+    
     void init_gear(void);
     void update_gear(void);