AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-12 21:00:11 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Erwin Coumans 2021-04-25 00:41:28 -07:00
commit d70c3cfdc8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BulletCollision/CollisionDispatch/btCollisionObject.h
View File

@ -24,6 +24,7 @@ subject to the following restrictions:
#define WANTS_DEACTIVATION 3 #define WANTS_DEACTIVATION 3
#define DISABLE_DEACTIVATION 4 #define DISABLE_DEACTIVATION 4
#define DISABLE_SIMULATION 5 #define DISABLE_SIMULATION 5
#define FIXED_BASE_MULTI_BODY 6
struct btBroadphaseProxy; struct btBroadphaseProxy;
class btCollisionShape; class btCollisionShape;
@ -304,7 +305,7 @@ public:
SIMD_FORCE_INLINE bool isActive() const SIMD_FORCE_INLINE bool isActive() const
{ {
return ((getActivationState() != ISLAND_SLEEPING) && (getActivationState() != DISABLE_SIMULATION)); return ((getActivationState() != FIXED_BASE_MULTI_BODY) && (getActivationState() != ISLAND_SLEEPING) && (getActivationState() != DISABLE_SIMULATION));
} }
void setRestitution(btScalar rest) void setRestitution(btScalar rest)

5
src/BulletDynamics/Featherstone/btMultiBody.h
View File

@ -545,7 +545,10 @@ public:
{ {
m_canWakeup = canWakeup; m_canWakeup = canWakeup;
} }
bool isAwake() const { return m_awake; } bool isAwake() const
{
return m_awake;
}
void wakeUp(); void wakeUp();
void goToSleep(); void goToSleep();
void checkMotionAndSleepIfRequired(btScalar timestep); void checkMotionAndSleepIfRequired(btScalar timestep);

2
src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
View File

@ -139,7 +139,7 @@ void btMultiBodyDynamicsWorld::updateActivationState(btScalar timeStep)
{ {
if (body->hasFixedBase()) if (body->hasFixedBase())
{ {
col->setActivationState(ISLAND_SLEEPING); col->setActivationState(FIXED_BASE_MULTI_BODY);
} else } else
{ {
col->setActivationState(WANTS_DEACTIVATION); col->setActivationState(WANTS_DEACTIVATION);