From 72e6e18992076ee833d045fe9e74f400cf864ca7 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 24 Apr 2013 17:54:09 -0700 Subject: [PATCH] fixed avatar collisions --- interface/src/Avatar.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index ae082fd71c..9f9d1febba 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -315,9 +315,9 @@ void Avatar::simulate(float deltaTime) { // check for collisions with other avatars and respond updateAvatarCollisionDetectionAndResponse ( - otherAvatar->getPosition(), - otherAvatar->getGirth(), - otherAvatar->getHeight(), + otherAvatar->getBonePosition( AVATAR_BONE_PELVIS_SPINE ), + 0.2, + 0.2, otherAvatar->getBodyUpDirection(), deltaTime ); @@ -610,7 +610,6 @@ void Avatar::updateAvatarCollisionDetectionAndResponse } } - void Avatar::render(bool lookingInMirror) { // show avatar position