diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-18 23:08:30 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-18 23:08:30 +0100 |
commit | e0866f30d25abd62fadb4b29fff90143c288e9ff (patch) | |
tree | 8e482e9d549e6bed4f6843d103b39c2591cb92d8 /logic/main-settings.hpp | |
parent | ee7a635a4c2222b8a77f26956dadcd9d515536a7 (diff) |
logic: change relative translation triggering
Relative translation mode now has three states:
- disabled
- always enabled
- enabled when not aiming
In the third mode, looking very close to center disables reltrans. The
exact values aren't final.
Diffstat (limited to 'logic/main-settings.hpp')
-rw-r--r-- | logic/main-settings.hpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/logic/main-settings.hpp b/logic/main-settings.hpp index 00fbe9cc..df86f856 100644 --- a/logic/main-settings.hpp +++ b/logic/main-settings.hpp @@ -15,6 +15,13 @@ #include "export.hpp" +enum reltrans_state +{ + reltrans_disabled = 0, + reltrans_enabled = 1, + reltrans_non_center = 2, +}; + namespace main_settings_impl { using namespace options; @@ -40,8 +47,9 @@ struct OTR_LOGIC_EXPORT main_settings final axis_opts a_x, a_y, a_z; axis_opts a_yaw, a_pitch, a_roll; axis_opts* all_axis_opts[6]; - value<bool> tcomp_p, tcomp_disable_tx, tcomp_disable_ty, tcomp_disable_tz; - value<bool> tcomp_disable_src_yaw, tcomp_disable_src_pitch, tcomp_disable_src_roll; + value<reltrans_state> reltrans_mode { b, "relative-translation-mode", reltrans_disabled }; + value<bool> reltrans_disable_tx, reltrans_disable_ty, reltrans_disable_tz; + value<bool> reltrans_disable_src_yaw, reltrans_disable_src_pitch, reltrans_disable_src_roll; value<bool> tray_enabled, tray_start; value<bool> center_at_startup; //value<int> center_method; |