godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Move Bullet physics query flush from Bullet space pre-tick callback to" 

This reverts commit e7d8464f87.

Fixes #40508 regression.

This will be re-applied and the regression fixed for a future 3.2.x release.
This commit is contained in:
Rémi Verschelde 2020-07-28 11:29:29 +02:00
parent ba3f0fa971
commit 10544f1cf7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/bullet/bullet_physics_server.cpp
View File

@ -1572,12 +1572,6 @@ void BulletPhysicsServer::sync() {
} }
void BulletPhysicsServer::flush_queries() { void BulletPhysicsServer::flush_queries() {
if (!active)
return;
for (int i = 0; i < active_spaces_count; ++i) {
active_spaces[i]->flush_queries();
}
} }
void BulletPhysicsServer::finish() { void BulletPhysicsServer::finish() {

5
modules/bullet/space_bullet.cpp
View File

@ -561,6 +561,10 @@ void SpaceBullet::remove_all_collision_objects() {
} }
} }
void onBulletPreTickCallback(btDynamicsWorld *p_dynamicsWorld, btScalar timeStep) {
static_cast<SpaceBullet *>(p_dynamicsWorld->getWorldUserInfo())->flush_queries();
}
void onBulletTickCallback(btDynamicsWorld *p_dynamicsWorld, btScalar timeStep) { void onBulletTickCallback(btDynamicsWorld *p_dynamicsWorld, btScalar timeStep) {
const btCollisionObjectArray &colObjArray = p_dynamicsWorld->getCollisionObjectArray(); const btCollisionObjectArray &colObjArray = p_dynamicsWorld->getCollisionObjectArray();
@ -632,6 +636,7 @@ void SpaceBullet::create_empty_world(bool p_create_soft_world) {
dynamicsWorld->setWorldUserInfo(this); dynamicsWorld->setWorldUserInfo(this);
dynamicsWorld->setInternalTickCallback(onBulletPreTickCallback, this, true);
dynamicsWorld->setInternalTickCallback(onBulletTickCallback, this, false); dynamicsWorld->setInternalTickCallback(onBulletTickCallback, this, false);
dynamicsWorld->getBroadphase()->getOverlappingPairCache()->setInternalGhostPairCallback(ghostPairCallback); // Setup ghost check dynamicsWorld->getBroadphase()->getOverlappingPairCache()->setInternalGhostPairCallback(ghostPairCallback); // Setup ghost check
dynamicsWorld->getPairCache()->setOverlapFilterCallback(godotFilterCallback); dynamicsWorld->getPairCache()->setOverlapFilterCallback(godotFilterCallback);