From 91806861c66a6f89c78b680f0406406d71f39a44 Mon Sep 17 00:00:00 2001 From: Henning Stahlke Date: Thu, 2 Feb 2017 09:42:29 +0100 Subject: [PATCH] YASim method name clarification Wind::setFlap1 --- 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 9cdbc3d97..fd95c75ed 100644 --- a/src/FDM/YASim/ControlMap.cpp +++ b/src/FDM/YASim/ControlMap.cpp @@ -213,7 +213,7 @@ void ControlMap::applyControls(float dt) case SLAT: ((Wing*)obj)->setSlat(lval); 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 FLAP1: ((Wing*)obj)->setFlap1Pos(lval, rval); break; case FLAP1EFFECTIVENESS: ((Wing*)obj)->setFlap1Effectiveness(lval); break; case SPOILER: ((Wing*)obj)->setSpoilerPos(lval, rval); break; case COLLECTIVE: ((Rotor*)obj)->setCollective(lval); break; diff --git a/src/FDM/YASim/FGFDM.cpp b/src/FDM/YASim/FGFDM.cpp index 9610ccc3b..36c1e9e51 100644 --- a/src/FDM/YASim/FGFDM.cpp +++ b/src/FDM/YASim/FGFDM.cpp @@ -485,7 +485,7 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts) ((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"), + ((Wing*)_currObj)->setFlap1Params(attrf(a, "start"), attrf(a, "end"), attrf(a, "lift"), attrf(a, "drag")); } else if(eq(name, "slat")) { ((Wing*)_currObj)->setSlat(attrf(a, "start"), attrf(a, "end"), diff --git a/src/FDM/YASim/Wing.cpp b/src/FDM/YASim/Wing.cpp index a638aea88..a7c85bf75 100644 --- a/src/FDM/YASim/Wing.cpp +++ b/src/FDM/YASim/Wing.cpp @@ -143,7 +143,7 @@ void Wing::setFlap0Params(float start, float end, float lift, float 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; _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); rval = Math::clamp(rval, -1, 1); diff --git a/src/FDM/YASim/Wing.hpp b/src/FDM/YASim/Wing.hpp index 8c462dad1..b8f3a3d91 100644 --- a/src/FDM/YASim/Wing.hpp +++ b/src/FDM/YASim/Wing.hpp @@ -34,13 +34,13 @@ public: void setInducedDrag(float drag) { _inducedDrag = 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 setSlat(float start, float end, float aoa, float drag); // Set the control axes for the sub-surfaces 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 setSlat(float val); void setFlap0Effectiveness(float lval);