Ignore Collider:setKinematic if Collider's shape must be static;

bjornbytes · May 10, 2024 · 6a958a4 · 6a958a4
1 parent c657441
commit 6a958a4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/modules/physics/physics_jolt.c b/src/modules/physics/physics_jolt.c
@@ -856,7 +856,9 @@ bool lovrColliderIsKinematic(Collider* collider) {
 }
 
 void lovrColliderSetKinematic(Collider* collider, bool kinematic) {
-  if (collider->tag == ~0u || (collider->world->staticTagMask & (1 << collider->tag)) == 0) {
+  bool mustBeStatic = JPH_Shape_MustBeStatic(collider->shape->handle);
+  bool hasStaticTag = collider->tag != ~0u && (collider->world->staticTagMask & (1 << collider->tag));
+  if (!mustBeStatic && !hasStaticTag) {
     JPH_MotionType motionType = kinematic ? JPH_MotionType_Kinematic : JPH_MotionType_Dynamic;
     JPH_BodyInterface_SetMotionType(collider->world->bodies, collider->id, motionType, JPH_Activation_DontActivate);
   }