Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 19:29:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

re-enable some basic avatar collisions

Browse source
This commit is contained in:
Andrew Meadows 2014-06-23 10:05:51 -07:00
parent 8b24e9cd67
commit eba03ddb8a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -204,7 +204,6 @@ void MyAvatar::simulate(float deltaTime) {
_physicsSimulation.stepForward(deltaTime, minError, maxIterations, maxUsec); _physicsSimulation.stepForward(deltaTime, minError, maxIterations, maxUsec);
} }
/* TODO: Andrew to make this work again
// now that we're done stepping the avatar forward in time, compute new collisions // now that we're done stepping the avatar forward in time, compute new collisions
if (_collisionGroups != 0) { if (_collisionGroups != 0) {
PerformanceTimer perfTimer("MyAvatar::simulate/_collisionGroups"); PerformanceTimer perfTimer("MyAvatar::simulate/_collisionGroups");
@ -225,12 +224,13 @@ void MyAvatar::simulate(float deltaTime) {
} else { } else {
_trapDuration = 0.0f; _trapDuration = 0.0f;
} }
/* TODO: Andrew to make this work
if (_collisionGroups & COLLISION_GROUP_AVATARS) { if (_collisionGroups & COLLISION_GROUP_AVATARS) {
PerformanceTimer perfTimer("MyAvatar::simulate/updateCollisionWithAvatars"); PerformanceTimer perfTimer("MyAvatar::simulate/updateCollisionWithAvatars");
updateCollisionWithAvatars(deltaTime); updateCollisionWithAvatars(deltaTime);
} }
}
*/ */
}
// consider updating our billboard // consider updating our billboard
maybeUpdateBillboard(); maybeUpdateBillboard();