From e69f6ba9abdef11e7b590a00ac91edbb434b43d0 Mon Sep 17 00:00:00 2001 From: Henning Stahlke Date: Thu, 2 Feb 2017 09:40:25 +0100 Subject: [PATCH] YASim method name clarification Wind::setFlap0 --- src/FDM/YASim/ControlMap.cpp | 2 +- src/FDM/YASim/FGFDM.cpp | 2 +- src/FDM/YASim/Wing.cpp | 4 ++-- src/FDM/YASim/Wing.hpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FDM/YASim/ControlMap.cpp b/src/FDM/YASim/ControlMap.cpp index f38a5911a..9cdbc3d97 100644 --- a/src/FDM/YASim/ControlMap.cpp +++ b/src/FDM/YASim/ControlMap.cpp @@ -211,7 +211,7 @@ void ControlMap::applyControls(float dt) case LACCEL: ((Launchbar*)obj)->setAcceleration(lval); break; case CASTERING:((Gear*)obj)->setCastering(lval != 0); break; case SLAT: ((Wing*)obj)->setSlat(lval); break; - case FLAP0: ((Wing*)obj)->setFlap0(lval, rval); break; + case FLAP0: ((Wing*)obj)->setFlap0Pos(lval, rval); break; case FLAP0EFFECTIVENESS: ((Wing*)obj)->setFlap0Effectiveness(lval); break; case FLAP1: ((Wing*)obj)->setFlap1(lval, rval); break; case FLAP1EFFECTIVENESS: ((Wing*)obj)->setFlap1Effectiveness(lval); break; diff --git a/src/FDM/YASim/FGFDM.cpp b/src/FDM/YASim/FGFDM.cpp index 2c2722db6..9610ccc3b 100644 --- a/src/FDM/YASim/FGFDM.cpp +++ b/src/FDM/YASim/FGFDM.cpp @@ -482,7 +482,7 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts) w->setStallWidth(attrf(a, "width", 2) * DEG2RAD); w->setStallPeak(attrf(a, "peak", 1.5)); } else if(eq(name, "flap0")) { - ((Wing*)_currObj)->setFlap0(attrf(a, "start"), attrf(a, "end"), + ((Wing*)_currObj)->setFlap0Params(attrf(a, "start"), attrf(a, "end"), attrf(a, "lift"), attrf(a, "drag")); } else if(eq(name, "flap1")) { ((Wing*)_currObj)->setFlap1(attrf(a, "start"), attrf(a, "end"), diff --git a/src/FDM/YASim/Wing.cpp b/src/FDM/YASim/Wing.cpp index d49878da3..a638aea88 100644 --- a/src/FDM/YASim/Wing.cpp +++ b/src/FDM/YASim/Wing.cpp @@ -135,7 +135,7 @@ void Wing::setIncidence(float incidence) ((SurfRec*)_surfs.get(i))->surface->setIncidence(incidence); } -void Wing::setFlap0(float start, float end, float lift, float drag) +void Wing::setFlap0Params(float start, float end, float lift, float drag) { _flap0Start = start; _flap0End = end; @@ -167,7 +167,7 @@ void Wing::setSpoilerParams(float start, float end, float lift, float drag) _spoilerDrag = drag; } -void Wing::setFlap0(float lval, float rval) +void Wing::setFlap0Pos(float lval, float rval) { lval = Math::clamp(lval, -1, 1); rval = Math::clamp(rval, -1, 1); diff --git a/src/FDM/YASim/Wing.hpp b/src/FDM/YASim/Wing.hpp index a0eb3f200..8c462dad1 100644 --- a/src/FDM/YASim/Wing.hpp +++ b/src/FDM/YASim/Wing.hpp @@ -33,13 +33,13 @@ public: void setIncidence(float incidence); void setInducedDrag(float drag) { _inducedDrag = drag; } - void setFlap0(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 setSpoilerParams(float start, float end, float lift, float drag); void setSlat(float start, float end, float aoa, float drag); // Set the control axes for the sub-surfaces - void setFlap0(float lval, float rval); + void setFlap0Pos(float lval, float rval); void setFlap1(float lval, float rval); void setSpoilerPos(float lval, float rval); void setSlat(float val);