Moved JSBSim.hxx to src/FDM/JSBSim/

[flightgear.git] / src / FDM / YASim / FGFDM.hpp

diff --git a/src/FDM/YASim/FGFDM.hpp b/src/FDM/YASim/FGFDM.hpp
index 1df02b65371d28fab4bed26954ac538288b6e2b6..f9506dbd289c51843ad31cea70b322052a79aa5a 100644 (file)
--- a/src/FDM/YASim/FGFDM.hpp
+++ b/src/FDM/YASim/FGFDM.hpp
@@ -1,10 +1,10 @@
 #ifndef _FGFDM_HPP
 #define _FGFDM_HPP
 
-#include <simgear/easyxml.hxx>
+#include <simgear/xml/easyxml.hxx>
 
 #include "Airplane.hpp"
-#include "util/Vector.hpp"
+#include "Vector.hpp"
 
 namespace yasim {
 
@@ -19,6 +19,7 @@ public:
     ~FGFDM();
     void init();
     void iterate(float dt);
+    void getExternalInput(float dt=1e6);
 
     Airplane* getAirplane();
 
@@ -27,10 +28,9 @@ public:
 
 private:
     struct AxisRec { char* name; int handle; };
-    struct EngRec { char* prefix; void* eng; };
+    struct EngRec { char* prefix; Thruster* eng; };
     struct WeightRec { char* prop; float size; int handle; };
 
-    void getExternalInput(float dt);
     void setOutputProperties();
 
     Wing* parseWing(XMLAttributes* a, const char* name);
@@ -56,8 +56,7 @@ private:
     Vector _weights;
 
     // Engine types.  Contains an EngRec structure.
-    Vector _jets;
-    Vector _pistons;
+    Vector _thrusters;
 
     // Parsing temporaries
     void* _currObj;