From e7d8464f87881af455d49e505d9a5bd9b3b3bf43 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Tue, 7 Jul 2020 17:12:34 +0100 Subject: [PATCH] Move Bullet physics query flush from Bullet space pre-tick callback to Bullet physics flush_queries() as is done in Godot physics, and remove the pre-tick callback. --- modules/bullet/bullet_physics_server.cpp | 6 ++++++ modules/bullet/space_bullet.cpp | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/bullet/bullet_physics_server.cpp b/modules/bullet/bullet_physics_server.cpp index 6662e130c8d..c211888611b 100644 --- a/modules/bullet/bullet_physics_server.cpp +++ b/modules/bullet/bullet_physics_server.cpp @@ -1572,6 +1572,12 @@ void BulletPhysicsServer::sync() { } void BulletPhysicsServer::flush_queries() { + if (!active) + return; + + for (int i = 0; i < active_spaces_count; ++i) { + active_spaces[i]->flush_queries(); + } } void BulletPhysicsServer::finish() { diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp index 8e25b62c62c..5db0f6e2da2 100644 --- a/modules/bullet/space_bullet.cpp +++ b/modules/bullet/space_bullet.cpp @@ -560,10 +560,6 @@ void SpaceBullet::remove_all_collision_objects() { } } -void onBulletPreTickCallback(btDynamicsWorld *p_dynamicsWorld, btScalar timeStep) { - static_cast(p_dynamicsWorld->getWorldUserInfo())->flush_queries(); -} - void onBulletTickCallback(btDynamicsWorld *p_dynamicsWorld, btScalar timeStep) { const btCollisionObjectArray &colObjArray = p_dynamicsWorld->getCollisionObjectArray(); @@ -635,7 +631,6 @@ void SpaceBullet::create_empty_world(bool p_create_soft_world) { dynamicsWorld->setWorldUserInfo(this); - dynamicsWorld->setInternalTickCallback(onBulletPreTickCallback, this, true); dynamicsWorld->setInternalTickCallback(onBulletTickCallback, this, false); dynamicsWorld->getBroadphase()->getOverlappingPairCache()->setInternalGhostPairCallback(ghostPairCallback); // Setup ghost check dynamicsWorld->getPairCache()->setOverlapFilterCallback(godotFilterCallback);