TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve behaviour of get_deactivation_enabled/is_deactivation_enabled

Browse Source
This commit is contained in:
rdb 2015-04-15 21:58:54 +02:00
parent d7552f0d8a
commit 76e135b835
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
panda/src/bullet/bulletBodyNode.cxx
View File

@ -155,6 +155,8 @@ output(ostream &out) const {
out << " (" << get_num_shapes() << " shapes)";
out << (is_active() ? " active" : " inactive");
if (is_static()) out << " static";
if (is_kinematic()) out << " kinematic";
}
@ -448,19 +450,22 @@ set_active(bool active, bool force) {
////////////////////////////////////////////////////////////////////
// Function: BulletBodyNode::set_deactivation_enabled
// Access: Published
// Description:
// Description: If true, this object will be deactivated after a
// certain amount of time has passed without movement.
// If false, the object will always remain active.
////////////////////////////////////////////////////////////////////
void BulletBodyNode::
set_deactivation_enabled(const bool enabled, const bool force) {
set_deactivation_enabled(bool enabled) {
int state = (enabled) ? WANTS_DEACTIVATION : DISABLE_DEACTIVATION;
// Don't change the state if it's currently active and we enable
// deactivation.
if (enabled != is_deactivation_enabled()) {
if (force) {
// It's OK to set to ACTIVE_TAG even if we don't mean to activate it; it
// will be disabled right away if the deactivation timer has run out.
int state = (enabled) ? ACTIVE_TAG : DISABLE_DEACTIVATION;
get_object()->forceActivationState(state);
}
else {
get_object()->setActivationState(state);
}
}
////////////////////////////////////////////////////////////////////
@ -471,7 +476,7 @@ set_deactivation_enabled(const bool enabled, const bool force) {
bool BulletBodyNode::
is_deactivation_enabled() const {
return (get_object()->getActivationState() & DISABLE_DEACTIVATION) == 0;
return (get_object()->getActivationState() != DISABLE_DEACTIVATION);
}
////////////////////////////////////////////////////////////////////

2
panda/src/bullet/bulletBodyNode.h
View File

@ -82,7 +82,7 @@ PUBLISHED:
void set_deactivation_time(PN_stdfloat dt);
PN_stdfloat get_deactivation_time() const;
void set_deactivation_enabled(const bool enabled, const bool force=false);
void set_deactivation_enabled(bool enabled);
bool is_deactivation_enabled() const;
// Debug Visualistion