fly/flightgear
1
0
Fork 0
Code Activity

YASim method name clarification Wing::setSpoiler

Browse source
This commit is contained in:
Henning Stahlke 2017-02-02 09:27:01 +01:00
parent b447bbdc5e
commit ce753c0382
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

@ -215,7 +215,7 @@ void ControlMap::applyControls(float dt)
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)->setFlap1(lval, rval); break;
case FLAP1EFFECTIVENESS: ((Wing*)obj)->setFlap1Effectiveness(lval); break; case FLAP1EFFECTIVENESS: ((Wing*)obj)->setFlap1Effectiveness(lval); break;
case SPOILER: ((Wing*)obj)->setSpoiler(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;
case CYCLICAIL: ((Rotor*)obj)->setCyclicail(lval,rval); break; case CYCLICAIL: ((Rotor*)obj)->setCyclicail(lval,rval); break;
case CYCLICELE: ((Rotor*)obj)->setCyclicele(lval,rval); break; case CYCLICELE: ((Rotor*)obj)->setCyclicele(lval,rval); break;

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

@ -491,7 +491,7 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts)
((Wing*)_currObj)->setSlat(attrf(a, "start"), attrf(a, "end"), ((Wing*)_currObj)->setSlat(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)->setSpoiler(attrf(a, "start"), attrf(a, "end"), ((Wing*)_currObj)->setSpoilerParams(attrf(a, "start"), attrf(a, "end"),
attrf(a, "lift"), attrf(a, "drag")); attrf(a, "lift"), attrf(a, "drag"));
/* } else if(eq(name, "collective")) { /* } else if(eq(name, "collective")) {
((Rotor*)_currObj)->setcollective(attrf(a, "min"), attrf(a, "max")); ((Rotor*)_currObj)->setcollective(attrf(a, "min"), attrf(a, "max"));

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

@ -159,7 +159,7 @@ void Wing::setSlat(float start, float end, float aoa, float drag)
_slatDrag = drag; _slatDrag = drag;
} }
void Wing::setSpoiler(float start, float end, float lift, float drag) void Wing::setSpoilerParams(float start, float end, float lift, float drag)
{ {
_spoilerStart = start; _spoilerStart = start;
_spoilerEnd = end; _spoilerEnd = end;
@ -209,7 +209,7 @@ void Wing::setFlap1Effectiveness(float lval)
} }
} }
void Wing::setSpoiler(float lval, float rval) void Wing::setSpoilerPos(float lval, float rval)
{ {
lval = Math::clamp(lval, 0, 1); lval = Math::clamp(lval, 0, 1);
rval = Math::clamp(rval, 0, 1); rval = Math::clamp(rval, 0, 1);

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

@ -35,13 +35,13 @@ public:
void setFlap0(float start, float end, float lift, float drag); void setFlap0(float start, float end, float lift, float drag);
void setFlap1(float start, float end, float lift, float drag); void setFlap1(float start, float end, float lift, float drag);
void setSpoiler(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 setFlap0(float lval, float rval); void setFlap0(float lval, float rval);
void setFlap1(float lval, float rval); void setFlap1(float lval, float rval);
void setSpoiler(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);
void setFlap1Effectiveness(float lval); void setFlap1Effectiveness(float lval);