Merge branch 'GoaLitiuM-px_kinematic_move_fix'

2024-01-04 11:27:45 +01:00
parent 15bbd13c72 70298e8ae8
commit 7ddcf198bb
1 changed files with 7 additions and 1 deletions
--- a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
+++ b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
@@ -2260,7 +2260,13 @@ void PhysicsBackend::SetRigidActorPose(void* actor, const Vector3& position, con
    if (kinematic)
    {
        auto actorPhysX = (PxRigidDynamic*)actor;
-        actorPhysX->setKinematicTarget(trans);
+        if (actorPhysX->getActorFlags() & PxActorFlag::eDISABLE_SIMULATION)
+        {
+            // Ensures the disabled kinematic actor ends up in the correct pose after enabling simulation
+            actorPhysX->setGlobalPose(trans, wakeUp);
+        }
+        else
+            actorPhysX->setKinematicTarget(trans); 
    }
    else
    {