|
|
@@ -82,7 +82,8 @@ BulletWorld() {
|
|
|
_world->getPairCache()->setInternalGhostPairCallback(&_ghost_cb);
|
|
|
|
|
|
// Filter callback
|
|
|
- switch (bullet_filter_algorithm) {
|
|
|
+ _filter_algorithm = bullet_filter_algorithm;
|
|
|
+ switch (_filter_algorithm) {
|
|
|
case FA_mask:
|
|
|
_filter_cb = &_filter_cb1;
|
|
|
break;
|
|
|
@@ -1086,7 +1087,7 @@ void BulletWorld::
|
|
|
set_group_collision_flag(unsigned int group1, unsigned int group2, bool enable) {
|
|
|
LightMutexHolder holder(get_global_lock());
|
|
|
|
|
|
- if (bullet_filter_algorithm != FA_groups_mask) {
|
|
|
+ if (_filter_algorithm != FA_groups_mask) {
|
|
|
bullet_cat.warning() << "filter algorithm is not 'groups-mask'" << endl;
|
|
|
}
|
|
|
|
|
|
@@ -1198,7 +1199,7 @@ set_filter_callback(CallbackObject *obj) {
|
|
|
|
|
|
nassertv(obj != NULL);
|
|
|
|
|
|
- if (bullet_filter_algorithm != FA_callback) {
|
|
|
+ if (_filter_algorithm != FA_callback) {
|
|
|
bullet_cat.warning() << "filter algorithm is not 'callback'" << endl;
|
|
|
}
|
|
|
|