From ce753c038213cce8d79eae9b8e4da082b9375db1 Mon Sep 17 00:00:00 2001 From: Henning Stahlke Date: Thu, 2 Feb 2017 09:27:01 +0100 Subject: [PATCH] YASim method name clarification Wing::setSpoiler --- 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 c300c4c75..f38a5911a 100644 --- a/src/FDM/YASim/ControlMap.cpp +++ b/src/FDM/YASim/ControlMap.cpp @@ -215,7 +215,7 @@ void ControlMap::applyControls(float dt) case FLAP0EFFECTIVENESS: ((Wing*)obj)->setFlap0Effectiveness(lval); break; case FLAP1: ((Wing*)obj)->setFlap1(lval, rval); 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 CYCLICAIL: ((Rotor*)obj)->setCyclicail(lval,rval); break; case CYCLICELE: ((Rotor*)obj)->setCyclicele(lval,rval); break; diff --git a/src/FDM/YASim/FGFDM.cpp b/src/FDM/YASim/FGFDM.cpp index 88013299a..2c2722db6 100644 --- a/src/FDM/YASim/FGFDM.cpp +++ b/src/FDM/YASim/FGFDM.cpp @@ -491,7 +491,7 @@ void FGFDM::startElement(const char* name, const XMLAttributes &atts) ((Wing*)_currObj)->setSlat(attrf(a, "start"), attrf(a, "end"), attrf(a, "aoa"), attrf(a, "drag")); } 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")); /* } else if(eq(name, "collective")) { ((Rotor*)_currObj)->setcollective(attrf(a, "min"), attrf(a, "max")); diff --git a/src/FDM/YASim/Wing.cpp b/src/FDM/YASim/Wing.cpp index a25d558f0..d49878da3 100644 --- a/src/FDM/YASim/Wing.cpp +++ b/src/FDM/YASim/Wing.cpp @@ -159,7 +159,7 @@ void Wing::setSlat(float start, float end, float aoa, float 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; _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); rval = Math::clamp(rval, 0, 1); diff --git a/src/FDM/YASim/Wing.hpp b/src/FDM/YASim/Wing.hpp index addcd4b6c..a0eb3f200 100644 --- a/src/FDM/YASim/Wing.hpp +++ b/src/FDM/YASim/Wing.hpp @@ -35,13 +35,13 @@ public: void setFlap0(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); // Set the control axes for the sub-surfaces void setFlap0(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 setFlap0Effectiveness(float lval); void setFlap1Effectiveness(float lval);