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

Fix incorrect vehicle wheels collisions inside trigger volumes

Browse Source 
#2132
This commit is contained in:
Wojtek Figat
2024-02-23 19:27:50 +01:00
parent 01d123b099
commit eb12c630a7
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,17 +382,17 @@ public:
return PxQueryHitType::eNONE; return PxQueryHitType::eNONE;
const PxFilterData shapeFilter = shape->getQueryFilterData(); const PxFilterData shapeFilter = shape->getQueryFilterData();
// Let triggers through
if (shape->getFlags() & PxShapeFlag::eTRIGGER_SHAPE)
return PxQueryHitType::eNONE;
// Hardcoded id for vehicle shapes masking // Hardcoded id for vehicle shapes masking
if (filterData.word3 == shapeFilter.word3) if (filterData.word3 == shapeFilter.word3)
{
return PxQueryHitType::eNONE; return PxQueryHitType::eNONE;
}
// Collide for pairs (A,B) where the filtermask of A contains the ID of B and vice versa // Collide for pairs (A,B) where the filtermask of A contains the ID of B and vice versa
if ((filterData.word0 & shapeFilter.word1) && (shapeFilter.word0 & filterData.word1)) if ((filterData.word0 & shapeFilter.word1) && (shapeFilter.word0 & filterData.word1))
{
return PxQueryHitType::eBLOCK; return PxQueryHitType::eBLOCK;
}
return PxQueryHitType::eNONE; return PxQueryHitType::eNONE;
} }
@@ -1410,7 +1410,6 @@ void PhysicsBackend::EndSimulateScene(void* scene)
float rightThrottle = wheelVehicle->_tankRightThrottle; float rightThrottle = wheelVehicle->_tankRightThrottle;
float leftBrake = Math::Max(wheelVehicle->_tankLeftBrake, wheelVehicle->_handBrake); float leftBrake = Math::Max(wheelVehicle->_tankLeftBrake, wheelVehicle->_handBrake);
float rightBrake = Math::Max(wheelVehicle->_tankRightBrake, wheelVehicle->_handBrake); float rightBrake = Math::Max(wheelVehicle->_tankRightBrake, wheelVehicle->_handBrake);
WheeledVehicle::DriveModes vehicleDriveMode = wheelVehicle->_driveControl.DriveMode; WheeledVehicle::DriveModes vehicleDriveMode = wheelVehicle->_driveControl.DriveMode;
if (isTank) if (isTank)
@@ -1559,7 +1558,7 @@ void PhysicsBackend::EndSimulateScene(void* scene)
throttle = Math::Max(throttle, 0.0f); throttle = Math::Max(throttle, 0.0f);
} }
// Force brake the another side track to turn more faster. // Force brake the another side track to turn faster
if (Math::Abs(leftThrottle) > deadZone && Math::Abs(rightThrottle) < deadZone) if (Math::Abs(leftThrottle) > deadZone && Math::Abs(rightThrottle) < deadZone)
{ {
rightBrake = 1.0f; rightBrake = 1.0f;
@@ -1607,8 +1606,7 @@ void PhysicsBackend::EndSimulateScene(void* scene)
}; };
// @formatter:on // @formatter:on
// Reduce steer by speed to make vehicle more easier to maneuver // Reduce steer by speed to make vehicle easier to maneuver
constexpr int steerVsSpeedN = 8; constexpr int steerVsSpeedN = 8;
PxF32 steerVsForwardSpeedData[steerVsSpeedN]; PxF32 steerVsForwardSpeedData[steerVsSpeedN];
const int lastSteerVsSpeedIndex = wheelVehicle->_driveControl.SteerVsSpeed.Count() - 1; const int lastSteerVsSpeedIndex = wheelVehicle->_driveControl.SteerVsSpeed.Count() - 1;
@@ -1623,7 +1621,7 @@ void PhysicsBackend::EndSimulateScene(void* scene)
// .. // ..
// fill the steerVsForwardSpeedData with the speed and steer // fill the steerVsForwardSpeedData with the speed and steer
for (int i = 0; i < 8; i += 2) for (int32 i = 0; i < 8; i += 2)
{ {
steerVsForwardSpeedData[i] = wheelVehicle->_driveControl.SteerVsSpeed[steerVsSpeedIndex].Speed; steerVsForwardSpeedData[i] = wheelVehicle->_driveControl.SteerVsSpeed[steerVsSpeedIndex].Speed;
steerVsForwardSpeedData[i + 1] = wheelVehicle->_driveControl.SteerVsSpeed[steerVsSpeedIndex].Steer; steerVsForwardSpeedData[i + 1] = wheelVehicle->_driveControl.SteerVsSpeed[steerVsSpeedIndex].Steer;
@@ -1631,7 +1629,6 @@ void PhysicsBackend::EndSimulateScene(void* scene)
} }
const PxFixedSizeLookupTable<steerVsSpeedN> steerVsForwardSpeed(steerVsForwardSpeedData, 4); const PxFixedSizeLookupTable<steerVsSpeedN> steerVsForwardSpeed(steerVsForwardSpeedData, 4);
// @formatter:on
if (wheelVehicle->UseAnalogSteering) if (wheelVehicle->UseAnalogSteering)
{ {
switch (wheelVehicle->_driveTypeCurrent) switch (wheelVehicle->_driveTypeCurrent)