diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 7104a14f0a..12b41fa245 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -2223,6 +2223,18 @@ bool MyAvatar::getAvatarCollisionsEnabled() { return _characterController.getCollisionGroup() != BULLET_COLLISION_GROUP_COLLISIONLESS; } +void MyAvatar::setCharacterControllerEnabled(bool enabled) { + qCDebug(interfaceapp) << "MyAvatar.setCharacterControllerEnabled() is deprecated." + << "Use MyAvatar.setAvatarCollisionsEnabled() instead."; + setAvatarCollisionsEnabled(enabled); +} + +bool MyAvatar::getCharacterControllerEnabled() { + qCDebug(interfaceapp) << "MyAvatar.getCharacterControllerEnabled() is deprecated." + << "Use MyAvatar.getAvatarCollisionsEnabled() instead."; + return getAvatarCollisionsEnabled(); +} + void MyAvatar::clearDriveKeys() { _driveKeys.fill(0.0f); } diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 6b8518a90c..b2d14de224 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -129,6 +129,7 @@ class MyAvatar : public Avatar { Q_PROPERTY(bool hmdLeanRecenterEnabled READ getHMDLeanRecenterEnabled WRITE setHMDLeanRecenterEnabled) Q_PROPERTY(bool avatarCollisionsEnabled READ getAvatarCollisionsEnabled WRITE setAvatarCollisionsEnabled) + Q_PROPERTY(bool characterControllerEnabled READ getCharacterControllerEnabled WRITE setCharacterControllerEnabled) Q_PROPERTY(bool useAdvancedMovementControls READ useAdvancedMovementControls WRITE setUseAdvancedMovementControls) public: @@ -472,6 +473,8 @@ public: Q_INVOKABLE void setAvatarCollisionsEnabled(bool enabled); Q_INVOKABLE bool getAvatarCollisionsEnabled(); + Q_INVOKABLE void setCharacterControllerEnabled(bool enabled); // deprecated + Q_INVOKABLE bool getCharacterControllerEnabled(); // deprecated virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override; virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override;