Merge e242b53589
into 559217d991
This commit is contained in:
commit
0a3777b39f
|
@ -157,6 +157,9 @@ bool JoltPhysicsPlayerController::WasFrozen()
|
||||||
|
|
||||||
static void CheckCollision( JoltPhysicsObject *pObject, JPH::CollideShapeCollector &ioCollector, JPH::BodyFilter &ioFilter )
|
static void CheckCollision( JoltPhysicsObject *pObject, JPH::CollideShapeCollector &ioCollector, JPH::BodyFilter &ioFilter )
|
||||||
{
|
{
|
||||||
|
if ( !pObject->IsCollisionEnabled() )
|
||||||
|
return;
|
||||||
|
|
||||||
JPH::PhysicsSystem *pSystem = pObject->GetEnvironment()->GetPhysicsSystem();
|
JPH::PhysicsSystem *pSystem = pObject->GetEnvironment()->GetPhysicsSystem();
|
||||||
|
|
||||||
// TODO(Josh): Make a PLAYER ONLY layer that will only collide with MOVING ONLY annd
|
// TODO(Josh): Make a PLAYER ONLY layer that will only collide with MOVING ONLY annd
|
||||||
|
|
Loading…
Reference in New Issue