From 90d87c5b5d6dacf6a106e5a24aab44ecc393c5cc Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Wed, 28 Mar 2018 14:00:36 -0700
Subject: [PATCH] changed get functions to const in MyAvatar.cpp changed bool
 variables to atomic for thread safety

---
 interface/src/avatar/MyAvatar.cpp | 10 ++++------
 interface/src/avatar/MyAvatar.h   | 12 ++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 46dad99bb5..a9cab9582d 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -2991,8 +2991,7 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar,
 
     if (forwardLeanAmount > 0 && forwardLeanAmount > MAX_FORWARD_LEAN) {
         return true;
-    }
-    else if (forwardLeanAmount < 0 && forwardLeanAmount < -MAX_BACKWARD_LEAN) {
+    } else if (forwardLeanAmount < 0 && forwardLeanAmount < -MAX_BACKWARD_LEAN) {
         return true;
     }
 
@@ -3024,7 +3023,6 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
             activate(Vertical);
         }
     } else {
-        //qCDebug(interfaceapp) << "turned off the recenter" << endl;
         if (!isActive(Rotation) && getForceActivateRotation()) {
             activate(Rotation);
             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;
 }
 
@@ -3094,7 +3092,7 @@ void MyAvatar::FollowHelper::setForceActivateRotation(bool val) {
     _forceActivateRotation = val;
 }
 
-bool MyAvatar::FollowHelper::getForceActivateVertical() {
+bool MyAvatar::FollowHelper::getForceActivateVertical() const {
     return _forceActivateVertical;
 }
 
@@ -3102,7 +3100,7 @@ void MyAvatar::FollowHelper::setForceActivateVertical(bool val) {
     _forceActivateVertical = val;
 }
 
-bool MyAvatar::FollowHelper::getForceActivateHorizontal() {
+bool MyAvatar::FollowHelper::getForceActivateHorizontal() const {
     return _forceActivateHorizontal;
 }
 
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 8644a277c0..6a9d53e6f4 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -807,15 +807,15 @@ private:
         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);
         glm::mat4 postPhysicsUpdate(const MyAvatar& myAvatar, const glm::mat4& currentBodyMatrix);
-        bool getForceActivateRotation();
+        bool getForceActivateRotation() const;
         void setForceActivateRotation(bool val);
-        bool getForceActivateVertical();
+        bool getForceActivateVertical() const;
         void setForceActivateVertical(bool val);
-        bool getForceActivateHorizontal();
+        bool getForceActivateHorizontal() const;
         void setForceActivateHorizontal(bool val);
-        bool _forceActivateRotation{ false };
-        bool _forceActivateVertical{ false };
-        bool _forceActivateHorizontal{ false };
+        std::atomic<bool> _forceActivateRotation{ false };
+        std::atomic<bool> _forceActivateVertical{ false };
+        std::atomic<bool> _forceActivateHorizontal{ false };
     };
     FollowHelper _follow;