FGPUIDialog: fix reading from already free'd memory.

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

diff --git a/src/FDM/YASim/Propeller.hpp b/src/FDM/YASim/Propeller.hpp
index 2e4d3f565add50ee638f778cf5ba7029554abbe0..3f2b6099eb5de35b6b0ad14473f74565d5ccdab7 100644 (file)
--- a/src/FDM/YASim/Propeller.hpp
+++ b/src/FDM/YASim/Propeller.hpp
@@ -16,23 +16,36 @@ public:
     // course.
     Propeller(float radius, float v, float omega, float rho, float power);
 
+    void setStops (float fine_stop, float coarse_stop);
+
     void setTakeoff(float omega0, float power0);
 
     void modPitch(float mod);
 
+    void setPropPitch(float proppitch);
+
+    void setPropFeather(int state);
+
+    void setManualPitch();
+
     void calc(float density, float v, float omega,
              float* thrustOut, float* torqueOut);
 
 private:
     float _r;           // characteristic radius
-    float _J0;          // zero-thrust advance ratio
+    float _j0;          // zero-thrust advance ratio
     float _baseJ0;      //  ... uncorrected for prop advance
-    float _F0;          // thrust coefficient
+    float _f0;          // thrust coefficient
     float _etaC;        // Peak efficiency
     float _lambdaPeak;  // constant, ~0.759835;
     float _beta;        // constant, ~1.48058;
     float _tc0;         // thrust "coefficient" at takeoff
+    float _fine_stop;   // ratio for minimum pitch (high RPM)
+    float _coarse_stop; // ratio for maximum pitch (low RPM)
     bool  _matchTakeoff; // Does _tc0 mean anything?
+    bool  _manual;      // manual pitch mode
+    float _proppitch;   // prop pitch control setting (0 ~ 1.0)
+    float _propfeather; // prop feather control setting (0 = norm, 1 = feather)
 };
 
 }; // namespace yasim