From 471d3652e4241951cf9b4a774a13430019fbcf45 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sat, 2 Jul 2016 10:07:13 -0700 Subject: [PATCH] (finally) applied patch to fix 'setLocalScaling' of btMultiSphereShape See https://code.google.com/archive/p/bullet/issues/636 http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=8237 and https://github.com/bulletphysics/bullet3/issues/125 --- src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp index a7362ea01..88f6c4dcb 100644 --- a/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp +++ b/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp @@ -75,7 +75,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3* positions,const btScala int inner_count = MIN( numSpheres - k, 128 ); for( long i = 0; i < inner_count; i++ ) { - temp[i] = (*pos) +vec*m_localScaling*(*rad) - vec * getMargin(); + temp[i] = (*pos)*m_localScaling +vec*m_localScaling*(*rad) - vec * getMargin(); pos++; rad++; } @@ -113,7 +113,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3* positions,const btScala int inner_count = MIN( numSpheres - k, 128 ); for( long i = 0; i < inner_count; i++ ) { - temp[i] = (*pos) +vec*m_localScaling*(*rad) - vec * getMargin(); + temp[i] = (*pos)*m_localScaling +vec*m_localScaling*(*rad) - vec * getMargin(); pos++; rad++; }