godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00
Code Releases Wiki Activity

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

Browse Source 
Bullet physics flush_queries() as is done in Godot physics, and remove
the pre-tick callback.
This commit is contained in:
Marcel Admiraal
2020-07-07 17:39:40 +01:00
parent 18c51d3f0c
commit f31b2a1bba
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/bullet/bullet_physics_server.cpp
View File

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

5
modules/bullet/space_bullet.cpp
View File

@@ -579,10 +579,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();
@@ -650,7 +646,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);