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

enable compilation without deformables/soft bodies (for some unit tests

Browse Source 
in premake)
This commit is contained in:
Erwin Coumans
2019-11-19 12:20:33 -08:00
parent c7d91b686a
commit d42cf2d0ca
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -1636,18 +1636,14 @@ struct PhysicsServerCommandProcessorInternalData
btDefaultCollisionConfiguration* m_collisionConfiguration; btDefaultCollisionConfiguration* m_collisionConfiguration;
//#ifndef SKIP_DEFORMABLE_BODY #ifndef SKIP_DEFORMABLE_BODY
btDeformableBodySolver* m_deformablebodySolver; btDeformableBodySolver* m_deformablebodySolver;
btAlignedObjectArray<btDeformableLagrangianForce*> m_lf; btAlignedObjectArray<btDeformableLagrangianForce*> m_lf;
//#else//SKIP_DEFORMABLE_BODY #endif
//#ifndef SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD
//#else//SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD
btMultiBodyDynamicsWorld* m_dynamicsWorld; btMultiBodyDynamicsWorld* m_dynamicsWorld;
//#endif//SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD
//#endif//SKIP_DEFORMABLE_BODY
int m_constraintSolverType; int m_constraintSolverType;
SharedMemoryDebugDrawer* m_remoteDebugDrawer; SharedMemoryDebugDrawer* m_remoteDebugDrawer;
@@ -1714,7 +1710,9 @@ struct PhysicsServerCommandProcessorInternalData
m_solver(0), m_solver(0),
m_collisionConfiguration(0), m_collisionConfiguration(0),
m_dynamicsWorld(0), m_dynamicsWorld(0),
#ifndef SKIP_DEFORMABLE_BODY
m_deformablebodySolver(0), m_deformablebodySolver(0),
#endif
m_constraintSolverType(-1), m_constraintSolverType(-1),
m_remoteDebugDrawer(0), m_remoteDebugDrawer(0),
m_stateLoggersUniqueId(0), m_stateLoggersUniqueId(0),
@@ -9437,6 +9435,7 @@ bool PhysicsServerCommandProcessor::processSendPhysicsParametersCommand(const st
if (clientCmd.m_updateFlags & SIM_PARAM_UPDATE_SPARSE_SDF) if (clientCmd.m_updateFlags & SIM_PARAM_UPDATE_SPARSE_SDF)
{ {
#ifndef SKIP_DEFORMABLE_BODY
{ {
btDeformableMultiBodyDynamicsWorld* deformWorld = getDeformableWorld(); btDeformableMultiBodyDynamicsWorld* deformWorld = getDeformableWorld();
if (deformWorld) if (deformWorld)
@@ -9445,6 +9444,8 @@ bool PhysicsServerCommandProcessor::processSendPhysicsParametersCommand(const st
deformWorld ->getWorldInfo().m_sparsesdf.Reset(); deformWorld ->getWorldInfo().m_sparsesdf.Reset();
} }
} }
#endif
#ifndef SKIP_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD
{ {
btSoftMultiBodyDynamicsWorld* softWorld = getSoftWorld(); btSoftMultiBodyDynamicsWorld* softWorld = getSoftWorld();
if (softWorld) if (softWorld)
@@ -9453,6 +9454,7 @@ bool PhysicsServerCommandProcessor::processSendPhysicsParametersCommand(const st
softWorld->getWorldInfo().m_sparsesdf.Reset(); softWorld->getWorldInfo().m_sparsesdf.Reset();
} }
} }
#endif
} }
if (clientCmd.m_updateFlags & SIM_PARAM_UPDATE_RESTITUTION_VELOCITY_THRESHOLD) if (clientCmd.m_updateFlags & SIM_PARAM_UPDATE_RESTITUTION_VELOCITY_THRESHOLD)