From c32cc1ead298f973e366da23fc3fa4ad748656e9 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Wed, 22 Aug 2018 15:42:15 -0700 Subject: [PATCH 1/3] adding implementation --- interface/src/avatar/MyAvatar.cpp | 3 +-- interface/src/ui/PreferencesDialog.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index b30f05225e..79c3f969b5 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -105,8 +105,8 @@ MyAvatar::MyAvatar(QThread* thread) : _eyeContactTarget(LEFT_EYE), _realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), - _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", false), _smoothOrientationTimer(std::numeric_limits::max()), + _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), _smoothOrientationInitial(), _smoothOrientationTarget(), _hmdSensorMatrix(), @@ -444,7 +444,6 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) { } void MyAvatar::update(float deltaTime) { - // update moving average of HMD facing in xz plane. const float HMD_FACING_TIMESCALE = getRotationRecenterFilterLength(); diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index e2037d54d0..c5cce261ae 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -272,7 +272,7 @@ void setupPreferences() { auto getter = [myAvatar]()->bool { return myAvatar->useAdvancedMovementControls(); }; auto setter = [myAvatar](bool value) { myAvatar->setUseAdvancedMovementControls(value); }; preferences->addPreference(new CheckPreference(VR_MOVEMENT, - QStringLiteral("Advanced movement for hand controllers"), + QStringLiteral("Advanced movement for VR (Teleport movement when unchecked)"), getter, setter)); } { From 9518b8cdafa47a51678df0b6c604515bdab5e807 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Wed, 22 Aug 2018 15:46:02 -0700 Subject: [PATCH 2/3] rearrangement --- interface/src/avatar/MyAvatar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 79c3f969b5..840747003f 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -105,8 +105,8 @@ MyAvatar::MyAvatar(QThread* thread) : _eyeContactTarget(LEFT_EYE), _realWorldFieldOfView("realWorldFieldOfView", DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES), - _smoothOrientationTimer(std::numeric_limits::max()), _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true), + _smoothOrientationTimer(std::numeric_limits::max()), _smoothOrientationInitial(), _smoothOrientationTarget(), _hmdSensorMatrix(), From 4daa30c1d0c199f306920b344ce266cd0fa6dc4b Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Wed, 22 Aug 2018 15:58:37 -0700 Subject: [PATCH 3/3] changing text for check preference --- interface/src/ui/PreferencesDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index c5cce261ae..79ca2063ec 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -272,7 +272,7 @@ void setupPreferences() { auto getter = [myAvatar]()->bool { return myAvatar->useAdvancedMovementControls(); }; auto setter = [myAvatar](bool value) { myAvatar->setUseAdvancedMovementControls(value); }; preferences->addPreference(new CheckPreference(VR_MOVEMENT, - QStringLiteral("Advanced movement for VR (Teleport movement when unchecked)"), + QStringLiteral("Advanced movement in VR (Teleport movement when unchecked)"), getter, setter)); } {