First cut at a turbulence model for YASim. It's a

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

diff --git a/src/FDM/YASim/Airplane.hpp b/src/FDM/YASim/Airplane.hpp
index 9a38700a029387fc1db9dfbf66ee41d21ad18e38..16f0ca714fc97da975ad308886be53112da7ed81 100644 (file)
--- a/src/FDM/YASim/Airplane.hpp
+++ b/src/FDM/YASim/Airplane.hpp
@@ -4,6 +4,7 @@
 #include "ControlMap.hpp"
 #include "Model.hpp"
 #include "Wing.hpp"
+#include "Rotor.hpp"
 #include "Vector.hpp"
 
 namespace yasim {
@@ -17,6 +18,7 @@ public:
     ~Airplane();
 
     void iterate(float dt);
+    void consumeFuel(float dt);
 
     ControlMap* getControlMap();
     Model* getModel();
@@ -32,6 +34,10 @@ public:
     void setTail(Wing* tail);
     void addVStab(Wing* vstab);
 
+    void addRotor(Rotor* Rotor);
+    int getNumRotors() {return _rotors.size();}
+    Rotor* getRotor(int i) {return (Rotor*)_rotors.get(i);}
+
     void addFuselage(float* front, float* back, float width,
                      float taper=1, float mid=0.5);
     int addTank(float* pos, float cap, float fuelDensity);
@@ -46,6 +52,7 @@ public:
     void setApproach(float speed, float altitude, float aoa); 
     void setCruise(float speed, float altitude);
 
+    void setElevatorControl(int control);
     void addApproachControl(int control, float val);
     void addCruiseControl(int control, float val);
 
@@ -56,6 +63,7 @@ public:
     void setFuelFraction(float frac); // 0-1, total amount of fuel
     float getFuel(int tank); // in kg!
     float getFuelDensity(int tank); // kg/m^3
+    float getTankCapacity(int tank);
 
     void compile(); // generate point masses & such, then solve
     void initEngines();
@@ -67,6 +75,7 @@ public:
     float getLiftRatio();
     float getCruiseAoA();
     float getTailIncidence();
+    float getApproachElevator() { return _approachElevator.val; }
     char* getFailureMsg();
 
 private:
@@ -84,7 +93,9 @@ private:
     void setupState(float aoa, float speed, State* s);
     void solveGear();
     void solve();
+    void solveHelicopter();
     float compileWing(Wing* w);
+    float compileRotor(Rotor* w);
     float compileFuselage(Fuselage* f);
     void compileGear(GearRec* gr);
     void applyDragFactor(float factor);
@@ -115,6 +126,8 @@ private:
     Vector _weights;
     Vector _surfs; // NON-wing Surfaces
 
+    Vector _rotors;
+
     Vector _cruiseControls;
     State _cruiseState;
     float _cruiseP;
@@ -135,6 +148,7 @@ private:
     float _liftRatio;
     float _cruiseAoA;
     float _tailIncidence;
+    Control _approachElevator;
     char* _failureMsg;
 };