From 3cd50693d04b774751e72adc46a354768a33a657 Mon Sep 17 00:00:00 2001 From: RaphaelIT7 Date: Mon, 2 Oct 2023 00:29:58 +0200 Subject: [PATCH 1/2] Fixed IsCollisionEnabled having no affect. [#] Fixed CheckCollision checking collisions even if collisions are disabled(IsCollisionEnabled = false) Related issue: fixes #164 --- vphysics_jolt/vjolt_controller_player.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vphysics_jolt/vjolt_controller_player.cpp b/vphysics_jolt/vjolt_controller_player.cpp index 1a11e1b..bb07510 100644 --- a/vphysics_jolt/vjolt_controller_player.cpp +++ b/vphysics_jolt/vjolt_controller_player.cpp @@ -157,6 +157,8 @@ bool JoltPhysicsPlayerController::WasFrozen() static void CheckCollision( JoltPhysicsObject *pObject, JPH::CollideShapeCollector &ioCollector, JPH::BodyFilter &ioFilter ) { + if (!pObject->IsCollisionEnabled()) { return; } // If we have no collisions, we have nothing to check. + JPH::PhysicsSystem *pSystem = pObject->GetEnvironment()->GetPhysicsSystem(); // TODO(Josh): Make a PLAYER ONLY layer that will only collide with MOVING ONLY annd From e242b5358988fd5dadc4a0ae40f44ffe43a4cfbc Mon Sep 17 00:00:00 2001 From: RaphaelIT7 Date: Mon, 2 Oct 2023 22:06:20 +0200 Subject: [PATCH 2/2] Codestyle --- vphysics_jolt/vjolt_controller_player.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vphysics_jolt/vjolt_controller_player.cpp b/vphysics_jolt/vjolt_controller_player.cpp index bb07510..6199cb2 100644 --- a/vphysics_jolt/vjolt_controller_player.cpp +++ b/vphysics_jolt/vjolt_controller_player.cpp @@ -157,7 +157,8 @@ bool JoltPhysicsPlayerController::WasFrozen() static void CheckCollision( JoltPhysicsObject *pObject, JPH::CollideShapeCollector &ioCollector, JPH::BodyFilter &ioFilter ) { - if (!pObject->IsCollisionEnabled()) { return; } // If we have no collisions, we have nothing to check. + if ( !pObject->IsCollisionEnabled() ) + return; JPH::PhysicsSystem *pSystem = pObject->GetEnvironment()->GetPhysicsSystem();