diff options
Diffstat (limited to 'extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp')
-rw-r--r-- | extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp b/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp index 1cea1d02f08..fdb7a4d801a 100644 --- a/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp +++ b/extern/bullet/Bullet/CollisionShapes/ConvexHullShape.cpp @@ -10,7 +10,7 @@ */ #include "ConvexHullShape.h" -#include "NarrowPhaseCollision/CollisionMargin.h" +#include "CollisionShapes/CollisionMargin.h" #include "SimdQuaternion.h" @@ -75,29 +75,7 @@ SimdVector3 ConvexHullShape::LocalGetSupportingVertex(const SimdVector3& vec)con -void ConvexHullShape::CalculateLocalInertia(SimdScalar mass,SimdVector3& inertia) -{ - //not yet, return box inertia - - float margin = GetMargin(); - - SimdTransform ident; - ident.setIdentity(); - SimdVector3 aabbMin,aabbMax; - GetAabb(ident,aabbMin,aabbMax); - SimdVector3 halfExtents = (aabbMax-aabbMin)*0.5f; - SimdScalar lx=2.f*(halfExtents.x()+margin); - SimdScalar ly=2.f*(halfExtents.y()+margin); - SimdScalar lz=2.f*(halfExtents.z()+margin); - const SimdScalar x2 = lx*lx; - const SimdScalar y2 = ly*ly; - const SimdScalar z2 = lz*lz; - const SimdScalar scaledmass = mass * 0.08333333f; - - inertia = scaledmass * (SimdVector3(y2+z2,x2+z2,x2+y2)); - -} |