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

Merge pull request #40185 from madmiraal/fix-37702-3.2 

[3.2] Move Bullet physics query flush from Bullet space pre-tick callback to Bullet physics flush_queries()
This commit is contained in:
Rémi Verschelde 2020-07-10 08:49:02 +02:00 committed by GitHub
parent 6fd712c874 e7d8464f87
commit 2cf52076fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 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,6 +1572,12 @@ 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

@ -560,10 +560,6 @@ 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();
@ -635,7 +631,6 @@ 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);