logic: hardcode trackmouse stuff

3 files changed, 26 insertions, 51 deletions

diff --git a/logic/main-settings.hpp b/logic/main-settings.hpp
index 1c8c2264..c5c00a4e 100644
--- a/logic/main-settings.hpp
+++ b/logic/main-settings.hpp
@@ -44,17 +44,18 @@ struct axis_opts final
     // note, these two bundles can be the same value with no issues
     bundle b_settings_window, b_mapping_window;
     value<double> zero;
-    value<int> src;
-    value<bool> invert, altp;
-    value<max_clamp> clamp;
+    int src;
+    bool invert;
+    bool altp;
+    max_clamp clamp;
     axis_opts(bundle b_settings_window, bundle b_mapping_window, QString pfx, Axis idx) :
         b_settings_window(b_settings_window),
         b_mapping_window(b_mapping_window),
         zero(b_settings_window, n(pfx, "zero-pos"), 0),
-        src(b_settings_window, n(pfx, "source-index"), idx),
-        invert(b_settings_window, n(pfx, "invert-sign"), false),
-        altp(b_mapping_window, n(pfx, "alt-axis-sign"), false),
-        clamp(b_mapping_window, n(pfx, "max-value"), idx >= Yaw ? r180 : t30)
+        src(idx),
+        invert(false),
+        altp(false),
+        clamp(idx >= Yaw ? r180 : t30)
     {}
 private:
     static inline QString n(QString pfx, QString name)
@@ -93,26 +94,13 @@ struct main_settings
     bundle b, b_map;
     axis_opts a_x, a_y, a_z;
     axis_opts a_yaw, a_pitch, a_roll;
-    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<bool> tray_enabled, tray_start;
-    value<int> camera_yaw, camera_pitch, camera_roll;
-    value<bool> use_camera_offset_from_centering;
-    value<bool> center_at_startup;
-    value<int> center_method;
-    value<int> neck_y, neck_z;
-    value<bool> neck_enable;
     key_opts key_start_tracking1, key_start_tracking2;
     key_opts key_stop_tracking1, key_stop_tracking2;
     key_opts key_toggle_tracking1, key_toggle_tracking2;
     key_opts key_restart_tracking1, key_restart_tracking2;
     key_opts key_center1, key_center2;
     key_opts key_toggle1, key_toggle2;
-    key_opts key_zero1, key_zero2;
-    key_opts key_toggle_press1, key_toggle_press2;
-    key_opts key_zero_press1, key_zero_press2;
-    value<bool> tracklogging_enabled;
-    value<QString> tracklogging_filename;
     main_settings() :
         b(make_bundle("opentrack-ui")),
         b_map(make_bundle("opentrack-mappings")),
@@ -122,24 +110,8 @@ struct main_settings
         a_yaw(b, b_map, "yaw", Yaw),
         a_pitch(b, b_map, "pitch", Pitch),
         a_roll(b, b_map, "roll", Roll),
-        tcomp_p(b, "compensate-translation", false),
-        tcomp_disable_tx(b, "compensate-translation-disable-x-axis", false),
-        tcomp_disable_ty(b, "compensate-translation-disable-y-axis", false),
-        tcomp_disable_tz(b, "compensate-translation-disable-z-axis", false),
-        tcomp_disable_src_yaw(b, "compensate-translation-disable-source-yaw", false),
-        tcomp_disable_src_pitch(b, "compensate-translation-disable-source-pitch", false),
-        tcomp_disable_src_roll(b, "compensate-translation-disable-source-roll", false),
         tray_enabled(b, "use-system-tray", false),
         tray_start(b, "start-in-tray", false),
-        camera_yaw(b, "camera-yaw", 0),
-        camera_pitch(b, "camera-pitch", 0),
-        camera_roll(b, "camera-roll", 0),
-        use_camera_offset_from_centering(b, "use-camera-offset-from-centering", false),
-        center_at_startup(b, "center-at-startup", true),
-        center_method(b, "centering-method", 1),
-        neck_y(b, "neck-height", 0),
-        neck_z(b, "neck-depth", 0),
-        neck_enable(b, "neck-enable", false),
         key_start_tracking1(b, "start-tracking"),
         key_start_tracking2(b, "start-tracking-alt"),
         key_stop_tracking1(b, "stop-tracking"),
@@ -151,15 +123,7 @@ struct main_settings
         key_center1(b, "center"),
         key_center2(b, "center-alt"),
         key_toggle1(b, "toggle"),
