fly/flightgear
1
0
Fork 0
Code Activity

YASim: refactoring loadControls()

Browse source
This commit is contained in:
Henning Stahlke 2017-04-07 22:36:07 +02:00
parent dbfe9a7b41
commit 7f5a91ea47
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/FDM/YASim/Airplane.cpp
View file

@ -770,11 +770,11 @@ void Airplane::setupWeights(bool isApproach)
} }
/// load values for controls as defined in cruise configuration /// load values for controls as defined in cruise configuration
void Airplane::loadCruiseControls() void Airplane::loadControls(Vector& controls)
{ {
_controls.reset(); _controls.reset();
for(int i=0; i<_cruiseControls.size(); i++) { for(int i=0; i < controls.size(); i++) {
Control* c = (Control*)_cruiseControls.get(i); Control* c = (Control*)controls.get(i);
_controls.setInput(c->control, c->val); _controls.setInput(c->control, c->val);
} }
_controls.applyControls(); _controls.applyControls();
@ -789,7 +789,7 @@ void Airplane::runCruise()
Atmosphere::calcStdDensity(_cruiseP, _cruiseT)); Atmosphere::calcStdDensity(_cruiseP, _cruiseT));
// The control configuration // The control configuration
loadCruiseControls(); loadControls(_cruiseControls);
// The local wind // The local wind
float wind[3]; float wind[3];
@ -818,17 +818,6 @@ void Airplane::runCruise()
_model.calcForces(&_cruiseState); _model.calcForces(&_cruiseState);
} }
/// load values for controls as defined in approach configuration
void Airplane::loadApproachControls()
{
_controls.reset();
for(int i=0; i<_approachControls.size(); i++) {
Control* c = (Control*)_approachControls.get(i);
_controls.setInput(c->control, c->val);
}
_controls.applyControls();
}
/// Helper for solve() /// Helper for solve()
void Airplane::runApproach() void Airplane::runApproach()
{ {
@ -838,7 +827,7 @@ void Airplane::runApproach()
Atmosphere::calcStdDensity(_approachP, _approachT)); Atmosphere::calcStdDensity(_approachP, _approachT));
// The control configuration // The control configuration
loadApproachControls(); loadControls(_approachControls);
// The local wind // The local wind
float wind[3]; float wind[3];

5
src/FDM/YASim/Airplane.hpp
View file

@ -100,8 +100,8 @@ public:
const char* getFailureMsg() { return _failureMsg; } const char* getFailureMsg() { return _failureMsg; }
static void setupState(const float aoa, const float speed, const float gla, yasim::State* s); // utility static void setupState(const float aoa, const float speed, const float gla, yasim::State* s); // utility
void loadApproachControls(); void loadApproachControls() { loadControls(_approachControls); }
void loadCruiseControls(); void loadCruiseControls() { loadControls(_cruiseControls); }
float getCGMinX() { return _cgMinX; } float getCGMinX() { return _cgMinX; }
float getCGMaxX() { return _cgMaxX; } float getCGMaxX() { return _cgMaxX; }
@ -119,6 +119,7 @@ private:
struct SolveWeight { bool approach; int idx; float wgt; }; struct SolveWeight { bool approach; int idx; float wgt; };
struct ContactRec { Gear* gear; float p[3]; }; struct ContactRec { Gear* gear; float p[3]; };
void loadControls(Vector &controls);
void runCruise(); void runCruise();
void runApproach(); void runApproach();
void solveGear(); void solveGear();