OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix for animated detector regions not actually animating (cleft bucket cloth, Er'cana harvester ladder)

Browse Source
This commit is contained in:
Adam Johnson
2011-05-09 15:30:27 -04:00
parent 656b86a685
commit 057566416b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Plasma/PubUtilLib/plPhysX/plPXPhysical.cpp
View File

@ -837,10 +837,12 @@ void plPXPhysical::ISetTransformGlobal(const hsMatrix44& l2w)
} }
} }
if (GetProperty(plSimulationInterface::kPhysAnim)) // This used to check for the kPhysAnim flag, however animated detectors
{ hsAssert(fActor->readBodyFlag(NX_BF_KINEMATIC),"This Should be kinematic"); // 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); fActor->moveGlobalPose(mat);
}
else else
fActor->setGlobalPose(mat); fActor->setGlobalPose(mat);
} }

2
Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.cpp
View File

@ -951,7 +951,7 @@ void plPXPhysicalControllerCore::HandleEnableChanged()
// PHYSX FIXME - after re-enabling check to see if we are inside any convex hull detector regions // PHYSX FIXME - after re-enabling check to see if we are inside any convex hull detector regions
hsPoint3 pos; hsPoint3 pos;
IGetPositionSim(pos); IGetPositionSim(pos);
plSimulationMgr::GetInstance()->UpdateDetectorsInScene(fWorldKey,GetOwner(),pos,fEnable); plSimulationMgr::GetInstance()->UpdateDetectorsInScene(fWorldKey,GetOwner(),pos,fEnabled);
#endif // USE_PHYSX_CONVEXHULL_WORKAROUND #endif // USE_PHYSX_CONVEXHULL_WORKAROUND
//IInformDetectors(true); //IInformDetectors(true);
} }