Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added getEulerZYX, thanks to Tully.Foote

Browse Source 
http://code.google.com/p/bullet/issues/detail?id=124
fixed a few warnings (in double-precision mode)
This commit is contained in:
erwin.coumans
2008-11-04 09:48:42 +00:00
parent ee380bcd09
commit ccc63bbce7
2 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp
View File

@@ -284,7 +284,7 @@ void computeAabb (btVector3& aabbMin, btVector3& aabbMax, btConvexInternalShape*
/* fall through */
case BOX_SHAPE_PROXYTYPE:
{
float margin=convexShape->getMarginNV();
btScalar margin=convexShape->getMarginNV();
btVector3 halfExtents = convexShape->getImplicitShapeDimensions();
halfExtents += btVector3(margin,margin,margin);
const btTransform& t = xform;
@@ -298,7 +298,7 @@ void computeAabb (btVector3& aabbMin, btVector3& aabbMax, btConvexInternalShape*
}
case CAPSULE_SHAPE_PROXYTYPE:
{
float margin=convexShape->getMarginNV();
btScalar margin=convexShape->getMarginNV();
btVector3 halfExtents = convexShape->getImplicitShapeDimensions();
//add the radius to y-axis to get full height
btScalar radius = halfExtents[0];
@@ -321,8 +321,8 @@ void computeAabb (btVector3& aabbMin, btVector3& aabbMax, btConvexInternalShape*
}
case SPHERE_SHAPE_PROXYTYPE:
{
float radius = convexShape->getImplicitShapeDimensions().getX();// * convexShape->getLocalScaling().getX();
float margin = radius + convexShape->getMarginNV();
btScalar radius = convexShape->getImplicitShapeDimensions().getX();// * convexShape->getLocalScaling().getX();
btScalar margin = radius + convexShape->getMarginNV();
const btTransform& t = xform;
const btVector3& center = t.getOrigin();
btVector3 extent(margin,margin,margin);