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

more btCapsuleShape fixes

Browse Source 
use hello_mjcf.xml for MJCF importer
This commit is contained in:
Erwin Coumans
2017-01-23 22:22:02 -08:00
parent a25a5e523c
commit 1b2db1ff09
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Importers/ImportMJCFDemo/ImportMJCFSetup.cpp
View File

@@ -123,7 +123,7 @@ ImportMJCFSetup::ImportMJCFSetup(struct GUIHelperInterface* helper, int option,
gMCFJFileNameArray.push_back("mjcf/humanoid.xml"); gMCFJFileNameArray.push_back("mjcf/humanoid.xml");
gMCFJFileNameArray.push_back("mjcf/inverted_pendulum.xml"); gMCFJFileNameArray.push_back("mjcf/inverted_pendulum.xml");
gMCFJFileNameArray.push_back("mjcf/ant.xml"); gMCFJFileNameArray.push_back("mjcf/ant.xml");
gMCFJFileNameArray.push_back("mjcf/hello_mjcf2.xml"); gMCFJFileNameArray.push_back("mjcf/hello_mjcf.xml");
gMCFJFileNameArray.push_back("mjcf/capsule.xml"); gMCFJFileNameArray.push_back("mjcf/capsule.xml");
// gMCFJFileNameArray.push_back("mjcf/hopper.xml"); // gMCFJFileNameArray.push_back("mjcf/hopper.xml");
// gMCFJFileNameArray.push_back("mjcf/swimmer.xml"); // gMCFJFileNameArray.push_back("mjcf/swimmer.xml");

3
src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
View File

@@ -16,7 +16,6 @@ subject to the following restrictions:
#include "btCapsuleShape.h" #include "btCapsuleShape.h"
#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
#include "LinearMath/btQuaternion.h" #include "LinearMath/btQuaternion.h"
btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height) : btConvexInternalShape () btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height) : btConvexInternalShape ()
@@ -49,7 +48,6 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height) : btConvexInter
btVector3 vtx; btVector3 vtx;
btScalar newDot; btScalar newDot;
btScalar radius = getRadius();
{ {
@@ -85,7 +83,6 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height) : btConvexInter
{ {
btScalar radius = getRadius();
for (int j=0;j<numVectors;j++) for (int j=0;j<numVectors;j++)
{ {

5
src/BulletCollision/CollisionShapes/btCapsuleShape.h
View File

@@ -86,7 +86,12 @@ public:
virtual void setLocalScaling(const btVector3& scaling) virtual void setLocalScaling(const btVector3& scaling)
{ {
btVector3 unScaledImplicitShapeDimensions = m_implicitShapeDimensions / m_localScaling;
btConvexInternalShape::setLocalScaling(scaling); btConvexInternalShape::setLocalScaling(scaling);
m_implicitShapeDimensions = (unScaledImplicitShapeDimensions * scaling);
//update m_collisionMargin, since entire radius==margin
int radiusAxis = (m_upAxis+2)%3;
m_collisionMargin = m_implicitShapeDimensions[radiusAxis];
} }
virtual btVector3 getAnisotropicRollingFrictionDirection() const virtual btVector3 getAnisotropicRollingFrictionDirection() const

1
src/BulletCollision/CollisionShapes/btConvexShape.cpp
View File

@@ -230,7 +230,6 @@ btVector3 btConvexShape::localGetSupportVertexWithoutMarginNonVirtual (const btV
btScalar halfHeight = capsuleShape->getHalfHeight(); btScalar halfHeight = capsuleShape->getHalfHeight();
int capsuleUpAxis = capsuleShape->getUpAxis(); int capsuleUpAxis = capsuleShape->getUpAxis();
btScalar radius = capsuleShape->getRadius();
btVector3 supVec(0,0,0); btVector3 supVec(0,0,0);
btScalar maxDot(btScalar(-BT_LARGE_FLOAT)); btScalar maxDot(btScalar(-BT_LARGE_FLOAT));