YASim Airplane: move one-liners to header and remove unused code.

src/FDM/YASim/Airplane.cpp

@@ -17,7 +17,6 @@
 namespace yasim {
 
 // gadgets
-inline float norm(float f) { return f<1 ? 1/f : f; }
 inline float abs(float f) { return f<0 ? -f : f; }
 
 // Solver threshold.  How close to the solution are we trying
@@ -114,16 +113,6 @@ void Airplane::calcFuelWeights()
     }
 }
 
-ControlMap* Airplane::getControlMap()
-{
-    return &_controls;
-}
-
-Model* Airplane::getModel()
-{
-    return &_model;
-}
-
 void Airplane::getPilotAccel(float* out)
 {
     State* s = _model.getState();
@@ -146,43 +135,6 @@ void Airplane::getPilotAccel(float* out)
     // FIXME: rotational & centripetal acceleration needed
 }
 
-void Airplane::setPilotPos(float* pos)
-{
-    int i;
-    for(i=0; i<3; i++) _pilotPos[i] = pos[i];
-}
-
-void Airplane::getPilotPos(float* out)
-{
-    int i;
-    for(i=0; i<3; i++) out[i] = _pilotPos[i];
-}
-
-int Airplane::numGear()
-{
-    return _gears.size();
-}
-
-Gear* Airplane::getGear(int g)
-{
-    return ((GearRec*)_gears.get(g))->gear;
-}
-
-Hook* Airplane::getHook()
-{
-    return _model.getHook();
-}
-
-Launchbar* Airplane::getLaunchbar()
-{
-    return _model.getLaunchbar();
-}
-
-Rotorgear* Airplane::getRotorgear()
-{
-    return _model.getRotorgear();
-}
-
 void Airplane::updateGearState()
 {
     for(int i=0; i<_gears.size(); i++) {
@@ -248,51 +200,6 @@ void Airplane::addSolutionWeight(bool approach, int idx, float wgt)
     _solveWeights.add(w);
 }
 
-int Airplane::numTanks()
-{
-    return _tanks.size();
-}
-
-float Airplane::getFuel(int tank)
-{
-    return ((Tank*)_tanks.get(tank))->fill;
-}
-
-float Airplane::setFuel(int tank, float fuel)
-{
-    return ((Tank*)_tanks.get(tank))->fill = fuel;
-}
-
-float Airplane::getFuelDensity(int tank)
-{
-    return ((Tank*)_tanks.get(tank))->density;
-}
-
-float Airplane::getTankCapacity(int tank)
-{
-    return ((Tank*)_tanks.get(tank))->cap;
-}
-
-void Airplane::setEmptyWeight(float weight)
-{
-    _emptyWeight = weight;
-}
-
-void Airplane::setWing(Wing* wing)
-{
-    _wing = wing;
-}
-
-void Airplane::setTail(Wing* tail)
-{
-    _tail = tail;
-}
-
-void Airplane::addVStab(Wing* vstab)
-{
-    _vstabs.add(vstab);
-}
-
 void Airplane::addFuselage(float* front, float* back, float width,
                            float taper, float mid, 
                            float cx, float cy, float cz, float idrag)
@@ -333,21 +240,6 @@ void Airplane::addGear(Gear* gear)
     _gears.add(g);
 }
 
