Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 06:24:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

restore MyAvatar.setCharacterControllerEnabled()

Browse source
This commit is contained in:
Andrew Meadows 2017-03-30 17:46:02 -07:00
parent 94ee6d6838
commit 559f5836c5
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/avatar/MyAvatar.cpp
View file

@ -2223,6 +2223,18 @@ bool MyAvatar::getAvatarCollisionsEnabled() {
return _characterController.getCollisionGroup() != BULLET_COLLISION_GROUP_COLLISIONLESS; 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() { void MyAvatar::clearDriveKeys() {
_driveKeys.fill(0.0f); _driveKeys.fill(0.0f);
} }

3
interface/src/avatar/MyAvatar.h
View file

@ -129,6 +129,7 @@ class MyAvatar : public Avatar {
Q_PROPERTY(bool hmdLeanRecenterEnabled READ getHMDLeanRecenterEnabled WRITE setHMDLeanRecenterEnabled) Q_PROPERTY(bool hmdLeanRecenterEnabled READ getHMDLeanRecenterEnabled WRITE setHMDLeanRecenterEnabled)
Q_PROPERTY(bool avatarCollisionsEnabled READ getAvatarCollisionsEnabled WRITE setAvatarCollisionsEnabled) Q_PROPERTY(bool avatarCollisionsEnabled READ getAvatarCollisionsEnabled WRITE setAvatarCollisionsEnabled)
Q_PROPERTY(bool characterControllerEnabled READ getCharacterControllerEnabled WRITE setCharacterControllerEnabled)
Q_PROPERTY(bool useAdvancedMovementControls READ useAdvancedMovementControls WRITE setUseAdvancedMovementControls) Q_PROPERTY(bool useAdvancedMovementControls READ useAdvancedMovementControls WRITE setUseAdvancedMovementControls)
public: public:
@ -472,6 +473,8 @@ public:
Q_INVOKABLE void setAvatarCollisionsEnabled(bool enabled); Q_INVOKABLE void setAvatarCollisionsEnabled(bool enabled);
Q_INVOKABLE bool getAvatarCollisionsEnabled(); 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::quat getAbsoluteJointRotationInObjectFrame(int index) const override;
virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override; virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override;