Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 20:44:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/worklist/hifi

Browse source
This commit is contained in:
Andrzej Kapolka 2013-04-25 09:41:13 -07:00
commit 10a9f31d65
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Avatar.cpp
View file

@ -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