summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-09-16 19:25:03 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-09-16 19:25:03 +0200
commit7586930b5388d4debf9d2b463aa8275a56690afb (patch)
tree840e1a10806a876d1a53d16b83e66f6e5c39be1c
parent9020dc7c04d389d534f36890756d97d2be219e07 (diff)
filter/accela: increase max movement speed caps
Closes #452 Closes #431
-rw-r--r--filter-accela/ftnoir_filter_accela.h20
-rw-r--r--filter-accela/ftnoir_filter_accela_dialog.cpp5
2 files changed, 22 insertions, 3 deletions
diff --git a/filter-accela/ftnoir_filter_accela.h b/filter-accela/ftnoir_filter_accela.h
index b6bd81e6..38518931 100644
--- a/filter-accela/ftnoir_filter_accela.h
+++ b/filter-accela/ftnoir_filter_accela.h
@@ -20,6 +20,12 @@ struct settings_accela : opts
{
static constexpr double rot_gains[16][2] =
{
+ { 12, 500 },
+ { 11, 450 },
+ { 10, 400 },
+ { 9, 350 },
+ { 8, 300 },
+ { 7, 250 },
{ 6, 200 },
{ 2.66, 50 },
{ 1.66, 17 },
@@ -31,9 +37,17 @@ struct settings_accela : opts
static constexpr double trans_gains[16][2] =
{
- { 2.33, 40 },
- { 1.66, 13 },
- { 1.33, 5 },
+ { 12, 400 },
+ { 11, 350 },
+ { 10, 300 },
+ { 9, 250 },
+ { 8, 200 },
+ { 7, 150 },
+ { 5, 80 },
+ { 3, 32 },
+ { 2, 10 },
+ { 1.66, 6 },
+ { 1.33, 3 },
{ .66, 1 },
{ .33, .5 },
{ 0, 0 },
diff --git a/filter-accela/ftnoir_filter_accela_dialog.cpp b/filter-accela/ftnoir_filter_accela_dialog.cpp
index 89ad80aa..594d04fd 100644
--- a/filter-accela/ftnoir_filter_accela_dialog.cpp
+++ b/filter-accela/ftnoir_filter_accela_dialog.cpp
@@ -44,6 +44,7 @@ FilterControls::FilterControls()
{
//#define SPLINE_ROT_DEBUG
+//#define SPLINE_TRANS_DEBUG
#if defined(SPLINE_ROT_DEBUG) || defined(SPLINE_TRANS_DEBUG)
spline rot, trans;
s.make_splines(rot, trans);
@@ -55,8 +56,12 @@ FilterControls::FilterControls()
r.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
#if defined(SPLINE_TRANS_DEBUG)
+# if defined(SPLINE_ROT_DEBUG)
+# error "rot xor trans"
+# endif
r.setConfig(&trans);
#else
+
r.setConfig(&rot);
#endif
r.setFixedSize(1024, 600);