From 3dde53f7439700bff63c5fff163e6211da50e835 Mon Sep 17 00:00:00 2001 From: Saracen Date: Thu, 11 Apr 2019 03:57:34 +0100 Subject: [PATCH] Friendlier and more understandable naming. --- interface/src/avatar/MyAvatar.cpp | 8 ++++---- interface/src/avatar/MyAvatar.h | 12 ++++++------ interface/src/ui/PreferencesDialog.cpp | 12 ++++++------ libraries/physics/src/CharacterController.cpp | 6 +++--- libraries/physics/src/CharacterController.h | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 3e615eb6eb..e80ff4f0d3 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -168,7 +168,7 @@ MyAvatar::MyAvatar(QThread* thread) : _displayNameSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "displayName", ""), _collisionSoundURLSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "collisionSoundURL", QUrl(_collisionSoundURL)), _useSnapTurnSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "useSnapTurn", _useSnapTurn), - _useFallHeightThresholdSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "useFallHeightThreshold", _useFallHeightThreshold), + _hoverWhenUnsupportedSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "hoverWhenUnsupported", _hoverWhenUnsupported), _userHeightSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "userHeight", DEFAULT_AVATAR_HEIGHT), _flyingHMDSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "flyingHMD", _flyingPrefHMD), _movementReferenceSetting(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "movementReference", _movementReference), @@ -957,7 +957,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) { bool collisionlessAllowed = zoneInteractionProperties.second; _characterController.setZoneFlyingAllowed(zoneAllowsFlying || !isPhysicsEnabled); _characterController.setComfortFlyingAllowed(_enableFlying); - _characterController.setUseFallHeightThreshold(_useFallHeightThreshold); + _characterController.setHoverWhenUnsupported(_hoverWhenUnsupported); _characterController.setCollisionlessAllowed(collisionlessAllowed); } @@ -1298,7 +1298,7 @@ void MyAvatar::saveData() { _displayNameSetting.set(_displayName); _collisionSoundURLSetting.set(_collisionSoundURL); _useSnapTurnSetting.set(_useSnapTurn); - _useFallHeightThresholdSetting.set(_useFallHeightThreshold); + _hoverWhenUnsupportedSetting.set(_hoverWhenUnsupported); _userHeightSetting.set(getUserHeight()); _flyingHMDSetting.set(getFlyingHMDPref()); _movementReferenceSetting.set(getMovementReference()); @@ -1901,7 +1901,7 @@ void MyAvatar::loadData() { setDisplayName(_displayNameSetting.get()); setCollisionSoundURL(_collisionSoundURLSetting.get(QUrl(DEFAULT_AVATAR_COLLISION_SOUND_URL)).toString()); setSnapTurn(_useSnapTurnSetting.get()); - setUseFallHeightThreshold(_useFallHeightThresholdSetting.get()); + setHoverWhenUnsupported(_hoverWhenUnsupportedSetting.get()); setDominantHand(_dominantHandSetting.get(DOMINANT_RIGHT_HAND).toLower()); setStrafeEnabled(_strafeEnabledSetting.get(DEFAULT_STRAFE_ENABLED)); setHmdAvatarAlignmentType(_hmdAvatarAlignmentTypeSetting.get(DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE).toLower()); diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index ab9e1c194d..a753826efa 100755 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -761,15 +761,15 @@ public: Q_INVOKABLE void setControlScheme(int index) { _controlSchemeIndex = (index >= 0 && index <= 2) ? index : 0; } /**jsdoc - * @function MyAvatar.useFallHeightThreshold + * @function MyAvatar.hoverWhenUnsupported * @returns {boolean} */ - Q_INVOKABLE bool useFallHeightThreshold() const { return _useFallHeightThreshold; } + Q_INVOKABLE bool hoverWhenUnsupported() const { return _hoverWhenUnsupported; } /**jsdoc - * @function MyAvatar.setUseFallHeightThreshold + * @function MyAvatar.setHoverWhenUnsupported * @param {boolean} on */ - Q_INVOKABLE void setUseFallHeightThreshold(bool on) { _useFallHeightThreshold = on; } + Q_INVOKABLE void setHoverWhenUnsupported(bool on) { _hoverWhenUnsupported = on; } /**jsdoc * Sets the avatar's dominant hand. @@ -2454,7 +2454,7 @@ private: ThreadSafeValueCache _prefOverrideAnimGraphUrl; QUrl _fstAnimGraphOverrideUrl; bool _useSnapTurn { true }; - bool _useFallHeightThreshold{ true }; + bool _hoverWhenUnsupported{ true }; ThreadSafeValueCache _dominantHand { DOMINANT_RIGHT_HAND }; ThreadSafeValueCache _hmdAvatarAlignmentType { DEFAULT_HMD_AVATAR_ALIGNMENT_TYPE }; ThreadSafeValueCache _strafeEnabled{ DEFAULT_STRAFE_ENABLED }; @@ -2650,7 +2650,7 @@ private: Setting::Handle _displayNameSetting; Setting::Handle _collisionSoundURLSetting; Setting::Handle _useSnapTurnSetting; - Setting::Handle _useFallHeightThresholdSetting; + Setting::Handle _hoverWhenUnsupportedSetting; Setting::Handle _userHeightSetting; Setting::Handle _flyingHMDSetting; Setting::Handle _movementReferenceSetting; diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 4b610cdb73..898f06fe60 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -278,6 +278,12 @@ void setupPreferences() { preference->setIndented(true); preferences->addPreference(preference); } + { + auto getter = [myAvatar]() -> bool { return myAvatar->hoverWhenUnsupported(); }; + auto setter = [myAvatar](bool value) { myAvatar->setHoverWhenUnsupported(value); }; + auto preference = new CheckPreference(VR_MOVEMENT, "Hover When Unsupported", getter, setter); + preferences->addPreference(preference); + } { auto getter = [myAvatar]()->int { return myAvatar->getMovementReference(); }; auto setter = [myAvatar](int value) { myAvatar->setMovementReference(value); }; @@ -304,12 +310,6 @@ void setupPreferences() { preference->setItems(items); preferences->addPreference(preference); } - { - auto getter = [myAvatar]() -> bool { return myAvatar->useFallHeightThreshold(); }; - auto setter = [myAvatar](bool value) { myAvatar->setUseFallHeightThreshold(value); }; - auto preference = new CheckPreference(VR_MOVEMENT, "Use Fall Height Threshold", getter, setter); - preferences->addPreference(preference); - } { auto getter = [myAvatar]()->int { return myAvatar->getControlScheme(); }; auto setter = [myAvatar](int index) { myAvatar->setControlScheme(index); }; diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp index 45489781e8..f0f1b9c837 100755 --- a/libraries/physics/src/CharacterController.cpp +++ b/libraries/physics/src/CharacterController.cpp @@ -754,7 +754,7 @@ void CharacterController::updateState() { switch (_state) { case State::Ground: if (!rayHasHit && !_hasSupport) { - if (_useFallHeightThreshold) { + if (_hoverWhenUnsupported) { SET_STATE(State::Hover, "no ground detected"); } else { SET_STATE(State::InAir, "falling"); @@ -768,7 +768,7 @@ void CharacterController::updateState() { } break; case State::Takeoff: - if (_useFallHeightThreshold && (!rayHasHit && !_hasSupport)) { + if (_hoverWhenUnsupported && (!rayHasHit && !_hasSupport)) { SET_STATE(State::Hover, "no ground"); } else if ((now - _takeoffToInAirStartTime) > TAKE_OFF_TO_IN_AIR_PERIOD) { SET_STATE(State::InAir, "takeoff done"); @@ -795,7 +795,7 @@ void CharacterController::updateState() { SET_STATE(State::Hover, "double jump button"); } else if (_comfortFlyingAllowed && (jumpButtonHeld || vertTargetSpeedIsNonZero) && (now - _jumpButtonDownStartTime) > JUMP_TO_HOVER_PERIOD) { SET_STATE(State::Hover, "jump button held"); - } else if (_useFallHeightThreshold && ((!rayHasHit && !_hasSupport) || _floorDistance > _scaleFactor * DEFAULT_AVATAR_FALL_HEIGHT)) { + } else if (_hoverWhenUnsupported && ((!rayHasHit && !_hasSupport) || _floorDistance > _scaleFactor * DEFAULT_AVATAR_FALL_HEIGHT)) { // Transition to hover if there's no ground beneath us or we are above the fall threshold, regardless of _comfortFlyingAllowed SET_STATE(State::Hover, "above fall threshold"); } diff --git a/libraries/physics/src/CharacterController.h b/libraries/physics/src/CharacterController.h index c1831fa7ec..c825f3a10b 100755 --- a/libraries/physics/src/CharacterController.h +++ b/libraries/physics/src/CharacterController.h @@ -131,7 +131,7 @@ public: void setZoneFlyingAllowed(bool value) { _zoneFlyingAllowed = value; } void setComfortFlyingAllowed(bool value) { _comfortFlyingAllowed = value; } - void setUseFallHeightThreshold(bool value) { _useFallHeightThreshold = value; } + void setHoverWhenUnsupported(bool value) { _hoverWhenUnsupported = value; } void setCollisionlessAllowed(bool value); void setPendingFlagsUpdateCollisionMask(){ _pendingFlags |= PENDING_FLAG_UPDATE_COLLISION_MASK; } @@ -216,7 +216,7 @@ protected: bool _zoneFlyingAllowed { true }; bool _comfortFlyingAllowed { true }; - bool _useFallHeightThreshold{ true }; + bool _hoverWhenUnsupported{ true }; bool _collisionlessAllowed { true }; bool _collisionless { false };