fly/flightgear
1
0
Fork 0
Code Activity

YASIM type name clarification

Browse source
This commit is contained in:
Henning Stahlke 2017-12-13 19:15:49 +01:00
parent 13e00b275b
commit e913e44aa0
2 changed files with 135 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,9 +60,9 @@ Airplane::~Airplane()
for(i=0; i<_solveWeights.size(); i++)
delete (SolveWeight*)_solveWeights.get(i);
for(i=0; i<_cruiseConfig.controls.size(); i++)
delete (Control*)_cruiseConfig.controls.get(i);
delete (ControlSetting*)_cruiseConfig.controls.get(i);
for(i=0; i<_approachConfig.controls.size(); i++) {
Control* c = (Control*)_approachConfig.controls.get(i);
ControlSetting* c = (ControlSetting*)_approachConfig.controls.get(i);
if(c != &_approachElevator)
delete c;
}
@ -152,7 +152,7 @@ void Airplane::setElevatorControl(int control)
void Airplane::addApproachControl(int control, float val)
{
Control* c = new Control();
ControlSetting* c = new ControlSetting();
c->control = control;
c->val = val;
_approachConfig.controls.add(c);
@ -160,7 +160,7 @@ void Airplane::addApproachControl(int control, float val)
void Airplane::addCruiseControl(int control, float val)
{
Control* c = new Control();
ControlSetting* c = new ControlSetting();
c->control = control;
c->val = val;
_cruiseConfig.controls.add(c);
@ -720,7 +720,7 @@ void Airplane::loadControls(const Vector& controls)
{
_controls.reset();
for(int i=0; i < controls.size(); i++) {
Control* c = (Control*)controls.get(i);
ControlSetting* c = (ControlSetting*)controls.get(i);
_controls.setInput(c->control, c->val);
}
_controls.applyControls();

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

@ -134,7 +134,7 @@ private:
float cg[3];
float mass;
};
struct Control {
struct ControlSetting {
int control;
float val;
};
@ -210,7 +210,7 @@ private:
float _dragFactor {1};
float _liftRatio {1};
float _tailIncidence {0};
Control _approachElevator;
ControlSetting _approachElevator;
const char* _failureMsg {0};
float _cgMax {-1e6}; // hard limits for cg from gear position