simplify name/number handling

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

diff --git a/src/FDM/YASim/Airplane.hpp b/src/FDM/YASim/Airplane.hpp
index 762ff33fdc98c4e8eafb1cc29e65e25301f2d7d3..ad8b2c13e1678c6574e3f9337bff75cdb91dd56b 100644 (file)
--- a/src/FDM/YASim/Airplane.hpp
+++ b/src/FDM/YASim/Airplane.hpp
@@ -36,10 +36,6 @@ 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);
@@ -64,6 +60,7 @@ public:
     int numGear();
     Gear* getGear(int g);
     Hook* getHook();
+    Rotorgear* getRotorgear();
     Launchbar* getLaunchbar();
 
     int numThrusters() { return _thrusters.size(); }
@@ -90,6 +87,8 @@ public:
     float getApproachElevator() { return _approachElevator.val; }
     char* getFailureMsg();
 
+    static void setupState(float aoa, float speed, State* s); // utility
+
 private:
     struct Tank { float pos[3]; float cap; float fill;
                  float density; int handle; };
@@ -104,12 +103,11 @@ private:
 
     void runCruise();
     void runApproach();
-    void setupState(float aoa, float speed, State* s);
     void solveGear();
     void solve();
     void solveHelicopter();
     float compileWing(Wing* w);
-    float compileRotor(Rotor* w);
+    float compileRotorgear();
     float compileFuselage(Fuselage* f);
     void compileGear(GearRec* gr);
     void applyDragFactor(float factor);
@@ -141,8 +139,6 @@ private:
     Vector _weights;
     Vector _surfs; // NON-wing Surfaces
 
-    Vector _rotors;
-
     Vector _solveWeights;
 
     Vector _cruiseControls;