diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index a411b1d747..77f964ee3c 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -283,8 +283,7 @@ class MyAvatar : public Avatar { * the value.

* @property {number} analogPlusSprintSpeed - The sprint (run) speed of your avatar for the "AnalogPlus" control scheme. * @property {MyAvatar.SitStandModelType} userRecenterModel - Controls avatar leaning and recentering behavior. - *

Deprecated: This property is deprecated and will be removed. If you need it, please contact - * the developers.

+ *

Deprecated: This property is deprecated and will be removed.

* @property {boolean} isInSittingState - true if the user wearing the HMD is determined to be sitting; * false if the user wearing the HMD is determined to be standing. This can affect whether the avatar * is allowed to stand, lean or recenter its footing, depending on user preferences. @@ -416,10 +415,7 @@ class MyAvatar : public Avatar { Q_PROPERTY(float sprintSpeed READ getSprintSpeed WRITE setSprintSpeed NOTIFY sprintSpeedChanged); Q_PROPERTY(bool isInSittingState READ getIsInSittingState WRITE setIsInSittingState); - /**jsdoc - * @deprecated This property is deprecated and will be removed. If you need it, please contact the developers. - */ - Q_PROPERTY(MyAvatar::SitStandModelType userRecenterModel READ getUserRecenterModel WRITE setUserRecenterModel); + Q_PROPERTY(MyAvatar::SitStandModelType userRecenterModel READ getUserRecenterModel WRITE setUserRecenterModel); // Deprecated /**jsdoc * @deprecated This property is deprecated and will be removed. If you need it, please contact the developers. @@ -532,8 +528,7 @@ public: /**jsdoc *

Specifies different avatar leaning and recentering behaviors.

- *

Deprecated: This enumeration is deprecated and will be removed. If you need it, please contact - * the developers

+ *

Deprecated: This type is deprecated and will be removed.

* * * @@ -574,14 +569,13 @@ public: Q_ENUM(AllowAvatarStandingPreference) // Note: The option strings in setupPreferences (PreferencesDialog.cpp) must match this order. - enum class AllowAvatarLeaningPreference : uint - { + enum class AllowAvatarLeaningPreference : uint { WhenUserIsStanding, Always, Never, AlwaysNoRecenter, // experimental Count, - Default = WhenUserIsStanding, + Default = WhenUserIsStanding }; Q_ENUM(AllowAvatarLeaningPreference) @@ -2981,7 +2975,7 @@ private: bool _centerOfGravityModelEnabled { true }; bool _hmdLeanRecenterEnabled { true }; - bool _hmdCrouchRecenterEnabled{ + bool _hmdCrouchRecenterEnabled { true }; // Is MyAvatar allowed to recenter vertically (stand) when the user is sitting in the real world. bool _sprint { false }; diff --git a/libraries/physics/src/CharacterController.h b/libraries/physics/src/CharacterController.h index 899c99890b..8242ae4b97 100755 --- a/libraries/physics/src/CharacterController.h +++ b/libraries/physics/src/CharacterController.h @@ -53,8 +53,7 @@ const btScalar MIN_CHARACTER_MOTOR_TIMESCALE = 0.05f; class CharacterController : public btCharacterControllerInterface { public: - enum class FollowType : uint8_t - { + enum class FollowType : uint8_t { Rotation, Horizontal, Vertical,
ValueNameDescription