GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'px_kinematic_move_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-px_kinematic_move_fix

Browse Source
This commit is contained in:
Wojtek Figat
2024-01-04 11:27:38 +01:00
parent 15bbd13c72 9077e0cf22
commit 70298e8ae8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
View File

@@ -2260,7 +2260,13 @@ void PhysicsBackend::SetRigidActorPose(void* actor, const Vector3& position, con
if (kinematic) if (kinematic)
{ {
auto actorPhysX = (PxRigidDynamic*)actor; 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 else
{ {