space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

More lookup fixes (#3438)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-06 20:15:08 +13:00
committed by GitHub
parent 947f04ebb9
commit 656992ae5f
2 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Robust.Shared/GameObjects/Systems/EntityLookupSystem.cs
View File

@@ -238,7 +238,7 @@ namespace Robust.Shared.GameObjects
if (body.CanCollide)
AddPhysicsTree(old.Uid, broadphase, xform, body, fixtures);
else
AddSundriesTree(old.Uid, broadphase, uid, xform, body.BodyType == BodyType.Static);
AddOrUpdateSundriesTree(old.Uid, broadphase, uid, xform, body.BodyType == BodyType.Static);
}
private void RemoveBroadTree(BroadphaseComponent lookup, FixturesComponent manager, bool staticBody)
@@ -288,10 +288,10 @@ namespace Robust.Shared.GameObjects
if (!TryComp(broadphaseXform.MapUid, out SharedPhysicsMapComponent? physMap))
throw new InvalidOperationException($"Physics Broadphase is missing physics map. {ToPrettyString(broadUid)}");
AddPhysicsTree(broadUid, broadphase, broadphaseXform, physMap, xform, body, fixtures, xformQuery);
AddOrUpdatePhysicsTree(broadUid, broadphase, broadphaseXform, physMap, xform, body, fixtures, xformQuery);
}
private void AddPhysicsTree(
private void AddOrUpdatePhysicsTree(
EntityUid broadUid,
BroadphaseComponent broadphase,
TransformComponent broadphaseXform,
@@ -362,12 +362,12 @@ namespace Robust.Shared.GameObjects
fixture.ProxyCount = count;
}
private void AddSundriesTree(EntityUid broadUid, BroadphaseComponent broadphase, EntityUid uid, TransformComponent xform, bool staticBody, Box2? aabb = null)
private void AddOrUpdateSundriesTree(EntityUid broadUid, BroadphaseComponent broadphase, EntityUid uid, TransformComponent xform, bool staticBody, Box2? aabb = null)
{
DebugTools.Assert(!_container.IsEntityOrParentInContainer(uid));
DebugTools.Assert(xform.Broadphase == null || xform.Broadphase == new BroadphaseData(broadUid, false, staticBody));
xform.Broadphase ??= new(broadUid, false, staticBody);
(staticBody ? broadphase.StaticSundriesTree : broadphase.SundriesTree).Add(uid, aabb);
(staticBody ? broadphase.StaticSundriesTree : broadphase.SundriesTree).AddOrUpdate(uid, aabb);
}
private void OnEntityInit(EntityUid uid)
@@ -456,7 +456,7 @@ namespace Robust.Shared.GameObjects
$"Broadphase's map is missing a physics map comp. Broadphase: {ToPrettyString(newBroadphase.Owner)}");
}
AddToEntityTree(
AddOrUpdateEntityTree(
newBroadphase.Owner,
newBroadphase,
newBroadphaseXform,
@@ -478,7 +478,7 @@ namespace Robust.Shared.GameObjects
var broadQuery = GetEntityQuery<BroadphaseComponent>();
if (TryFindBroadphase(xform, broadQuery, xformQuery, out var broadphase))
AddToEntityTree(broadphase, uid, xform, xformQuery);
AddOrUpdateEntityTree(broadphase, uid, xform, xformQuery);
}
public void FindAndAddToEntityTree(EntityUid uid,
@@ -491,7 +491,7 @@ namespace Robust.Shared.GameObjects
EntityQuery<BroadphaseComponent> broadQuery)
{
if (TryFindBroadphase(xform, broadQuery, xformQuery, out var broadphase))
AddToEntityTree(broadphase.Owner, broadphase, uid, xform, xformQuery, metaQuery, contQuery, physicsQuery, fixturesQuery, true);
AddOrUpdateEntityTree(broadphase.Owner, broadphase, uid, xform, xformQuery, metaQuery, contQuery, physicsQuery, fixturesQuery, true);
}
/// <summary>
@@ -506,10 +506,10 @@ namespace Robust.Shared.GameObjects
if (!TryGetCurrentBroadphase(xform, out var broadphase))
return;
AddToEntityTree(broadphase, uid, xform, xformQuery);
AddOrUpdateEntityTree(broadphase, uid, xform, xformQuery);
}
private void AddToEntityTree(
private void AddOrUpdateEntityTree(
BroadphaseComponent broadphase,
EntityUid uid,
TransformComponent xform,
@@ -521,10 +521,10 @@ namespace Robust.Shared.GameObjects
var physicsQuery = GetEntityQuery<PhysicsComponent>();
var fixturesQuery = GetEntityQuery<FixturesComponent>();
AddToEntityTree(broadphase.Owner, broadphase, uid, xform, xformQuery, metaQuery, contQuery, physicsQuery, fixturesQuery, recursive);
AddOrUpdateEntityTree(broadphase.Owner, broadphase, uid, xform, xformQuery, metaQuery, contQuery, physicsQuery, fixturesQuery, recursive);
}
private void AddToEntityTree(EntityUid broadUid,
private void AddOrUpdateEntityTree(EntityUid broadUid,
BroadphaseComponent broadphase,
EntityUid uid,
TransformComponent xform,
@@ -542,7 +542,7 @@ namespace Robust.Shared.GameObjects
$"Broadphase's map is missing a physics map comp. Broadphase: {ToPrettyString(broadphase.Owner)}");
}
AddToEntityTree(
AddOrUpdateEntityTree(
broadUid,
broadphase,
broadphaseXform,
@@ -557,7 +557,7 @@ namespace Robust.Shared.GameObjects
recursive);
}
private void AddToEntityTree(
private void AddOrUpdateEntityTree(
EntityUid broadUid,
BroadphaseComponent broadphase,
TransformComponent broadphaseXform,
@@ -580,11 +580,11 @@ namespace Robust.Shared.GameObjects
var relativeRotation = rotation - broadphaseXform.LocalRotation;
var aabb = GetAABBNoContainer(uid, coordinates.Position, relativeRotation);
AddSundriesTree(broadUid, broadphase, uid, xform, body?.BodyType == BodyType.Static, aabb);
AddOrUpdateSundriesTree(broadUid, broadphase, uid, xform, body?.BodyType == BodyType.Static, aabb);
}
else
{
AddPhysicsTree(broadUid, broadphase, broadphaseXform, physicsMap, xform, body, fixturesQuery.GetComponent(uid), xformQuery);
AddOrUpdatePhysicsTree(broadUid, broadphase, broadphaseXform, physicsMap, xform, body, fixturesQuery.GetComponent(uid), xformQuery);
}
var childEnumerator = xform.ChildEnumerator;
@@ -596,7 +596,7 @@ namespace Robust.Shared.GameObjects
while (childEnumerator.MoveNext(out var child))
{
var childXform = xformQuery.GetComponent(child.Value);
AddToEntityTree(broadUid, broadphase, broadphaseXform, physicsMap, child.Value, childXform, xformQuery, metaQuery, contQuery, physicsQuery, fixturesQuery);
AddOrUpdateEntityTree(broadUid, broadphase, broadphaseXform, physicsMap, child.Value, childXform, xformQuery, metaQuery, contQuery, physicsQuery, fixturesQuery);
}
return;
}
@@ -607,7 +607,7 @@ namespace Robust.Shared.GameObjects
continue;
var childXform = xformQuery.GetComponent(child.Value);
AddToEntityTree(broadUid, broadphase, broadphaseXform, physicsMap, child.Value, childXform, xformQuery, metaQuery, contQuery, physicsQuery, fixturesQuery);
AddOrUpdateEntityTree(broadUid, broadphase, broadphaseXform, physicsMap, child.Value, childXform, xformQuery, metaQuery, contQuery, physicsQuery, fixturesQuery);
}
}

