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

Merge branch 'master' of https://github.com/erwincoumans/bullet3

Browse Source
This commit is contained in:
Erwin Coumans
2018-01-04 12:10:31 -08:00
parent 60b5ffc13a 4743d2770a
commit 23efbdb593
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,7 +251,7 @@ struct BulletMJCFImporterInternalData
const char* angle = root_xml->Attribute("angle"); const char* angle = root_xml->Attribute("angle");
m_angleUnits = angle ? angle : "degree"; // degrees by default, http://www.mujoco.org/book/modeling.html#compiler m_angleUnits = angle ? angle : "degree"; // degrees by default, http://www.mujoco.org/book/modeling.html#compiler
const char* inertiaFromGeom = root_xml->Attribute("inertiafromgeom"); const char* inertiaFromGeom = root_xml->Attribute("inertiafromgeom");
if(inertiaFromGeom[0] == 'f') // false, other values assumed `true`. if(inertiaFromGeom && inertiaFromGeom[0] == 'f') // false, other values assumed `true`.
{ {
m_inertiaFromGeom = false; m_inertiaFromGeom = false;
} }

6
examples/SharedMemory/PhysicsLoopBack.cpp
View File

@@ -180,6 +180,12 @@ void PhysicsLoopBack::getCachedVisualShapeInformation(struct b3VisualShapeInform
return m_data->m_physicsClient->getCachedVisualShapeInformation(visualShapesInfo); return m_data->m_physicsClient->getCachedVisualShapeInformation(visualShapesInfo);
} }
void PhysicsLoopBack::getCachedCollisionShapeInformation(struct b3CollisionShapeInformation* collisionShapesInfo)
{
return m_data->m_physicsClient->getCachedCollisionShapeInformation(collisionShapesInfo);
}
void PhysicsLoopBack::getCachedVREvents(struct b3VREventsData* vrEventsData) void PhysicsLoopBack::getCachedVREvents(struct b3VREventsData* vrEventsData)
{ {
return m_data->m_physicsClient->getCachedVREvents(vrEventsData); return m_data->m_physicsClient->getCachedVREvents(vrEventsData);

2
examples/SharedMemory/PhysicsLoopBack.h
View File

@@ -72,6 +72,8 @@ public:
virtual void getCachedVisualShapeInformation(struct b3VisualShapeInformation* visualShapesInfo); virtual void getCachedVisualShapeInformation(struct b3VisualShapeInformation* visualShapesInfo);
virtual void getCachedCollisionShapeInformation(struct b3CollisionShapeInformation* collisionShapesInfo);
virtual void getCachedVREvents(struct b3VREventsData* vrEventsData); virtual void getCachedVREvents(struct b3VREventsData* vrEventsData);
virtual void getCachedKeyboardEvents(struct b3KeyboardEventsData* keyboardEventsData); virtual void getCachedKeyboardEvents(struct b3KeyboardEventsData* keyboardEventsData);