Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 54 files). Show all
Unified · Split
| @@ -265,42 +265,6 @@ void setupPreferences() { · 264 unmodified lines | |||
| 265 | preferences->addPreference(new SliderPreference(FACE_TRACKING, "Eye Deflection", getter, setter)); | 265 | preferences->addPreference(new SliderPreference(FACE_TRACKING, "Eye Deflection", getter, setter)); |
| 266 | } | 266 | } |
| 267 | 267 | ||
| 268 | static const QString MOVEMENT{ "Movement" }; | ||
| 269 | { | ||
| 270 | |||
| 271 | static const QString movementsControlChannel = QStringLiteral("Hifi-Advanced-Movement-Disabler"); | ||
| 272 | auto getter = [myAvatar]()->bool { return myAvatar->useAdvancedMovementControls(); }; | ||
| 273 | auto setter = [myAvatar](bool value) { myAvatar->setUseAdvancedMovementControls(value); }; | ||
| 274 | preferences->addPreference(new CheckPreference(MOVEMENT, | ||
| 275 | QStringLiteral("Advanced movement for hand controllers"), | ||
| 276 | getter, setter)); | ||
| 277 | } | ||
| 278 | { | ||
| 279 | auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; }; | ||
| 280 | auto setter = [myAvatar](int value) { myAvatar->setSnapTurn(value == 0); }; | ||
| 281 | auto preference = new RadioButtonsPreference(MOVEMENT, "Snap turn / Smooth turn", getter, setter); | ||
| 282 | QStringList items; | ||
| 283 | items << "Snap turn" << "Smooth turn"; | ||
| 284 | preference->setItems(items); | ||
| 285 | preferences->addPreference(preference); | ||
| 286 | } | ||
| 287 | { | ||
| 288 | auto getter = [=]()->float { return myAvatar->getUserHeight(); }; | ||
| 289 | auto setter = [=](float value) { myAvatar->setUserHeight(value); }; | ||
| 290 | auto preference = new SpinnerPreference(MOVEMENT, "User real-world height (meters)", getter, setter); | ||
| 291 | preference->setMin(1.0f); | ||
| 292 | preference->setMax(2.2f); | ||
| 293 | preference->setDecimals(3); | ||
| 294 | preference->setStep(0.001f); | ||
| 295 | preferences->addPreference(preference); | ||
| 296 | } | ||
| 297 | { | ||
| 298 | auto preference = new ButtonPreference(MOVEMENT, "RESET SENSORS", [] { | ||
| 299 | qApp->resetSensors(); | ||
| 300 | }); | ||
| 301 | preferences->addPreference(preference); | ||
| 302 | } | ||
| 303 | |||
| 304 | static const QString VR_MOVEMENT{ "VR Movement" }; | 268 | static const QString VR_MOVEMENT{ "VR Movement" }; |
| 305 | { | 269 | { |
| 306 | 270 | ||
| @@ -314,7 +278,7 @@ void setupPreferences() { · 7 unmodified lines | |||
| 314 | { | 278 | { |
| 315 | auto getter = [myAvatar]()->bool { return myAvatar->getFlyingHMDPref(); }; | 279 | auto getter = [myAvatar]()->bool { return myAvatar->getFlyingHMDPref(); }; |
| 316 | auto setter = [myAvatar](bool value) { myAvatar->setFlyingHMDPref(value); }; | 280 | auto setter = [myAvatar](bool value) { myAvatar->setFlyingHMDPref(value); }; |
| 317 | preferences->addPreference(new CheckPreference(VR_MOVEMENT, "Flying & jumping", getter, setter)); | 281 | preferences->addPreference(new CheckPreference(VR_MOVEMENT, "Flying & jumping (HMD)", getter, setter)); |
| 318 | } | 282 | } |
| 319 | { | 283 | { |
| 320 | auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; }; | 284 | auto getter = [myAvatar]()->int { return myAvatar->getSnapTurn() ? 0 : 1; }; |