diff options
| -rw-r--r-- | gui/settings-dialog.ui | 27 | ||||
| -rw-r--r-- | logic/main-settings.hpp | 2 | ||||
| -rw-r--r-- | logic/pipeline.cpp | 3 | 
3 files changed, 30 insertions, 2 deletions
| diff --git a/gui/settings-dialog.ui b/gui/settings-dialog.ui index 14b7652a..81a9755c 100644 --- a/gui/settings-dialog.ui +++ b/gui/settings-dialog.ui @@ -104,6 +104,9 @@                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> +               <property name="cursor"> +                <cursorShape>WhatsThisCursor</cursorShape> +               </property>                 <property name="toolTip">                  <string>Treat this device orientation as the in-game center of the screen.</string>                 </property> @@ -168,6 +171,9 @@                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> +               <property name="cursor"> +                <cursorShape>WhatsThisCursor</cursorShape> +               </property>                 <property name="text">                  <string>Start tracking</string>                 </property> @@ -235,6 +241,9 @@                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> +               <property name="cursor"> +                <cursorShape>WhatsThisCursor</cursorShape> +               </property>                 <property name="text">                  <string>Stop tracking</string>                 </property> @@ -270,6 +279,9 @@                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> +               <property name="cursor"> +                <cursorShape>WhatsThisCursor</cursorShape> +               </property>                 <property name="toolTip">                  <string>Hold in-game center of the screen while the mode is active.</string>                 </property> @@ -289,6 +301,9 @@                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> +               <property name="cursor"> +                <cursorShape>WhatsThisCursor</cursorShape> +               </property>                 <property name="toolTip">                  <string>Freeze the position returned by the tracker while this mode is active.</string>                 </property> @@ -308,6 +323,9 @@                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> +               <property name="cursor"> +                <cursorShape>WhatsThisCursor</cursorShape> +               </property>                 <property name="text">                  <string>Zero while held</string>                 </property> @@ -398,6 +416,9 @@                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> +               <property name="cursor"> +                <cursorShape>WhatsThisCursor</cursorShape> +               </property>                 <property name="text">                  <string>Restart tracking</string>                 </property> @@ -433,6 +454,9 @@                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> +               <property name="cursor"> +                <cursorShape>WhatsThisCursor</cursorShape> +               </property>                 <property name="text">                  <string>Toggle while held</string>                 </property> @@ -472,6 +496,9 @@                   <verstretch>0</verstretch>                  </sizepolicy>                 </property> +               <property name="cursor"> +                <cursorShape>WhatsThisCursor</cursorShape> +               </property>                 <property name="text">                  <string>Toggle tracking</string>                 </property> diff --git a/logic/main-settings.hpp b/logic/main-settings.hpp index 0795bca4..5638b84c 100644 --- a/logic/main-settings.hpp +++ b/logic/main-settings.hpp @@ -73,7 +73,7 @@ struct OTR_LOGIC_EXPORT main_settings final      value<bool> tray_start { b, "start-in-tray", false };      value<bool> center_at_startup { b, "center-at-startup", true }; -    value<centering_state> centering_mode { b, "centering-mode", center_roll_compensated };; +    value<centering_state> centering_mode { b, "centering-mode", center_roll_compensated };      value<int> neck_z { b, "neck-depth", 0 };      value<bool> neck_enable { b, "neck-enable", false }; diff --git a/logic/pipeline.cpp b/logic/pipeline.cpp index f8827b7e..171c7016 100644 --- a/logic/pipeline.cpp +++ b/logic/pipeline.cpp @@ -310,7 +310,7 @@ void pipeline::maybe_set_center_pose(const centering_state mode, const Pose& val  Pose pipeline::apply_center(const centering_state mode, Pose value) const  {      if (mode != center_disabled) -	{ +        {          for (unsigned k = TX; k <= TZ; k++)              value(k) -= center.P(k); @@ -342,6 +342,7 @@ Pose pipeline::apply_center(const centering_state mode, Pose value) const              value[Yaw]   =  v.y();              value[Roll]  = -v.z();              break; +        case center_disabled: break;          }      } | 
