From c99bf23af4be056e2e18dc5c9e6f1ad421edbfa8 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sun, 12 Apr 2020 19:52:49 -0600 Subject: [PATCH] Fix for animated detector regions ... (cherry picked from commit 057566416bd7cb2aebced0b8eeb2cfeb48381819) Date: Mon May 9 15:30:27 2011 -0400 Fix for animated detector regions not actually animating (cleft bucket cloth, Er'cana harvester ladder) --- .../Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp index 23b1b13f..bdbed73e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp @@ -855,8 +855,11 @@ void plPXPhysical::ISetTransformGlobal(const hsMatrix44& l2w) } } - if (GetProperty(plSimulationInterface::kPhysAnim)) - { hsAssert(fActor->readBodyFlag(NX_BF_KINEMATIC),"This Should be kinematic"); + // This used to check for the kPhysAnim flag, however animated detectors + // are also kinematic but not kPhysAnim, therefore, this would break on PhysX + // SDKs (yes, I'm looking at you, 2.6.4) that actually obey the ***GlobalPose + // rules set forth in the SDK documentation. + if(fActor->readBodyFlag(NX_BF_KINEMATIC)) fActor->moveGlobalPose(mat); } else