Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 23:13:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

For now, don't perform avatar collisions unless we have a skeleton model.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-11-05 13:56:14 -08:00
parent bd45f3aba0
commit 6633b6a633
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/avatar/MyAvatar.cpp
View file

@ -1060,6 +1060,11 @@ void MyAvatar::updateAvatarCollisions(float deltaTime) {
// detect collisions with other avatars and respond // detect collisions with other avatars and respond
void MyAvatar::applyCollisionWithOtherAvatar(Avatar * otherAvatar, float deltaTime) { void MyAvatar::applyCollisionWithOtherAvatar(Avatar * otherAvatar, float deltaTime) {
// for now, don't collide if we have a new skeleton
if (_skeletonModel.isActive()) {
return;
}
glm::vec3 bodyPushForce = glm::vec3(0.0f, 0.0f, 0.0f); glm::vec3 bodyPushForce = glm::vec3(0.0f, 0.0f, 0.0f);
// loop through the body balls of each avatar to check for every possible collision // loop through the body balls of each avatar to check for every possible collision