-void Airplane::addHook(Hook* hook)
-{
-    _model.addHook(hook);
-}
-
-void Airplane::addHitch(Hitch* hitch)
-{
-    _model.addHitch(hitch);
-}
-
-void Airplane::addLaunchbar(Launchbar* launchbar)
-{
-    _model.addLaunchbar(launchbar);
-}
-
 void Airplane::addThruster(Thruster* thruster, float mass, float* cg)
 {
     ThrustRec* t = new ThrustRec();
@@ -402,44 +294,13 @@ void Airplane::setWeight(int handle, float mass)
 
 void Airplane::setFuelFraction(float frac)
 {
-    int i;
+    for(int i=0; i<_tanks.size(); i++) {
-    for(i=0; i<_tanks.size(); i++) {
         Tank* t = (Tank*)_tanks.get(i);
         t->fill = frac * t->cap;
         _model.getBody()->setMass(t->handle, t->cap * frac);
     }
 }
 
-float Airplane::getDragCoefficient()
-{
-    return _dragFactor;
-}
-
-float Airplane::getLiftRatio()
-{
-    return _liftRatio;
-}
-
-float Airplane::getCruiseAoA()
-{
-    return _cruiseAoA;
-}
-
-float Airplane::getTailIncidence()
-{
-    return _tailIncidence;
-}
-
-const char* Airplane::getFailureMsg()
-{
-    return _failureMsg;
-}
-
-int Airplane::getSolutionIterations()
-{
-    return _solutionIterations;
-}
-
 void Airplane::setupState(const float aoa, const float speed, const float gla, State* s)
 {
     float cosAoA = Math::cos(aoa);
@@ -451,8 +312,7 @@ void Airplane::setupState(const float aoa, const float speed, const float gla, S
     //? what is gla? v[1]=y, v[2]=z? should sin go to v2 instead v1?
     s->v[0] = speed*Math::cos(gla); s->v[1] = -speed*Math::sin(gla); s->v[2] = 0;
 
-    int i;
+    for(int i=0; i<3; i++)
-    for(i=0; i<3; i++)
 	s->pos[i] = s->rot[i] = s->acc[i] = s->racc[i] = 0;
 
     // Put us 1m above the origin, or else the gravity computation in
@@ -464,9 +324,7 @@ void Airplane::addContactPoint(float* pos)
 {
     ContactRec* c = new ContactRec;
     c->gear = 0;
-    c->p[0] = pos[0];
+    Math::set3(pos, c->p);
-    c->p[1] = pos[1];
-    c->p[2] = pos[2];
     _contacts.add(c);
 }
 
@@ -677,8 +535,7 @@ void Airplane::compileContactPoints()
     float spring = (1/DIST) * 9.8f * 10.0f * mass;
     float damp = 2 * Math::sqrt(spring * mass);
 
-    int i;
+    for(int i=0; i<_contacts.size(); i++) {
-    for(i=0; i<_contacts.size(); i++) {
         ContactRec* c = (ContactRec*)_contacts.get(i);
 
         Gear* g = new Gear();
@@ -865,8 +722,7 @@ void Airplane::initEngines()
 
 void Airplane::stabilizeThrust()
 {
-    int i;
+    for(int i=0; i<_thrusters.size(); i++)
-    for(i=0; i<_thrusters.size(); i++)
 	_model.getThruster(i)->stabilize();
 }
 
@@ -1044,14 +900,6 @@ void Airplane::applyLiftRatio(float factor)
     }
 }
 
-/// Helper for solve()
-float Airplane::clamp(float val, float min, float max)
-{
-    if(val < min) return min;
-    if(val > max) return max;
-    return val;
-}
-
 /// Helper for solve()
 float Airplane::normFactor(float f)
 {
@@ -1162,8 +1010,8 @@ void Airplane::solve()
 	_cruiseAoA += SOLVE_TWEAK*aoaDelta;
 	_tailIncidence += SOLVE_TWEAK*tailDelta;
 	
-	_cruiseAoA = clamp(_cruiseAoA, -0.175f, 0.175f);
+	_cruiseAoA = Math::clamp(_cruiseAoA, -0.175f, 0.175f);
-	_tailIncidence = clamp(_tailIncidence, -0.175f, 0.175f);
+	_tailIncidence = Math::clamp(_tailIncidence, -0.175f, 0.175f);
 
         if(abs(xforce/_cruiseWeight) < STHRESH*0.0001 &&
            abs(alift/_approachWeight) < STHRESH*0.0001 &&

src/FDM/YASim/Airplane.hpp

@@ -27,30 +27,30 @@ public:
     void iterate(float dt);
     void calcFuelWeights();
 
-    ControlMap* getControlMap();
+    ControlMap* getControlMap() { return &_controls; }
-    Model* getModel();
+    Model* getModel() { return &_model; }
 
-    void setPilotPos(float* pos);
+    void setPilotPos(float* pos) { Math::set3(pos, _pilotPos); }
-    void getPilotPos(float* out);
+    void getPilotPos(float* out) { Math::set3(_pilotPos, out); }
 
     void getPilotAccel(float* out);
 
-    void setEmptyWeight(float weight);
+    void setEmptyWeight(float weight) {  _emptyWeight = weight; }
 
-    void setWing(Wing* wing);
+    void setWing(Wing* wing) { _wing = wing; }
-    void setTail(Wing* tail);
+    void setTail(Wing* tail) { _tail = tail; }
-    void addVStab(Wing* vstab);
+    void addVStab(Wing* vstab) { _vstabs.add(vstab); }
 
     void addFuselage(float* front, float* back, float width,
                      float taper=1, float mid=0.5,
                      float cx=1, float cy=1, float cz=1, float idrag=1);
     int addTank(float* pos, float cap, float fuelDensity);
     void addGear(Gear* g);
-    void addHook(Hook* h);
+    void addHook(Hook* h) { _model.addHook(h); }
-    void addLaunchbar(Launchbar* l);
+    void addLaunchbar(Launchbar* l) { _model.addLaunchbar(l); }
     void addThruster(Thruster* t, float mass, float* cg);
     void addBallast(float* pos, float mass);
-    void addHitch(Hitch* h);
+    void addHitch(Hitch* h) { _model.addHitch(h); }
 
     int addWeight(float* pos, float size);
     void setWeight(int handle, float mass);
@@ -64,37 +64,40 @@ public:
 
     void addSolutionWeight(bool approach, int idx, float wgt);
 
-    int numGear();
+    int numGear() { return _gears.size(); }
-    Gear* getGear(int g);
+    Gear* getGear(int g) { return ((GearRec*)_gears.get(g))->gear; }
-    Hook* getHook();
+    Hook* getHook() { return _model.getHook(); }
     int numHitches() { return _hitches.size(); }
     Hitch* getHitch(int h);
-    Rotorgear* getRotorgear();
+    Rotorgear* getRotorgear() { return _model.getRotorgear(); }
-    Launchbar* getLaunchbar();
+    Launchbar* getLaunchbar() { return _model.getLaunchbar(); }
 
     int numThrusters() { return _thrusters.size(); }
     Thruster* getThruster(int n) {
         return ((ThrustRec*)_thrusters.get(n))->thruster; }
     
-    int numTanks();
+    int numTanks() { return _tanks.size(); }
     void setFuelFraction(float frac); // 0-1, total amount of fuel
-    float getFuel(int tank); // in kg!
+    // get fuel in kg
-    float setFuel(int tank, float fuel); // in kg!
+    float getFuel(int tank) { return ((Tank*)_tanks.get(tank))->fill; }
-    float getFuelDensity(int tank); // kg/m^3
+    // set fuel in kg
-    float getTankCapacity(int tank);
+    float setFuel(int tank, float fuel) { return ((Tank*)_tanks.get(tank))->fill = fuel; }
+    // get fuel density in kg/m^3
+    float getFuelDensity(int tank) { return ((Tank*)_tanks.get(tank))->density; }
+    float getTankCapacity(int tank) { return ((Tank*)_tanks.get(tank))->cap; }
 
     void compile(); // generate point masses & such, then solve
     void initEngines();
     void stabilizeThrust();
 
     // Solution output values
-    int getSolutionIterations();
+    int getSolutionIterations() { return _solutionIterations; }
-    float getDragCoefficient();
+    float getDragCoefficient() { return _dragFactor; }
-    float getLiftRatio();
+    float getLiftRatio() { return _liftRatio; }
-    float getCruiseAoA();
+    float getCruiseAoA() { return _cruiseAoA; }
-    float getTailIncidence();
+    float getTailIncidence() { return _tailIncidence; }
     float getApproachElevator() { return _approachElevator.val; }
-    const char* getFailureMsg();
+    const char* getFailureMsg() { return _failureMsg; }
 
     static void setupState(const float aoa, const float speed, const float gla, yasim::State* s); // utility
     void loadApproachControls();
@@ -124,7 +127,6 @@ private:
     void compileGear(GearRec* gr);
     void applyDragFactor(float factor);
     void applyLiftRatio(float factor);
-    float clamp(float val, float min, float max);
     void addContactPoint(float* pos);
     void compileContactPoints();
     float normFactor(float f);