From e6fd85f45ac4e748d54af6dbf749668e4c9b3a21 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 24 Jul 2017 19:02:40 +0100
Subject: [PATCH] Some code cleanup

---
 .../dialogs/preferences/PrimaryHandPreference.qml    |  4 ++--
 interface/src/avatar/MyAvatar.cpp                    | 12 ++++++++++++
 interface/src/avatar/MyAvatar.h                      | 12 +++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
index c89756f678..d230f7e0da 100644
--- a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -89,10 +89,10 @@ Preference {
                 verticalCenter: parent.verticalCenter
             }
             onClicked: {
-                if(box1.checked) {
+                if (box1.checked) {
                     box1.checked = false;
                 }
-                if(!box1.checked && !box2.checked) {
+                if (!box1.checked && !box2.checked) {
                     box2.checked = true;
                 }
             }
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 9b42310c3c..90870f83c2 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -72,6 +72,9 @@ const float MIN_AVATAR_SPEED_SQUARED = MIN_AVATAR_SPEED * MIN_AVATAR_SPEED; // s
 const float YAW_SPEED_DEFAULT = 120.0f;   // degrees/sec
 const float PITCH_SPEED_DEFAULT = 90.0f; // degrees/sec
 
+const QString DOMINANT_HAND_LEFT = "left";
+const QString DOMINANT_HAND_RIGHT = "right";
+
 // TODO: normalize avatar speed for standard avatar size, then scale all motion logic
 // to properly follow avatar size.
 float MAX_AVATAR_SPEED = 30.0f;
@@ -87,6 +90,9 @@ const float MyAvatar::ZOOM_MIN = 0.5f;
 const float MyAvatar::ZOOM_MAX = 25.0f;
 const float MyAvatar::ZOOM_DEFAULT = 1.5f;
 
+const QString& DOMINANT_LEFT_HAND = "left";
+const QString& DOMINANT_RIGHT_HAND = "right";
+
 // default values, used when avatar is missing joints... (avatar space)
 static const glm::quat DEFAULT_AVATAR_MIDDLE_EYE_ROT { Quaternions::Y_180 };
 static const glm::vec3 DEFAULT_AVATAR_MIDDLE_EYE_POS { 0.0f, 0.6f, 0.0f };
@@ -255,6 +261,12 @@ MyAvatar::~MyAvatar() {
     _lookAtTargetAvatar.reset();
 }
 
+void MyAvatar::setDominantHand(const QString& hand) {
+    if (hand == DOMINANT_HAND_LEFT || hand == DOMINANT_HAND_RIGHT) {
+        _dominantHand = hand;
+    }
+}
+
 void MyAvatar::registerMetaTypes(QScriptEngine* engine) {
     QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
     engine->globalObject().setProperty("MyAvatar", value);
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 05af26416c..0f4d2c7464 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -43,6 +43,12 @@ enum AudioListenerMode {
     FROM_CAMERA,
     CUSTOM
 };
+
+enum DominantHand {
+    LEFT_HAND,
+    RIGHT_HAND
+};
+
 Q_DECLARE_METATYPE(AudioListenerMode);
 
 class MyAvatar : public Avatar {
@@ -339,11 +345,7 @@ public:
     Q_INVOKABLE bool getClearOverlayWhenMoving() const { return _clearOverlayWhenMoving; }
     Q_INVOKABLE void setClearOverlayWhenMoving(bool on) { _clearOverlayWhenMoving = on; }
 
-    Q_INVOKABLE void setDominantHand(const QString& hand) {
-        if (hand == "left" || hand == "right") {
-            _dominantHand = hand;
-        }
-    }
+    Q_INVOKABLE void setDominantHand(const QString& hand);
 
     Q_INVOKABLE QString getDominantHand() const { return _dominantHand; }