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

Only do slaps for MyAvatar.

Browse source
This commit is contained in:
Andrew Meadows 2014-02-13 10:03:39 -08:00
parent e793c207f9
commit 9523ea7d03
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/avatar/Hand.cpp
View file

@ -178,7 +178,7 @@ void Hand::collideAgainstAvatar(Avatar* avatar, bool isMyHand) {
}
glm::vec3 totalPenetration;
ModelCollisionList collisions;
if (Menu::getInstance()->isOptionChecked(MenuOption::PlaySlaps)) {
if (isMyHand && Menu::getInstance()->isOptionChecked(MenuOption::PlaySlaps)) {
// Check for palm collisions
glm::vec3 myPalmPosition = palm.getPosition();
float palmCollisionDistance = 0.1f;
@ -220,10 +220,10 @@ void Hand::collideAgainstAvatar(Avatar* avatar, bool isMyHand) {
totalPenetration = addPenetrations(totalPenetration, collisions[j]._penetration);
}
} else {
// when this !isMyHand then avatar is MyAvatar and we apply the collision
// when !isMyHand then avatar is MyAvatar and we apply the collision
// which might not do anything (hand hit unmovable part of MyAvatar) however
// we don't resolve the hand's penetration (we expect their simulation
// to do the right thing).
// we don't resolve the hand's penetration because we expect the remote
// simulation to do the right thing.
avatar->applyCollision(collisions[j]);
}
}