diff options
| author | erwincoumans <erwincoumans@google.com> | 2019-05-08 18:06:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 18:06:28 -0700 |
| commit | 7b06293a97eba4a552a698e822f072fec717f30b (patch) | |
| tree | 7f709b7494d16d18534286c8265a6d174c65c561 | |
| parent | 1ae63d097d455112924fdeb18fab3f4f7bdde4af (diff) | |
| parent | f598aad3d457b68297daa0d59329a6dc6ad84c62 (diff) | |
| download | bullet3-7b06293a97eba4a552a698e822f072fec717f30b.tar.gz | |
Merge pull request #2247 from erwincoumans/master
fix test compilation
| -rw-r--r-- | examples/SharedMemory/PhysicsServerCommandProcessor.cpp | 14 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index 6a3fa1c29..87420a2ea 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -3394,6 +3394,7 @@ int PhysicsServerCommandProcessor::createBodyInfoStream(int bodyUniqueId, char* } streamSizeInBytes = ser.getCurrentBufferSize(); } +#ifndef SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD else if(bodyHandle->m_softBody){ //minimum serialization, registerNameForPointer btSoftBody* sb = bodyHandle->m_softBody; @@ -3408,7 +3409,7 @@ int PhysicsServerCommandProcessor::createBodyInfoStream(int bodyUniqueId, char* ser.finalizeChunk(chunk, structType, BT_SOFTBODY_CODE, sb); streamSizeInBytes = ser.getCurrentBufferSize(); } - +#endif return streamSizeInBytes; } @@ -5515,7 +5516,11 @@ bool PhysicsServerCommandProcessor::processSyncBodyInfoCommand(const struct Shar { int usedHandle = usedHandles[i]; InternalBodyData* body = m_data->m_bodyHandles.getHandle(usedHandle); +#ifndef SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD if (body && (body->m_multiBody || body->m_rigidBody || body->m_softBody)) +#else + if (body && (body->m_multiBody || body->m_rigidBody)) +#endif { serverStatusOut.m_sdfLoadedArgs.m_bodyUniqueIds[actualNumBodies++] = usedHandle; } @@ -6579,6 +6584,7 @@ bool PhysicsServerCommandProcessor::processRequestActualStateCommand(const struc hasStatus = true; } +#ifndef SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD else if (body && body->m_softBody) { btSoftBody* sb = body->m_softBody; @@ -6625,6 +6631,7 @@ bool PhysicsServerCommandProcessor::processRequestActualStateCommand(const struc hasStatus = true; } +#endif else { //b3Warning("Request state but no multibody or rigid body available"); @@ -7633,13 +7640,14 @@ bool PhysicsServerCommandProcessor::processRequestCollisionInfoCommand(const str serverCmd.m_sendCollisionInfoArgs.m_rootWorldAABBMax[2] = aabbMax[2]; } } +#ifndef SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD else if (body && body->m_softBody){ SharedMemoryStatus& serverCmd = serverStatusOut; serverStatusOut.m_type = CMD_REQUEST_COLLISION_INFO_COMPLETED; serverCmd.m_sendCollisionInfoArgs.m_numLinks = 0; setDefaultRootWorldAABB(serverCmd); } - +#endif return hasStatus; } @@ -8236,12 +8244,14 @@ bool PhysicsServerCommandProcessor::processGetDynamicsInfoCommand(const struct S } hasStatus = true; } +#ifndef SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD else if (body && body->m_softBody){ //todo: @fuchuyuan implement dynamics info b3Warning("Softbody dynamics info not set!!!"); SharedMemoryStatus& serverCmd = serverStatusOut; serverCmd.m_type = CMD_GET_DYNAMICS_INFO_COMPLETED; } +#endif return hasStatus; } @@ -483,7 +483,7 @@ if 'BT_USE_EGL' in EGL_CXX_FLAGS: setup( name='pybullet', - version='2.4.9', + version='2.5.0', description= 'Official Python Interface for the Bullet Physics SDK specialized for Robotics Simulation and Reinforcement Learning', long_description= |