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

fix warning

Browse source
This commit is contained in:
ZappoMan 2014-03-05 21:22:08 -08:00
parent 13985f8149
commit a887baf081
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -923,10 +923,13 @@ void MyAvatar::updateCollisionWithAvatars(float deltaTime) {
// HACK: body-body collision uses two coaxial capsules with axes parallel to y-axis
// TODO: make the collision work without assuming avatar orientation
Extents myStaticExtents = _skeletonModel.getStaticExtents();
glm::vec3 staticScale = myStaticExtents.maximum - myStaticExtents.minimum;
float myCapsuleRadius = 0.25f * (staticScale.x + staticScale.z);
float myCapsuleHeight = staticScale.y;
// TODO: these local variables are not used in the live code, only in the
// commented-outTODO code below.
//Extents myStaticExtents = _skeletonModel.getStaticExtents();
//glm::vec3 staticScale = myStaticExtents.maximum - myStaticExtents.minimum;
//float myCapsuleRadius = 0.25f * (staticScale.x + staticScale.z);
//float myCapsuleHeight = staticScale.y;
CollisionInfo collisionInfo;
foreach (const AvatarSharedPointer& avatarPointer, avatars) {