diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-11 12:15:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-11 12:15:13 +0400 |
| commit | b4a0152e76683dfb170c3e2796e15e1b5b67e2ab (patch) | |
| tree | 15466a4e658f8fd42d55b9748bbeb6f02c12ba30 /source/gameengine/Physics/Bullet | |
| parent | 9ae0523921fa4baeb37bcdd36f208da952f4337f (diff) | |
code cleanup: float formatting was confusing in some cases - eg: (0.,0.,0.)
Diffstat (limited to 'source/gameengine/Physics/Bullet')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdGraphicController.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdGraphicController.cpp b/source/gameengine/Physics/Bullet/CcdGraphicController.cpp index 92cba6e9afc..36e7b0d482f 100644 --- a/source/gameengine/Physics/Bullet/CcdGraphicController.cpp +++ b/source/gameengine/Physics/Bullet/CcdGraphicController.cpp @@ -86,12 +86,12 @@ void CcdGraphicController::getAabb(btVector3& aabbMin, btVector3& aabbMax) btVector3 tmpAabbMin = m_localAabbMin * scale; btVector3 tmpAabbMax = m_localAabbMax * scale; - localAabbMin[0] = (scale.getX() >= 0.) ? tmpAabbMin[0] : tmpAabbMax[0]; - localAabbMin[1] = (scale.getY() >= 0.) ? tmpAabbMin[1] : tmpAabbMax[1]; - localAabbMin[2] = (scale.getZ() >= 0.) ? tmpAabbMin[2] : tmpAabbMax[2]; - localAabbMax[0] = (scale.getX() <= 0.) ? tmpAabbMin[0] : tmpAabbMax[0]; - localAabbMax[1] = (scale.getY() <= 0.) ? tmpAabbMin[1] : tmpAabbMax[1]; - localAabbMax[2] = (scale.getZ() <= 0.) ? tmpAabbMin[2] : tmpAabbMax[2]; + localAabbMin[0] = (scale.getX() >= 0.0) ? tmpAabbMin[0] : tmpAabbMax[0]; + localAabbMin[1] = (scale.getY() >= 0.0) ? tmpAabbMin[1] : tmpAabbMax[1]; + localAabbMin[2] = (scale.getZ() >= 0.0) ? tmpAabbMin[2] : tmpAabbMax[2]; + localAabbMax[0] = (scale.getX() <= 0.0) ? tmpAabbMin[0] : tmpAabbMax[0]; + localAabbMax[1] = (scale.getY() <= 0.0) ? tmpAabbMin[1] : tmpAabbMax[1]; + localAabbMax[2] = (scale.getZ() <= 0.0) ? tmpAabbMin[2] : tmpAabbMax[2]; btVector3 localHalfExtents = btScalar(0.5)*(localAabbMax-localAabbMin); btVector3 localCenter = btScalar(0.5)*(localAabbMax+localAabbMin); |