-        key_toggle2(b, "toggle-alt"),
-        key_zero1(b, "zero"),
-        key_zero2(b, "zero-alt"),
-        key_toggle_press1(b, "toggle-press"),
-        key_toggle_press2(b, "toggle-press-alt"),
-        key_zero_press1(b, "zero-press"),
-        key_zero_press2(b, "zero-press-alt"),
-        tracklogging_enabled(b, "tracklogging-enabled", false),
-        tracklogging_filename(b, "tracklogging-filename", QString())
+        key_toggle2(b, "toggle-alt")
     {
     }
 };
diff --git a/logic/tracker.cpp b/logic/tracker.cpp
index 9b085108..2fbe2498 100644
--- a/logic/tracker.cpp
+++ b/logic/tracker.cpp
@@ -38,7 +38,6 @@ Tracker::Tracker(Mappings& m, SelectedLibraries& libs, TrackLogger& logger) :
     backlog_time(0),
     tracking_started(false)
 {
-    set(f_center, s.center_at_startup);
 }
 
 Tracker::~Tracker()
@@ -51,9 +50,7 @@ Tracker::rmat Tracker::get_camera_offset_matrix(double c)
 {
     const double off[] =
     {
-        d2r * c * (double)-s.camera_yaw,
-        d2r * c * (double)-s.camera_pitch,
-        d2r * c * (double)-s.camera_roll
+        0, 0, 0,
     };
 
     return euler::euler_to_rmat(off);
@@ -212,7 +209,7 @@ void Tracker::logic()
     {
         rmat rotation;
 
-        switch (s.center_method)
+        switch (1)
         {
         // inertial
         case 0:
@@ -264,9 +261,10 @@ void Tracker::logic()
             logger.write_pose(value); // "filtered"
         }
 
+#if 0
         euler_t neck, rel;
 
-        if (s.neck_enable)
+        if (false)
         {
             double ny = s.neck_y, nz = -s.neck_z;
 
@@ -323,6 +321,7 @@ void Tracker::logic()
             value(i) += neck(i) + rel(i);
 
         nanp |= is_nan(neck) | is_nan(rel) | is_nan(value);
+#endif
     }
 
     // CAVEAT translation only, due to tcomp
@@ -345,9 +344,11 @@ void Tracker::logic()
             (void) map(raw_6dof(i), m(i));
     }
 
+#if 0
     // custom zero position
     for (int i = 0; i < 6; i++)
         value(i) += m(i).opts.zero * (m(i).opts.invert ? -1 : 1);
+#endif
 
     if (!nanp)
         libs.pProtocol->pose(value);
diff --git a/logic/work.cpp b/logic/work.cpp
index 7b9e550e..913f1dc7 100644
--- a/logic/work.cpp
+++ b/logic/work.cpp
@@ -8,6 +8,7 @@
 
 QString Work::browse_datalogging_file(main_settings &s)
 {
+#if 0
     QString filename = s.tracklogging_filename;
     if (filename.isEmpty())
         filename = OPENTRACK_BASE_PATH;
@@ -28,10 +29,14 @@ QString Work::browse_datalogging_file(main_settings &s)
     // dialog likes to mess with current directory
     QDir::setCurrent(OPENTRACK_BASE_PATH);
     return newfilename;
+#else
+    return QString();
+#endif
 }
 
 std::shared_ptr<TrackLogger> Work::make_logger(main_settings &s)
 {
+#if 0
     if (s.tracklogging_enabled)
     {
         QString filename = browse_datalogging_file(s);
@@ -57,6 +62,9 @@ std::shared_ptr<TrackLogger> Work::make_logger(main_settings &s)
         }
     }
     return std::make_shared<TrackLogger>();
+#else
+    return std::make_shared<TrackLogger>();
+#endif
 }
 
 
@@ -72,6 +80,7 @@ Work::Work(Mappings& m, QFrame* frame, mem<dylib> tracker_, mem<dylib> filter_,
         key_tuple(s.key_toggle1, [&](bool) -> void { tracker->toggle_enabled(); }, true),
         key_tuple(s.key_toggle2, [&](bool) -> void { tracker->toggle_enabled(); }, true),
 
+#if 0
         key_tuple(s.key_zero1, [&](bool) -> void { tracker->zero(); }, true),
         key_tuple(s.key_zero2, [&](bool) -> void { tracker->zero(); }, true),
 
@@ -80,6 +89,7 @@ Work::Work(Mappings& m, QFrame* frame, mem<dylib> tracker_, mem<dylib> filter_,
 
         key_tuple(s.key_zero_press1, [&](bool x) -> void { tracker->set_zero(x); }, false),
         key_tuple(s.key_zero_press2, [&](bool x) -> void { tracker->set_zero(x); }, false),
+#endif
     }
 {
     if (!is_ok())