fly/flightgear
1
0
Fork 0
Code Activity

YASim method name clarification Wind::setSlat

Browse source
This commit is contained in:
Henning Stahlke 2017-02-02 09:44:50 +01:00
parent 91806861c6
commit 91fd075796
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/YASim/ControlMap.cpp
View file

@ -210,7 +210,7 @@ void ControlMap::applyControls(float dt)
case LEXTEND: ((Launchbar*)obj)->setExtension(lval); break; case LEXTEND: ((Launchbar*)obj)->setExtension(lval); break;
case LACCEL: ((Launchbar*)obj)->setAcceleration(lval); break; case LACCEL: ((Launchbar*)obj)->setAcceleration(lval); break;
case CASTERING:((Gear*)obj)->setCastering(lval != 0); break; case CASTERING:((Gear*)obj)->setCastering(lval != 0); break;
case SLAT: ((Wing*)obj)->setSlat(lval); break; case SLAT: ((Wing*)obj)->setSlatPos(lval); break;
case FLAP0: ((Wing*)obj)->setFlap0Pos(lval, rval); break; case FLAP0: ((Wing*)obj)->setFlap0Pos(lval, rval); break;
case FLAP0EFFECTIVENESS: ((Wing*)obj)->setFlap0Effectiveness(lval); break; case FLAP0EFFECTIVENESS: ((Wing*)obj)->setFlap0Effectiveness(lval); break;
case FLAP1: ((Wing*)obj)->setFlap1Pos(lval, rval); break; case FLAP1: ((Wing*)obj)->setFlap1Pos(lval, rval); break;

2
src/FDM/YASim/FGFDM.cpp
View file

@ -488,7 +488,7 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts)
((Wing*)_currObj)->setFlap1Params(attrf(a, "start"), attrf(a, "end"), ((Wing*)_currObj)->setFlap1Params(attrf(a, "start"), attrf(a, "end"),
attrf(a, "lift"), attrf(a, "drag")); attrf(a, "lift"), attrf(a, "drag"));
} else if(eq(name, "slat")) { } else if(eq(name, "slat")) {
((Wing*)_currObj)->setSlat(attrf(a, "start"), attrf(a, "end"), ((Wing*)_currObj)->setSlatParams(attrf(a, "start"), attrf(a, "end"),
attrf(a, "aoa"), attrf(a, "drag")); attrf(a, "aoa"), attrf(a, "drag"));
} else if(eq(name, "spoiler")) { } else if(eq(name, "spoiler")) {
((Wing*)_currObj)->setSpoilerParams(attrf(a, "start"), attrf(a, "end"), ((Wing*)_currObj)->setSpoilerParams(attrf(a, "start"), attrf(a, "end"),

4
src/FDM/YASim/Wing.cpp
View file

@ -151,7 +151,7 @@ void Wing::setFlap1Params(float start, float end, float lift, float drag)
_flap1Drag = drag; _flap1Drag = drag;
} }
void Wing::setSlat(float start, float end, float aoa, float drag) void Wing::setSlatParams(float start, float end, float aoa, float drag)
{ {
_slatStart = start; _slatStart = start;
_slatEnd = end; _slatEnd = end;
@ -220,7 +220,7 @@ void Wing::setSpoilerPos(float lval, float rval)
} }
} }
void Wing::setSlat(float val) void Wing::setSlatPos(float val)
{ {
val = Math::clamp(val, 0, 1); val = Math::clamp(val, 0, 1);
int i; int i;

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

@ -36,13 +36,13 @@ public:
void setFlap0Params(float start, float end, float lift, float drag); void setFlap0Params(float start, float end, float lift, float drag);
void setFlap1Params(float start, float end, float lift, float drag); void setFlap1Params(float start, float end, float lift, float drag);
void setSpoilerParams(float start, float end, float lift, float drag); void setSpoilerParams(float start, float end, float lift, float drag);
void setSlat(float start, float end, float aoa, float drag); void setSlatParams(float start, float end, float aoa, float drag);
// Set the control axes for the sub-surfaces // Set the control axes for the sub-surfaces
void setFlap0Pos(float lval, float rval); void setFlap0Pos(float lval, float rval);
void setFlap1Pos(float lval, float rval); void setFlap1Pos(float lval, float rval);
void setSpoilerPos(float lval, float rval); void setSpoilerPos(float lval, float rval);
void setSlat(float val); void setSlatPos(float val);
void setFlap0Effectiveness(float lval); void setFlap0Effectiveness(float lval);
void setFlap1Effectiveness(float lval); void setFlap1Effectiveness(float lval);