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

Fixing conflicts

Browse Source
This commit is contained in:
Iain Mckay
2022-01-05 14:33:25 +01:00
parent a5884a2e07
commit 498040765b
3 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Physics/Colliders/CharacterController.cpp
View File

@@ -173,7 +173,7 @@ CharacterController::CollisionFlags CharacterController::Move(const Vector3& dis
filters.mFilterData = (PxFilterData*)&_filterData;
filters.mFilterCallback = GetPhysicsScene()->GetCharacterQueryFilterCallback();
filters.mFilterFlags = PxQueryFlag::eDYNAMIC | PxQueryFlag::eSTATIC | PxQueryFlag::ePREFILTER;
filters.mCCTFilterCallback = Physics::GetCharacterControllerFilterCallback();
filters.mCCTFilterCallback = GetPhysicsScene()->GetCharacterControllerFilterCallback();
result = (CollisionFlags)(byte)_controller->move(C2P(displacement), _minMoveDistance, deltaTime, filters);
_lastFlags = result;