Merge branch 'ccd-fix' of https://github.com/Swiggies/FlaxEngine into Swiggies-ccd-fix
This commit is contained in:
@@ -671,6 +671,8 @@ PxFilterFlags FilterShader(
|
||||
{
|
||||
const bool maskTest = (filterData0.word0 & filterData1.word1) && (filterData1.word0 & filterData0.word1);
|
||||
|
||||
auto& settings = *PhysicsSettings::Get();
|
||||
|
||||
// Let triggers through
|
||||
if (PxFilterObjectIsTrigger(attributes0) || PxFilterObjectIsTrigger(attributes1))
|
||||
{
|
||||
@@ -702,6 +704,8 @@ PxFilterFlags FilterShader(
|
||||
pairFlags |= PxPairFlag::eNOTIFY_TOUCH_LOST;
|
||||
pairFlags |= PxPairFlag::ePOST_SOLVER_VELOCITY;
|
||||
pairFlags |= PxPairFlag::eNOTIFY_CONTACT_POINTS;
|
||||
if (!settings.DisableCCD)
|
||||
pairFlags |= PxPairFlag::eDETECT_CCD_CONTACT;
|
||||
return PxFilterFlag::eDEFAULT;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user