From 47ee9385302602e697856912039aa98dc385d1ff Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Thu, 18 Apr 2013 14:12:45 -0700 Subject: [PATCH] reversed x value in hand movement --- interface/src/Head.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index e68a957c2d..91a227a72a 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -866,9 +866,9 @@ void Head::renderHead(int faceToFace) { -void Head::setHandMovement( glm::vec3 movement ) { +void Head::setHandMovement( glm::vec3 handOffset ) { _handBeingMoved = true; - _movedHandOffset = movement; + _movedHandOffset = handOffset; } AvatarMode Head::getMode() { @@ -1024,9 +1024,9 @@ void Head::updateSkeleton() { _bone[ AVATAR_BONE_RIGHT_HAND ].position = _handPosition; } - float xx = glm::dot( _bone[b].defaultPosePosition, _bone[b].orientation.getRight () ); - float yy = glm::dot( _bone[b].defaultPosePosition, _bone[b].orientation.getUp () ); - float zz = -glm::dot( _bone[b].defaultPosePosition, _bone[b].orientation.getFront () ); + float xx = glm::dot( _bone[b].defaultPosePosition, _bone[b].orientation.getRight() ); + float yy = glm::dot( _bone[b].defaultPosePosition, _bone[b].orientation.getUp () ); + float zz = glm::dot( _bone[b].defaultPosePosition, _bone[b].orientation.getFront() ); glm::vec3 rotatedBoneVector( xx, yy, zz ); @@ -1125,9 +1125,9 @@ void Head::updateHandMovement() { glm::vec3 transformedHandMovement; transformedHandMovement - = _avatar.orientation.getRight() * -_movedHandOffset.x - + _avatar.orientation.getUp() * -_movedHandOffset.y * 0.5f - + _avatar.orientation.getFront() * -_movedHandOffset.y; + = _avatar.orientation.getRight() * _movedHandOffset.x + + _avatar.orientation.getUp() * -_movedHandOffset.y * 0.5f + + _avatar.orientation.getFront() * -_movedHandOffset.y; _bone[ AVATAR_BONE_RIGHT_HAND ].position += transformedHandMovement;