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

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
Erwin Coumans
2018-10-22 08:03:47 -07:00
parent a198459b09 7e86a579e9
commit 84870739af
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Evolution/NN3DWalkersTimeWarpBase.h
View File

@@ -52,7 +52,7 @@ static double /*7*/ CENTUPLE_SPEED = 100;
static double /*8*/ QUINCENTUPLE_SPEED = 500; static double /*8*/ QUINCENTUPLE_SPEED = 500;
static double /*9*/ MILLITUPLE_SPEED = 1000; static double /*9*/ MILLITUPLE_SPEED = 1000;
static double /*0*/ MAX_SPEED = MILLITUPLE_SPEED; static double /*0*/ MAX_SPEED = MILLITUPLE_SPEED;
static double /**/ NUM_SPEEDS = 11; static double /**/ NUM_SPEEDS = 10;
}; // namespace SimulationSpeeds }; // namespace SimulationSpeeds
// add speeds from the namespace here // add speeds from the namespace here

13
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -10999,14 +10999,19 @@ void PhysicsServerCommandProcessor::addTransformChangedNotifications()
{ {
continue; continue;
} }
if (bodyData->m_multiBody && bodyData->m_multiBody->isAwake()) if (bodyData->m_multiBody)
{ {
btMultiBody* mb = bodyData->m_multiBody; btMultiBody* mb = bodyData->m_multiBody;
m_data->m_pluginManager.addNotification(createTransformChangedNotification(bodyUniqueId, -1, mb->getBaseCollider())); if (mb->getBaseCollider()->isActive())
{
m_data->m_pluginManager.addNotification(createTransformChangedNotification(bodyUniqueId, -1, mb->getBaseCollider()));
}
for (int linkIndex = 0; linkIndex < mb->getNumLinks(); linkIndex++) for (int linkIndex = 0; linkIndex < mb->getNumLinks(); linkIndex++)
{ {
m_data->m_pluginManager.addNotification(createTransformChangedNotification(bodyUniqueId, linkIndex, mb->getLinkCollider(linkIndex))); if (mb->getLinkCollider(linkIndex)->isActive())
{
m_data->m_pluginManager.addNotification(createTransformChangedNotification(bodyUniqueId, linkIndex, mb->getLinkCollider(linkIndex)));
}
} }
} }
else if (bodyData->m_rigidBody && bodyData->m_rigidBody->isActive()) else if (bodyData->m_rigidBody && bodyData->m_rigidBody->isActive())