From 3e65d5a548950f4c2bfd89745f69cee4f34e2a4c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 17 May 2013 12:25:00 -0700
Subject: [PATCH] inline getters and setters in Avatar

---
 interface/src/Application.cpp |  4 ++--
 interface/src/Avatar.cpp      | 21 +--------------------
 interface/src/Avatar.h        |  8 ++++----
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8b1e264c4b..cd5451c9fd 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -786,14 +786,14 @@ void Application::idle() {
         if (_myAvatar.isTransmitterV2Connected()) {
             const float HAND_FORCE_SCALING = 0.05f;
             const float* handAcceleration = _myAvatar.getTransmitterHandLastAcceleration();
-            _myAvatar.setHandMovementValues(glm::vec3(-handAcceleration[0] * HAND_FORCE_SCALING,
+            _myAvatar.setMovedHandOffset(glm::vec3(-handAcceleration[0] * HAND_FORCE_SCALING,
                                                        handAcceleration[1] * HAND_FORCE_SCALING,
                                                        handAcceleration[2] * HAND_FORCE_SCALING));
         } else {
             // update behaviors for avatar hand movement: handControl takes mouse values as input,
             // and gives back 3D values modulated for smooth transitioning between interaction modes.
             _handControl.update(_mouseX, _mouseY);
-            _myAvatar.setHandMovementValues(_handControl.getValues());
+            _myAvatar.setMovedHandOffset(_handControl.getValues());
         }
         
         // tell my avatar if the mouse is being pressed...
diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp
index 704deaf9fe..9b351a7684 100644
--- a/interface/src/Avatar.cpp
+++ b/interface/src/Avatar.cpp
@@ -551,10 +551,6 @@ void Avatar::updateHandMovementAndTouching(float deltaTime) {
     }
 }
 
-float Avatar::getHeight() {
-    return _height;
-}
-
 void Avatar::updateCollisionWithSphere(glm::vec3 position, float radius, float deltaTime) {
     float myBodyApproximateBoundingRadius = 1.0f;
     glm::vec3 vectorFromMyBodyToBigSphere(_position - position);
@@ -780,16 +776,6 @@ void Avatar::render(bool lookingInMirror, glm::vec3 cameraPosition) {
     }
 }
 
-
-
-void Avatar::setHandMovementValues(glm::vec3 handOffset) {
-	_movedHandOffset = handOffset;
-}
-
-AvatarMode Avatar::getMode() {
-	return _mode;
-}
-
 void Avatar::initializeSkeleton() {
     
 	for (int b=0; b<NUM_AVATAR_JOINTS; b++) {
@@ -1072,7 +1058,6 @@ const glm::vec3& Avatar::getHeadPosition() const {
     return _joint[ AVATAR_JOINT_HEAD_BASE ].position;
 }
 
-
 glm::vec3 Avatar::getApproximateEyePosition() {
     return _head.getApproximateEyePosition();
 }
@@ -1327,7 +1312,6 @@ void Avatar::transmitterV2RenderLevels(int width, int height) {
     glEnd();
 }
 
-
 void Avatar::setHeadFromGyros(glm::vec3* eulerAngles, glm::vec3* angularVelocity, float deltaTime, float smoothingTime) {
     //
     //  Given absolute position and angular velocity information, update the avatar's head angles
@@ -1366,8 +1350,6 @@ void Avatar::setHeadFromGyros(glm::vec3* eulerAngles, glm::vec3* angularVelocity
     }
 }
 
-
-
 const char AVATAR_DATA_FILENAME[] = "avatar.ifd";
 
 void Avatar::writeAvatarDataToFile() {
@@ -1395,5 +1377,4 @@ void Avatar::readAvatarDataFromFile() {
         }
         fclose(avatarFile);
     }
-}
-
+}
\ No newline at end of file
diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h
index 303aca66f6..f7dcb8853c 100644
--- a/interface/src/Avatar.h
+++ b/interface/src/Avatar.h
@@ -99,18 +99,18 @@ public:
     const glm::vec3& getSpringyHeadPosition() const ;   // get the springy position of the avatar's head
     const glm::vec3& getJointPosition(AvatarJointID j) const { return _joint[j].springyPosition; }; 
     const glm::vec3& getBodyUpDirection() const { return _orientation.getUp(); };
-    float getSpeed() const { return _speed; };
+    float getSpeed() const { return _speed; }
     const glm::vec3& getVelocity() const { return _velocity; };
     float getGirth();
-    float getHeight();
+    float getHeight() const { return _height; }
     
-    AvatarMode getMode();
+    AvatarMode getMode() const { return _mode; }
     
     void setMousePressed(bool pressed); 
     void render(bool lookingInMirror, glm::vec3 cameraPosition);
     void renderBody(bool lookingInMirror);
     void simulate(float);
-    void setHandMovementValues( glm::vec3 movement );
+    void setMovedHandOffset(glm::vec3 movedHandOffset) { _movedHandOffset = movedHandOffset; }
     void updateArmIKAndConstraints( float deltaTime );
     void setDisplayingHead( bool displayingHead );