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

changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety

Browse source
This commit is contained in:
amantley 2018-03-28 14:00:36 -07:00
parent 4b1f974561
commit 90d87c5b5d
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2991,8 +2991,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar,
if (forwardLeanAmount > 0 && forwardLeanAmount > MAX_FORWARD_LEAN) { if (forwardLeanAmount > 0 && forwardLeanAmount > MAX_FORWARD_LEAN) {
return true; return true;
} } else if (forwardLeanAmount < 0 && forwardLeanAmount < -MAX_BACKWARD_LEAN) {
else if (forwardLeanAmount < 0 && forwardLeanAmount < -MAX_BACKWARD_LEAN) {
return true; return true;
} }
@ -3024,7 +3023,6 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
activate(Vertical); activate(Vertical);
} }
} else { } else {
//qCDebug(interfaceapp) << "turned off the recenter" << endl;
if (!isActive(Rotation) && getForceActivateRotation()) { if (!isActive(Rotation) && getForceActivateRotation()) {
activate(Rotation); activate(Rotation);
setForceActivateRotation(false); setForceActivateRotation(false);
@ -3086,7 +3084,7 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(const MyAvatar& myAvatar, co
} }
} }
bool MyAvatar::FollowHelper::getForceActivateRotation() { bool MyAvatar::FollowHelper::getForceActivateRotation() const {
return _forceActivateRotation; return _forceActivateRotation;
} }
@ -3094,7 +3092,7 @@ void MyAvatar::FollowHelper::setForceActivateRotation(bool val) {
_forceActivateRotation = val; _forceActivateRotation = val;
} }
bool MyAvatar::FollowHelper::getForceActivateVertical() { bool MyAvatar::FollowHelper::getForceActivateVertical() const {
return _forceActivateVertical; return _forceActivateVertical;
} }
@ -3102,7 +3100,7 @@ void MyAvatar::FollowHelper::setForceActivateVertical(bool val) {
_forceActivateVertical = val; _forceActivateVertical = val;
} }
bool MyAvatar::FollowHelper::getForceActivateHorizontal() { bool MyAvatar::FollowHelper::getForceActivateHorizontal() const {
return _forceActivateHorizontal; return _forceActivateHorizontal;
} }

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

@ -807,15 +807,15 @@ private:
bool shouldActivateHorizontal(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const; bool shouldActivateHorizontal(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const;
void prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& bodySensorMatrix, const glm::mat4& currentBodyMatrix, bool hasDriveInput); void prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& bodySensorMatrix, const glm::mat4& currentBodyMatrix, bool hasDriveInput);
glm::mat4 postPhysicsUpdate(const MyAvatar& myAvatar, const glm::mat4& currentBodyMatrix); glm::mat4 postPhysicsUpdate(const MyAvatar& myAvatar, const glm::mat4& currentBodyMatrix);
bool getForceActivateRotation(); bool getForceActivateRotation() const;
void setForceActivateRotation(bool val); void setForceActivateRotation(bool val);
bool getForceActivateVertical(); bool getForceActivateVertical() const;
void setForceActivateVertical(bool val); void setForceActivateVertical(bool val);
bool getForceActivateHorizontal(); bool getForceActivateHorizontal() const;
void setForceActivateHorizontal(bool val); void setForceActivateHorizontal(bool val);
bool _forceActivateRotation{ false }; std::atomic<bool> _forceActivateRotation{ false };
bool _forceActivateVertical{ false }; std::atomic<bool> _forceActivateVertical{ false };
bool _forceActivateHorizontal{ false }; std::atomic<bool> _forceActivateHorizontal{ false };
}; };
FollowHelper _follow; FollowHelper _follow;