From 0e329af03eafce530b6e9ae2decf807a838577a2 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Tue, 28 May 2013 18:55:21 -0700 Subject: [PATCH] made inline --- interface/src/AvatarTouch.cpp | 6 ------ interface/src/AvatarTouch.h | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/interface/src/AvatarTouch.cpp b/interface/src/AvatarTouch.cpp index 0d2157cbad..499e132922 100644 --- a/interface/src/AvatarTouch.cpp +++ b/interface/src/AvatarTouch.cpp @@ -37,12 +37,6 @@ AvatarTouch::AvatarTouch() { } } - -void AvatarTouch::setHasInteractingOther(bool hasInteractingOther) { - _hasInteractingOther = hasInteractingOther; -} - - void AvatarTouch::simulate (float deltaTime) { _canReachToOtherAvatar = false; // default diff --git a/interface/src/AvatarTouch.h b/interface/src/AvatarTouch.h index dd45d3bd44..6b6b75d956 100644 --- a/interface/src/AvatarTouch.h +++ b/interface/src/AvatarTouch.h @@ -28,17 +28,17 @@ public: void simulate(float deltaTime); void render(glm::vec3 cameraPosition); - void setHasInteractingOther(bool hasInteractingOther); - void setMyHandPosition (glm::vec3 position ) { _myHandPosition = position; } - void setYourHandPosition(glm::vec3 position ) { _yourHandPosition = position; } - void setMyOrientation (Orientation orientation) { _myOrientation = orientation; } - void setYourOrientation (Orientation orientation) { _yourOrientation = orientation; } - void setMyBodyPosition (glm::vec3 position ) { _myBodyPosition = position; } - void setYourBodyPosition(glm::vec3 position ) { _yourBodyPosition = position; } - void setMyHandState (int state ) { _myHandState = state; } - void setYourHandState (int state ) { _yourHandState = state; } - void setReachableRadius (float radius ) { _reachableRadius = radius; } - void setHoldingHands (bool holding ) { _weAreHoldingHands = holding; } + void setHasInteractingOther(bool hasInteractingOther) { _hasInteractingOther = hasInteractingOther;} + void setMyHandPosition (glm::vec3 position ) { _myHandPosition = position;} + void setYourHandPosition (glm::vec3 position ) { _yourHandPosition = position;} + void setMyOrientation (Orientation orientation ) { _myOrientation = orientation;} + void setYourOrientation (Orientation orientation ) { _yourOrientation = orientation;} + void setMyBodyPosition (glm::vec3 position ) { _myBodyPosition = position;} + void setYourBodyPosition (glm::vec3 position ) { _yourBodyPosition = position;} + void setMyHandState (int state ) { _myHandState = state;} + void setYourHandState (int state ) { _yourHandState = state;} + void setReachableRadius (float radius ) { _reachableRadius = radius;} + void setHoldingHands (bool holding ) { _weAreHoldingHands = holding;} bool getAbleToReachOtherAvatar () const {return _canReachToOtherAvatar; } bool getHandsCloseEnoughToGrasp() const {return _handsCloseEnoughToGrasp;}