31
Robust.Shared/Physics/DynamicTree.cs
View File

@@ -130,7 +130,7 @@ namespace Robust.Shared.Physics
aabb ??= _extractAabb(item);
if (CheckNaNs(aabb.Value))
if (HasNaNs(aabb.Value))
{
_nodeLookup[item] = DynamicTree.Proxy.Free;
return true;
@@ -185,7 +185,7 @@ namespace Robust.Shared.Physics
newBox ??= _extractAabb(item);
if (CheckNaNs(newBox.Value))
if (HasNaNs(newBox.Value))
{
if (proxy == DynamicTree.Proxy.Free)
{
@@ -327,9 +327,32 @@ namespace Robust.Shared.Physics
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool AddOrUpdate(T item, Box2? newAABB = null) => Update(item, newAABB) || Add(item, newAABB);
public void AddOrUpdate(T item, Box2? aabb = null)
{
aabb ??= _extractAabb(item);
if (!_nodeLookup.TryGetValue(item, out var proxy))
{
_nodeLookup[item] = HasNaNs(aabb.Value) ? DynamicTree.Proxy.Free : _b2Tree.CreateProxy(aabb.Value, item);
return;
}
private static bool CheckNaNs(in Box2 box)
if (HasNaNs(aabb.Value))
{
if (proxy == DynamicTree.Proxy.Free)
return;
_b2Tree.DestroyProxy(proxy);
_nodeLookup[item] = DynamicTree.Proxy.Free;
return;
}
if (proxy == DynamicTree.Proxy.Free)
_nodeLookup[item] = _b2Tree.CreateProxy(aabb.Value, item);
else
_b2Tree.MoveProxy(proxy, aabb.Value, Vector2.Zero);
}
private static bool HasNaNs(in Box2 box)
{
return float.IsNaN(box.Left)
|| float.IsNaN(box.Top)