tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sloth's subfloor vismask adventure (#35347)

Browse Source 
* Add a subfloor vismask

Significantly cuts down on sent entity count.

* More optimisations

* Fix command

* Fixes

* namespace cleanup

* Review

* Vismasks

* Content update

* Bandaid

* awewa

* Revert these

* reh

* Update Content.Shared/SubFloor/TrayScannerComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
metalgearsloth
2025-03-21 00:57:04 +11:00
committed by GitHub
parent 2e7f01b99e
commit 9292e3a43c
22 changed files with 277 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared.Audio;
using Content.Shared.Explosion;
using Content.Shared.Eye;
using Content.Shared.Interaction.Events;
using Content.Shared.Maps;
using JetBrains.Annotations;
@@ -19,11 +20,16 @@ namespace Content.Shared.SubFloor
[Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
[Dependency] protected readonly SharedMapSystem Map = default!;
[Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
[Dependency] private readonly SharedVisibilitySystem _visibility = default!;
private EntityQuery<SubFloorHideComponent> _hideQuery;
public override void Initialize()
{
base.Initialize();
_hideQuery = GetEntityQuery<SubFloorHideComponent>();
SubscribeLocalEvent<TileChangedEvent>(OnTileChanged);
SubscribeLocalEvent<SubFloorHideComponent, ComponentStartup>(OnSubFloorStarted);
SubscribeLocalEvent<SubFloorHideComponent, ComponentShutdown>(OnSubFloorTerminating);
@@ -67,7 +73,7 @@ namespace Content.Shared.SubFloor
return;
// Regardless of whether we're on a subfloor or not, unhide.
component.IsUnderCover = false;
SetUnderCover((uid, component), false);
UpdateAppearance(uid, component);
}
@@ -80,7 +86,7 @@ namespace Content.Shared.SubFloor
}
else if (component.IsUnderCover)
{
component.IsUnderCover = false;
SetUnderCover((uid, component), false);
UpdateAppearance(uid, component);
}
}
@@ -93,7 +99,7 @@ namespace Content.Shared.SubFloor
if (args.NewTile.Tile.IsEmpty)
return; // Anything that was here will be unanchored anyways.
UpdateTile(args.NewTile.GridUid, Comp<MapGridComponent>(args.NewTile.GridUid), args.NewTile.GridIndices);
UpdateTile(args.NewTile.GridUid, args.Entity.Comp, args.NewTile.GridIndices);
}
/// <summary>
@@ -105,13 +111,24 @@ namespace Content.Shared.SubFloor
return;
if (xform.Anchored && TryComp<MapGridComponent>(xform.GridUid, out var grid))
component.IsUnderCover = HasFloorCover(xform.GridUid.Value, grid, Map.TileIndicesFor(xform.GridUid.Value, grid, xform.Coordinates));
SetUnderCover((uid, component), HasFloorCover(xform.GridUid.Value, grid, Map.TileIndicesFor(xform.GridUid.Value, grid, xform.Coordinates)));
else
component.IsUnderCover = false;
SetUnderCover((uid, component), false);
UpdateAppearance(uid, component);
}
private void SetUnderCover(Entity<SubFloorHideComponent> entity, bool value)
{
// If it's not undercover or it always has visible layers then normal visibility.
_visibility.SetLayer(entity.Owner, value && entity.Comp.VisibleLayers.Count == 0 ? (ushort) VisibilityFlags.Subfloor : (ushort) VisibilityFlags.Normal);
if (entity.Comp.IsUnderCover == value)
return;
entity.Comp.IsUnderCover = value;
}
public bool HasFloorCover(EntityUid gridUid, MapGridComponent grid, Vector2i position)
{
// TODO Redo this function. Currently wires on an asteroid are always "below the floor"
@@ -125,13 +142,13 @@ namespace Content.Shared.SubFloor
foreach (var uid in Map.GetAnchoredEntities(gridUid, grid, position))
{
if (!TryComp(uid, out SubFloorHideComponent? hideComp))
if (!_hideQuery.TryComp(uid, out var hideComp))
continue;
if (hideComp.IsUnderCover == covered)
continue;
hideComp.IsUnderCover = covered;
SetUnderCover((uid, hideComp), covered);
UpdateAppearance(uid, hideComp);
}
}
@@ -154,6 +171,12 @@ namespace Content.Shared.SubFloor
Appearance.SetData(uid, SubFloorVisuals.Covered, hideComp.IsUnderCover, appearance);
}
}
[Serializable, NetSerializable]
protected sealed class ShowSubfloorRequestEvent : EntityEventArgs
{
public bool Value;
}
}
[Serializable, NetSerializable]