fly/flightgear
1
0
Fork 0
Code Activity

YASim method name clarification Wind::setFlap1

Browse source
This commit is contained in:
Henning Stahlke 2017-02-02 09:42:29 +01:00
parent e69f6ba9ab
commit 91806861c6
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

@ -213,7 +213,7 @@ void ControlMap::applyControls(float dt)
case SLAT: ((Wing*)obj)->setSlat(lval); break; case SLAT: ((Wing*)obj)->setSlat(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)->setFlap1(lval, rval); break; case FLAP1: ((Wing*)obj)->setFlap1Pos(lval, rval); break;
case FLAP1EFFECTIVENESS: ((Wing*)obj)->setFlap1Effectiveness(lval); break; case FLAP1EFFECTIVENESS: ((Wing*)obj)->setFlap1Effectiveness(lval); break;
case SPOILER: ((Wing*)obj)->setSpoilerPos(lval, rval); break; case SPOILER: ((Wing*)obj)->setSpoilerPos(lval, rval); break;
case COLLECTIVE: ((Rotor*)obj)->setCollective(lval); break; case COLLECTIVE: ((Rotor*)obj)->setCollective(lval); break;

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

@ -485,7 +485,7 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts)
((Wing*)_currObj)->setFlap0Params(attrf(a, "start"), attrf(a, "end"), ((Wing*)_currObj)->setFlap0Params(attrf(a, "start"), attrf(a, "end"),
attrf(a, "lift"), attrf(a, "drag")); attrf(a, "lift"), attrf(a, "drag"));
} else if(eq(name, "flap1")) { } else if(eq(name, "flap1")) {
((Wing*)_currObj)->setFlap1(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)->setSlat(attrf(a, "start"), attrf(a, "end"),

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

@ -143,7 +143,7 @@ void Wing::setFlap0Params(float start, float end, float lift, float drag)
_flap0Drag = drag; _flap0Drag = drag;
} }
void Wing::setFlap1(float start, float end, float lift, float drag) void Wing::setFlap1Params(float start, float end, float lift, float drag)
{ {
_flap1Start = start; _flap1Start = start;
_flap1End = end; _flap1End = end;
@ -188,7 +188,7 @@ void Wing::setFlap0Effectiveness(float lval)
} }
} }
void Wing::setFlap1(float lval, float rval) void Wing::setFlap1Pos(float lval, float rval)
{ {
lval = Math::clamp(lval, -1, 1); lval = Math::clamp(lval, -1, 1);
rval = Math::clamp(rval, -1, 1); rval = Math::clamp(rval, -1, 1);

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

@ -34,13 +34,13 @@ public:
void setInducedDrag(float drag) { _inducedDrag = drag; } void setInducedDrag(float drag) { _inducedDrag = drag; }
void setFlap0Params(float start, float end, float lift, float drag); void setFlap0Params(float start, float end, float lift, float drag);
void setFlap1(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 setSlat(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 setFlap1(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 setSlat(float val);
void setFlap0Effectiveness(float lval); void setFlap0Effectiveness(float lval);