Merge branch 'durk/atcdcl-cond'

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

diff --git a/src/FDM/YASim/FGFDM.hpp b/src/FDM/YASim/FGFDM.hpp
index ee701b02b836063cefadf326675a924b8bf99476..0d5b43e379e9feee6a1291c4ee9d090bf910dce0 100644 (file)
--- a/src/FDM/YASim/FGFDM.hpp
+++ b/src/FDM/YASim/FGFDM.hpp
@@ -27,6 +27,8 @@ public:
     // XML parsing callback from XMLVisitor
     virtual void startElement(const char* name, const XMLAttributes &atts);
 
+    float getVehicleRadius(void) const { return _vehicle_radius; }
+
 private:
     struct AxisRec { char* name; int handle; };
     struct EngRec { char* prefix; Thruster* eng; };
@@ -34,25 +36,33 @@ private:
     struct PropOut { SGPropertyNode* prop; int handle, type; bool left;
                      float min, max; };
 
-    void setOutputProperties();
+    void setOutputProperties(float dt);
 
     Rotor* parseRotor(XMLAttributes* a, const char* name);
     Wing* parseWing(XMLAttributes* a, const char* name);
     int parseAxis(const char* name);
     int parseOutput(const char* name);
     void parseWeight(XMLAttributes* a);
+    void parseTurbineEngine(XMLAttributes* a);
+    void parsePistonEngine(XMLAttributes* a);
     void parsePropeller(XMLAttributes* a);
     bool eq(const char* a, const char* b);
+    bool caseeq(const char* a, const char* b);
     char* dup(const char* s);
-    int attri(XMLAttributes* atts, char* attr);
-    int attri(XMLAttributes* atts, char* attr, int def); 
-    float attrf(XMLAttributes* atts, char* attr);
-    float attrf(XMLAttributes* atts, char* attr, float def); 
-    bool attristrue(XMLAttributes* atts, char* attr);
+    int attri(XMLAttributes* atts, const char* attr);
+    int attri(XMLAttributes* atts, const char* attr, int def); 
+    float attrf(XMLAttributes* atts, const char* attr);
+    float attrf(XMLAttributes* atts, const char* attr, float def); 
+    double attrd(XMLAttributes* atts, const char* attr);
+    double attrd(XMLAttributes* atts, const char* attr, double def); 
+    bool attrb(XMLAttributes* atts, const char* attr);
 
     // The core Airplane object we manage.
     Airplane _airplane;
 
+    // Aerodynamic turbulence model
+    Turbulence* _turb;
+
     // The list of "axes" that we expect to find as input.  These are
     // typically property names.
     Vector _axes;
@@ -66,6 +76,9 @@ private:
     // Output properties for the ControlMap
     Vector _controlProps;
 
+    // Radius of the vehicle, for intersection testing.
+    float _vehicle_radius;
+
     // Parsing temporaries
     void* _currObj;
     bool _cruiseCurr;