space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-06-09 10:06:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved collision filter test (#6431)

Browse Source
This commit is contained in:
eoineoineoin
2026-05-08 20:32:02 +01:00
committed by GitHub
parent 08a3d120b7
commit 6e78763172
1 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Shared/Physics/Systems/SharedPhysicsSystem.Fixtures.cs
+12 -22
View File
@@ -149,7 +149,7 @@ public abstract partial class SharedPhysicsSystem
return false;
}
// Fast check
// Check the collision filter on the rigid bodies
if (!bodyA.Comp2.Hard ||
!bodyB.Comp2.Hard ||
((bodyA.Comp2.CollisionLayer & bodyB.Comp2.CollisionMask) == 0x0 &&
@@ -158,28 +158,18 @@ public abstract partial class SharedPhysicsSystem
return false;
}
// Slow check
foreach (var fix in bodyA.Comp1.Fixtures.Values)
{
if (!fix.Hard)
continue;
// Check the collision filter on the fixtures
return IsHardCollidable(bodyA.Comp1, bodyB.Comp1);
}
foreach (var other in bodyB.Comp1.Fixtures.Values)
{
if (!other.Hard)
continue;
if ((fix.CollisionLayer & other.CollisionMask) == 0x0 &&
(fix.CollisionMask & other.CollisionLayer) == 0x0)
{
continue;
}
return true;
}
}
return false;
/// <summary>
/// Returns true if collision filter on any fixture pair are hard-collidable with each other
/// </summary>
public bool IsHardCollidable(FixturesComponent fixturesA, FixturesComponent fixturesB)
{
var (aLayer, aMask) = GetHardCollision(fixturesA);
var (bLayer, bMask) = GetHardCollision(fixturesA);
return ((aLayer & bMask) | (bLayer & aMask)) != 0;
}
public void AddCollisionMask(EntityUid uid, string fixtureId, Fixture fixture, int mask, FixturesComponent? manager = null, PhysicsComponent? body = null)