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

Merge branch 'Swiggies-ccd-fix'

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-18 12:39:24 +02:00
parent 261c4a7e88 529de24da4
commit 4a6f2f8821
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -569,6 +569,7 @@ namespace
Array<PxBase*> DeleteObjects; Array<PxBase*> DeleteObjects;
bool _queriesHitTriggers = true; bool _queriesHitTriggers = true;
bool _enableCCD = true;
PhysicsCombineMode _frictionCombineMode = PhysicsCombineMode::Average; PhysicsCombineMode _frictionCombineMode = PhysicsCombineMode::Average;
PhysicsCombineMode _restitutionCombineMode = PhysicsCombineMode::Average; PhysicsCombineMode _restitutionCombineMode = PhysicsCombineMode::Average;
@@ -702,6 +703,8 @@ PxFilterFlags FilterShader(
pairFlags |= PxPairFlag::eNOTIFY_TOUCH_LOST; pairFlags |= PxPairFlag::eNOTIFY_TOUCH_LOST;
pairFlags |= PxPairFlag::ePOST_SOLVER_VELOCITY; pairFlags |= PxPairFlag::ePOST_SOLVER_VELOCITY;
pairFlags |= PxPairFlag::eNOTIFY_CONTACT_POINTS; pairFlags |= PxPairFlag::eNOTIFY_CONTACT_POINTS;
if (_enableCCD)
pairFlags |= PxPairFlag::eDETECT_CCD_CONTACT;
return PxFilterFlag::eDEFAULT; return PxFilterFlag::eDEFAULT;
} }
@@ -1225,6 +1228,7 @@ void PhysicsBackend::Shutdown()
void PhysicsBackend::ApplySettings(const PhysicsSettings& settings) void PhysicsBackend::ApplySettings(const PhysicsSettings& settings)
{ {
_queriesHitTriggers = settings.QueriesHitTriggers; _queriesHitTriggers = settings.QueriesHitTriggers;
_enableCCD = !settings.DisableCCD;
_frictionCombineMode = settings.FrictionCombineMode; _frictionCombineMode = settings.FrictionCombineMode;
_restitutionCombineMode = settings.RestitutionCombineMode; _restitutionCombineMode = settings.RestitutionCombineMode;