From 91fd075796739e081c024f659d906ad0c8618a5f Mon Sep 17 00:00:00 2001 From: Henning Stahlke Date: Thu, 2 Feb 2017 09:44:50 +0100 Subject: [PATCH] YASim method name clarification Wind::setSlat --- 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 fd95c75ed..6a51650f1 100644 --- a/src/FDM/YASim/ControlMap.cpp +++ b/src/FDM/YASim/ControlMap.cpp @@ -210,7 +210,7 @@ void ControlMap::applyControls(float dt) case LEXTEND: ((Launchbar*)obj)->setExtension(lval); break; case LACCEL: ((Launchbar*)obj)->setAcceleration(lval); 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 FLAP0EFFECTIVENESS: ((Wing*)obj)->setFlap0Effectiveness(lval); break; case FLAP1: ((Wing*)obj)->setFlap1Pos(lval, rval); break; diff --git a/src/FDM/YASim/FGFDM.cpp b/src/FDM/YASim/FGFDM.cpp index 36c1e9e51..acc467fc7 100644 --- a/src/FDM/YASim/FGFDM.cpp +++ b/src/FDM/YASim/FGFDM.cpp @@ -488,7 +488,7 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts) ((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"), + ((Wing*)_currObj)->setSlatParams(attrf(a, "start"), attrf(a, "end"), attrf(a, "aoa"), attrf(a, "drag")); } else if(eq(name, "spoiler")) { ((Wing*)_currObj)->setSpoilerParams(attrf(a, "start"), attrf(a, "end"), diff --git a/src/FDM/YASim/Wing.cpp b/src/FDM/YASim/Wing.cpp index a7c85bf75..3b8101f4d 100644 --- a/src/FDM/YASim/Wing.cpp +++ b/src/FDM/YASim/Wing.cpp @@ -151,7 +151,7 @@ void Wing::setFlap1Params(float start, float end, float lift, float 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; _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); int i; diff --git a/src/FDM/YASim/Wing.hpp b/src/FDM/YASim/Wing.hpp index b8f3a3d91..a2d5c87cc 100644 --- a/src/FDM/YASim/Wing.hpp +++ b/src/FDM/YASim/Wing.hpp @@ -36,13 +36,13 @@ public: void setFlap0Params(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); + void setSlatParams(float start, float end, float aoa, float drag); // Set the control axes for the sub-surfaces void setFlap0Pos(float lval, float rval); void setFlap1Pos(float lval, float rval); void setSpoilerPos(float lval, float rval); - void setSlat(float val); + void setSlatPos(float val); void setFlap0Effectiveness(float lval); void setFlap1Effectiveness(float lval);