mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 21:48:58 +03:00
## Mirror of PR #22521: [Partial atmos refactor](https://github.com/space-wizards/space-station-14/pull/22521) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `18a35e7e83b2b71ee84b054d44d9ed5e595dd618` PR opened by <img src="https://avatars.githubusercontent.com/u/60421075?v=4" width="16"/><a href="https://github.com/ElectroJr"> ElectroJr</a> at 2023-12-15 03:45:42 UTC --- PR changed 43 files with 891 additions and 635 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > This PR reworks how some parts of atmos code work. Originally it was just meant to be a performance and bugfix PR, but it has ballooned in scope. I'm not sure about some of my changes largely because I'm not sure if some things were an oversight or an intentional decision for some reason. > > List of changes: > - The `MolesArchived float[]` field is now read-only > - It simply gets zeroed whenever the `GasMixture` is set to null instead of constantly reallocating > - Airtight query information is now cached in `TileAtmosphere` > - This means that it should only iterate over anchored entities once per update. > - Previously an invalidated atmos tile would cause `ProcessRevalidate()` to query airtight entities on the same tile six times by calling a combination of `GridIsTileAirBlocked()`, `NeedsVacuumFixing()`, and `GridIsTileAirBlocked()`. So this should help significantly reduce component lookups & entity enumeration. > - This does change some behaviour. In particular blocked directions are now only updated if the tile was invalidated prior to the current atmos-update, and will only ever be updated once per atmos-update. > - AFAIK this only has an effect if the invalid tile processing is deferred over multiple ticks, and I don't think it should cause any issues? > - Fixes a potential bug, where tiles might not dispose of their excited group if their direction flags changed. > - `MapAtmosphereComponent.Mixture` is now always immutable and no longer nullable > - I'm not sure why the mixture was nullable before? AFAICT the component is meaningless if its null? > - Space "gas" was always immutable, but there was nothing that required planet atmospheres to be immutable. Requiring that it be immutable gets rid of the constant gas mixture cloning. > - I don't know if there was a reason for why they weren't immutable to begin with. > - Fixes lungs removing too much air from a gas mixture, resulting in negative moles. > - `GasMixture.Moles` is now `[Access]` restricted to the atmosphere system. > - This is to prevent people from improperly modifying the gas mixtures (e.g., lungs), or accidentally modifying immutable mixtures. > - Fixes an issue where non-grid atmosphere tiles would fail to update their adjacent tiles, resulting in null reference exception spam > - Fixes #21732 > - Fixes #21210 (probably) > - Disconnected atmosphere tiles, i.e., tiles that aren't on or adjacent to a grid tile, will now get removed from the tile set. Previously the tile set would just always increase, with tiles never getting removed. > - Removes various redundant component and tile-definition queries. > - Removes some method events in favour of just using methods. > - Map-exposded tiles now get updated when a map's atmosphere changes (or the grid moves across maps). > - Adds a `setmapatmos` command for adding map-wide atmospheres. > - Fixed (non-planet) map atmospheres rendering over grids. > > ## Media > > This PR also includes changes to the atmos debug overlay, though I've also split that off into a separate PR to make reviewing easier (#22520). > > Below is a video showing that atmos still seems to work, and that trimming of disconnected tiles works: > > https://github.com/space-wizards/space-station-14/assets/60421075/4da46992-19e6-4354-8ecd-3cd67be4d0ed > > For comparison, here is a video showing how current master works (disconnected tiles never get removed): > > https://github.com/space-wizards/space-station-14/assets/60421075/54590777-e11c-41dc-b49d-fd7e53bfeed7 > > 🆑 > - fix: Fixed a bug where partially airtight entities (e.g., thin windows or doors) could let air leak out into space. > </details> Co-authored-by: SimpleStation14 <Unknown>
154 lines
4.7 KiB
C#
154 lines
4.7 KiB
C#
using Content.Client.Actions;
|
|
using Content.Shared.Actions;
|
|
using Content.Shared.Mapping;
|
|
using Content.Shared.Maps;
|
|
using Robust.Client.Placement;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Utility;
|
|
using static Robust.Shared.Utility.SpriteSpecifier;
|
|
|
|
namespace Content.Client.Mapping;
|
|
|
|
public sealed partial class MappingSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly IPlacementManager _placementMan = default!;
|
|
[Dependency] private readonly ITileDefinitionManager _tileMan = default!;
|
|
[Dependency] private readonly ActionsSystem _actionsSystem = default!;
|
|
[Dependency] private readonly MetaDataSystem _metaData = default!;
|
|
|
|
/// <summary>
|
|
/// The icon to use for space tiles.
|
|
/// </summary>
|
|
private readonly SpriteSpecifier _spaceIcon = new Texture(new ("Tiles/cropped_parallax.png"));
|
|
|
|
/// <summary>
|
|
/// The icon to use for entity-eraser.
|
|
/// </summary>
|
|
private readonly SpriteSpecifier _deleteIcon = new Texture(new ("Interface/VerbIcons/delete.svg.192dpi.png"));
|
|
|
|
public string DefaultMappingActions = "/mapping_actions.yml";
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<FillActionSlotEvent>(OnFillActionSlot);
|
|
SubscribeLocalEvent<StartPlacementActionEvent>(OnStartPlacementAction);
|
|
}
|
|
|
|
public void LoadMappingActions()
|
|
{
|
|
_actionsSystem.LoadActionAssignments(DefaultMappingActions, false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// This checks if the placement manager is currently active, and attempts to copy the placement information for
|
|
/// some entity or tile into an action. This is somewhat janky, but it seem to work well enough. Though I'd
|
|
/// prefer if it were to function more like DecalPlacementSystem.
|
|
/// </summary>
|
|
private void OnFillActionSlot(FillActionSlotEvent ev)
|
|
{
|
|
if (!_placementMan.IsActive)
|
|
return;
|
|
|
|
if (ev.Action != null)
|
|
return;
|
|
|
|
var actionEvent = new StartPlacementActionEvent();
|
|
ITileDefinition? tileDef = null;
|
|
|
|
if (_placementMan.CurrentPermission != null)
|
|
{
|
|
actionEvent.EntityType = _placementMan.CurrentPermission.EntityType;
|
|
actionEvent.PlacementOption = _placementMan.CurrentPermission.PlacementOption;
|
|
|
|
if (_placementMan.CurrentPermission.IsTile)
|
|
{
|
|
tileDef = _tileMan[_placementMan.CurrentPermission.TileType];
|
|
actionEvent.TileId = tileDef.ID;
|
|
}
|
|
}
|
|
else if (_placementMan.Eraser)
|
|
{
|
|
actionEvent.Eraser = true;
|
|
}
|
|
else
|
|
return;
|
|
|
|
InstantActionComponent action;
|
|
string name;
|
|
|
|
if (tileDef != null)
|
|
{
|
|
if (tileDef is not ContentTileDefinition contentTileDef)
|
|
return;
|
|
|
|
var tileIcon = contentTileDef.MapAtmosphere
|
|
? _spaceIcon
|
|
: new Texture(contentTileDef.Sprite!.Value);
|
|
|
|
action = new InstantActionComponent
|
|
{
|
|
ClientExclusive = true,
|
|
CheckCanInteract = false,
|
|
Event = actionEvent,
|
|
Icon = tileIcon
|
|
};
|
|
|
|
name = Loc.GetString(tileDef.Name);
|
|
}
|
|
else if (actionEvent.Eraser)
|
|
{
|
|
action = new InstantActionComponent
|
|
{
|
|
ClientExclusive = true,
|
|
CheckCanInteract = false,
|
|
Event = actionEvent,
|
|
Icon = _deleteIcon,
|
|
};
|
|
|
|
name = Loc.GetString("action-name-mapping-erase");
|
|
}
|
|
else
|
|
{
|
|
if (string.IsNullOrWhiteSpace(actionEvent.EntityType))
|
|
return;
|
|
|
|
action = new InstantActionComponent
|
|
{
|
|
ClientExclusive = true,
|
|
CheckCanInteract = false,
|
|
Event = actionEvent,
|
|
Icon = new EntityPrototype(actionEvent.EntityType),
|
|
};
|
|
|
|
name = actionEvent.EntityType;
|
|
}
|
|
|
|
var actionId = Spawn(null);
|
|
AddComp<Component>(actionId, action);
|
|
_metaData.SetEntityName(actionId, name);
|
|
|
|
ev.Action = actionId;
|
|
}
|
|
|
|
private void OnStartPlacementAction(StartPlacementActionEvent args)
|
|
{
|
|
if (args.Handled)
|
|
return;
|
|
|
|
args.Handled = true;
|
|
|
|
_placementMan.BeginPlacing(new()
|
|
{
|
|
EntityType = args.EntityType,
|
|
IsTile = args.TileId != null,
|
|
TileType = args.TileId != null ? _tileMan[args.TileId].TileId : (ushort) 0,
|
|
PlacementOption = args.PlacementOption,
|
|
});
|
|
|
|
if (_placementMan.Eraser != args.Eraser)
|
|
_placementMan.ToggleEraser();
|
|
}
|
|
}
|