diff options
| author | Jacob Palecki <[email protected]> | 2020-09-22 13:08:31 -0700 |
|---|---|---|
| committer | Jacob Palecki <[email protected]> | 2020-09-22 13:08:31 -0700 |
| commit | 45285413a94c9c081098c672e69e9811ac5262b7 (patch) | |
| tree | 4c89d57a30226e2d1c007547fa5cf787118f3158 /common | |
| parent | Fix bug & rename x axis to input speed (diff) | |
| download | rawaccel-45285413a94c9c081098c672e69e9811ac5262b7.tar.xz rawaccel-45285413a94c9c081098c672e69e9811ac5262b7.zip | |
Rename experiment two to motivity
Diffstat (limited to 'common')
| -rw-r--r-- | common/accel-motivity.hpp (renamed from common/accel-experimenttwo.hpp) | 6 | ||||
| -rw-r--r-- | common/common.vcxitems | 2 | ||||
| -rw-r--r-- | common/rawaccel-settings.h | 2 | ||||
| -rw-r--r-- | common/rawaccel.hpp | 14 |
4 files changed, 12 insertions, 12 deletions
diff --git a/common/accel-experimenttwo.hpp b/common/accel-motivity.hpp index b248364..a37d1ce 100644 --- a/common/accel-experimenttwo.hpp +++ b/common/accel-motivity.hpp @@ -16,13 +16,13 @@ namespace rawaccel { }; /// <summary> Struct to hold sigmoid (s-shaped) gain implementation. </summary> - struct experimenttwo_impl { + struct motivity_impl { double rate; double limit; double midpoint; double subtractive_constant; - experimenttwo_impl(const accel_args& args) : + motivity_impl(const accel_args& args) : rate(pow(10,args.rate)), limit(2*log10(args.limit)), midpoint(log10(args.midpoint)) { subtractive_constant = limit / 2; @@ -84,6 +84,6 @@ namespace rawaccel { } }; - using accel_experimentone = nonadditive_accel<experimenttwo_impl>; + using accel_motivity = nonadditive_accel<motivity_impl>; } diff --git a/common/common.vcxitems b/common/common.vcxitems index b5cd374..fdf5cf4 100644 --- a/common/common.vcxitems +++ b/common/common.vcxitems @@ -17,7 +17,7 @@ <ClInclude Include="$(MSBuildThisFileDirectory)accel-base.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-classic.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-experimentone.hpp" /> - <ClInclude Include="$(MSBuildThisFileDirectory)accel-experimenttwo.hpp" /> + <ClInclude Include="$(MSBuildThisFileDirectory)accel-motivity.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-linear.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-logarithm.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-natural.hpp" /> diff --git a/common/rawaccel-settings.h b/common/rawaccel-settings.h index db5e192..00289b6 100644 --- a/common/rawaccel-settings.h +++ b/common/rawaccel-settings.h @@ -6,7 +6,7 @@ namespace rawaccel { enum class accel_mode { - linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, experimentone, noaccel + linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, motivity, noaccel }; struct settings { diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp index ca2d4d7..3eb9181 100644 --- a/common/rawaccel.hpp +++ b/common/rawaccel.hpp @@ -13,7 +13,7 @@ #include "accel-naturalgain.hpp" #include "accel-power.hpp" #include "accel-sigmoidgain.hpp" -#include "accel-experimenttwo.hpp" +#include "accel-motivity.hpp" #include "accel-noaccel.hpp" namespace rawaccel { @@ -87,7 +87,7 @@ namespace rawaccel { case accel_mode::sigmoidgain: return vis(var.u.sigmoidgain); case accel_mode::power: return vis(var.u.power); case accel_mode::logarithm: return vis(var.u.logarithm); - case accel_mode::experimentone: return vis(var.u.experimentone); + case accel_mode::motivity: return vis(var.u.motivity); default: return vis(var.u.noaccel); } } @@ -105,7 +105,7 @@ namespace rawaccel { accel_sigmoidgain sigmoidgain; accel_power power; accel_logarithm logarithm; - accel_experimentone experimentone; + accel_motivity motivity; accel_noaccel noaccel = {}; } u = {}; @@ -116,15 +116,15 @@ namespace rawaccel { impl = { args }; }, *this); - if (lookup && tag == accel_mode::experimentone) { - u.experimentone.fn.fill(lookup); + if (lookup && tag == accel_mode::motivity) { + u.motivity.fn.fill(lookup); } } inline double apply(double speed) const { - if (lookup && tag == accel_mode::experimentone) { - return u.experimentone.fn.apply(lookup, speed); + if (lookup && tag == accel_mode::motivity) { + return u.motivity.fn.apply(lookup, speed); } return visit_accel([=](auto&& impl) { |