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

Remove Jolt Physics project setting "Areas Detect Static Bodies"

Browse Source
This commit is contained in:
Mikael Hermansson
2025-04-25 12:49:47 +02:00
parent e45cc68092
commit e160040f0c
6 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/jolt_physics/spaces/jolt_layers.cpp
View File

@@ -52,28 +52,25 @@ public:
using namespace JoltBroadPhaseLayer;
allow_collision(BODY_STATIC, BODY_DYNAMIC);
allow_collision(BODY_STATIC, AREA_DETECTABLE);
allow_collision(BODY_STATIC, AREA_UNDETECTABLE);
allow_collision(BODY_STATIC_BIG, BODY_DYNAMIC);
allow_collision(BODY_STATIC_BIG, AREA_DETECTABLE);
allow_collision(BODY_STATIC_BIG, AREA_UNDETECTABLE);
allow_collision(BODY_DYNAMIC, BODY_STATIC);
allow_collision(BODY_DYNAMIC, BODY_STATIC_BIG);
allow_collision(BODY_DYNAMIC, BODY_DYNAMIC);
allow_collision(BODY_DYNAMIC, AREA_DETECTABLE);
allow_collision(BODY_DYNAMIC, AREA_UNDETECTABLE);
allow_collision(AREA_DETECTABLE, BODY_DYNAMIC);
allow_collision(AREA_DETECTABLE, BODY_STATIC);
allow_collision(AREA_DETECTABLE, BODY_STATIC_BIG);
allow_collision(AREA_DETECTABLE, AREA_DETECTABLE);
allow_collision(AREA_DETECTABLE, AREA_UNDETECTABLE);
allow_collision(AREA_UNDETECTABLE, BODY_DYNAMIC);
allow_collision(AREA_UNDETECTABLE, BODY_STATIC);
allow_collision(AREA_UNDETECTABLE, BODY_STATIC_BIG);
allow_collision(AREA_UNDETECTABLE, AREA_DETECTABLE);
if (JoltProjectSettings::areas_detect_static_bodies) {
allow_collision(BODY_STATIC, AREA_DETECTABLE);
allow_collision(BODY_STATIC, AREA_UNDETECTABLE);
allow_collision(BODY_STATIC_BIG, AREA_DETECTABLE);
allow_collision(BODY_STATIC_BIG, AREA_UNDETECTABLE);
allow_collision(AREA_DETECTABLE, BODY_STATIC);
allow_collision(AREA_DETECTABLE, BODY_STATIC_BIG);
allow_collision(AREA_UNDETECTABLE, BODY_STATIC);
allow_collision(AREA_UNDETECTABLE, BODY_STATIC_BIG);
}
}
void allow_collision(UnderlyingType p_layer1, UnderlyingType p_layer2) { masks[p_layer1] |= uint8_t(1U << p_layer2); }