From 7622f542daa27db332334d0af25faa9651a1c831 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Sat, 19 Sep 2020 21:24:59 -0700 Subject: log sigmoid sens done --- common/rawaccel.hpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'common/rawaccel.hpp') diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp index 8819302..2914225 100644 --- a/common/rawaccel.hpp +++ b/common/rawaccel.hpp @@ -13,6 +13,7 @@ #include "accel-naturalgain.hpp" #include "accel-power.hpp" #include "accel-sigmoidgain.hpp" +#include "accel-experimentone.hpp" #include "accel-noaccel.hpp" namespace rawaccel { @@ -86,6 +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); default: return vis(var.u.noaccel); } } @@ -101,6 +103,7 @@ namespace rawaccel { accel_sigmoidgain sigmoidgain; accel_power power; accel_logarithm logarithm; + accel_experimentone experimentone; accel_noaccel noaccel = {}; } u = {}; -- cgit v1.2.3 From 75c5f80cad2b671df2d20c4b0395b5aec1bc10af Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Tue, 22 Sep 2020 03:01:34 -0400 Subject: add lut exp to driver --- common/rawaccel.hpp | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'common/rawaccel.hpp') diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp index 2914225..ca2d4d7 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-experimentone.hpp" +#include "accel-experimenttwo.hpp" #include "accel-noaccel.hpp" namespace rawaccel { @@ -93,6 +93,8 @@ namespace rawaccel { } struct accel_variant { + si_pair* lookup; + accel_mode tag = accel_mode::noaccel; union union_t { @@ -107,15 +109,24 @@ namespace rawaccel { accel_noaccel noaccel = {}; } u = {}; - accel_variant(const accel_args& args, accel_mode mode) : - tag(mode) + accel_variant(const accel_args& args, accel_mode mode, si_pair* lut = nullptr) : + tag(mode), lookup(lut) { visit_accel([&](auto& impl) { impl = { args }; }, *this); + + if (lookup && tag == accel_mode::experimentone) { + u.experimentone.fn.fill(lookup); + } + } inline double apply(double speed) const { + if (lookup && tag == accel_mode::experimentone) { + return u.experimentone.fn.apply(lookup, speed); + } + return visit_accel([=](auto&& impl) { return impl(speed); }, *this); @@ -193,8 +204,8 @@ namespace rawaccel { velocity_gain_cap gain_cap; accel_scale_clamp clamp; - accelerator(const accel_args& args, accel_mode mode) : - accel(args, mode), gain_cap(args.gain_cap, accel), clamp(args.scale_cap) + accelerator(const accel_args& args, accel_mode mode, si_pair* lut = nullptr) : + accel(args, mode, lut), gain_cap(args.gain_cap, accel), clamp(args.scale_cap) {} inline double apply(double speed) const { @@ -216,7 +227,7 @@ namespace rawaccel { vec2 accels; vec2d sensitivity = { 1, 1 }; - mouse_modifier(const settings& args) : + mouse_modifier(const settings& args, vec2 luts = {}) : combine_magnitudes(args.combine_mags) { if (args.degrees_rotation != 0) { @@ -233,8 +244,8 @@ namespace rawaccel { return; } - accels.x = accelerator(args.argsv.x, args.modes.x); - accels.y = accelerator(args.argsv.y, args.modes.y); + accels.x = accelerator(args.argsv.x, args.modes.x, luts.x); + accels.y = accelerator(args.argsv.y, args.modes.y, luts.y); apply_accel = true; } -- cgit v1.2.3 From 45285413a94c9c081098c672e69e9811ac5262b7 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 13:08:31 -0700 Subject: Rename experiment two to motivity --- common/rawaccel.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'common/rawaccel.hpp') 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) { -- cgit v1.2.3 From f4ff6334df8a3fd66d13082606b69a78fa592237 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 22 Sep 2020 15:26:08 -0700 Subject: Remove sigmoidgain, only allow one instance of grapher to run at a time --- common/rawaccel.hpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'common/rawaccel.hpp') diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp index 3eb9181..2e627c9 100644 --- a/common/rawaccel.hpp +++ b/common/rawaccel.hpp @@ -12,7 +12,6 @@ #include "accel-natural.hpp" #include "accel-naturalgain.hpp" #include "accel-power.hpp" -#include "accel-sigmoidgain.hpp" #include "accel-motivity.hpp" #include "accel-noaccel.hpp" @@ -84,10 +83,9 @@ namespace rawaccel { case accel_mode::classic: return vis(var.u.classic); case accel_mode::natural: return vis(var.u.natural); case accel_mode::naturalgain: return vis(var.u.naturalgain); - 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::motivity: return vis(var.u.motivity); + case accel_mode::motivity: return vis(var.u.motivity); default: return vis(var.u.noaccel); } } @@ -102,7 +100,6 @@ namespace rawaccel { accel_classic classic; accel_natural natural; accel_naturalgain naturalgain; - accel_sigmoidgain sigmoidgain; accel_power power; accel_logarithm logarithm; accel_motivity motivity; -- cgit v1.2.3