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

Revert "Create a new pointer in btCollisionShape instead of just using userPtr."

Browse Source 
This reverts commit d2d987a5ed.

After discussion, we decided to use userPtr.
This commit is contained in:
Jan Matas
2018-02-12 11:26:39 +00:00
parent d2d987a5ed
commit 817fb40fb5
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -5862,7 +5862,7 @@ bool PhysicsServerCommandProcessor::processLoadSoftBodyCommand(const struct Shar
psb->scale(btVector3(scale,scale,scale));
psb->setTotalMass(mass,true);
psb->getCollisionShape()->setMargin(collisionMargin);
psb->getCollisionShape()->setBodyPointer(psb);
psb->getCollisionShape()->setUserPointer(psb);
m_data->m_dynamicsWorld->addSoftBody(psb);
m_data->m_guiHelper->createCollisionShapeGraphicsObject(psb->getCollisionShape());
m_data->m_guiHelper->autogenerateGraphicsObjects(this->m_data->m_dynamicsWorld);