-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mirror: Partial atmos refactor (#312)
## Mirror of PR #22521: [Partial atmos refactor](space-wizards/space-station-14#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>
- Loading branch information
1 parent
c62f777
commit 6e0ffe8
Showing
43 changed files
with
892 additions
and
636 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
using Content.Server.Administration; | ||
using Content.Server.Atmos.Components; | ||
using Content.Server.Atmos.EntitySystems; | ||
using Content.Shared.Administration; | ||
using Content.Shared.Atmos; | ||
using Robust.Shared.Console; | ||
using Robust.Shared.Map; | ||
|
||
namespace Content.Server.Atmos.Commands; | ||
|
||
[AdminCommand(AdminFlags.Admin)] | ||
public sealed class AddMapAtmosCommand : LocalizedCommands | ||
{ | ||
[Dependency] private readonly IEntityManager _entities = default!; | ||
[Dependency] private readonly IMapManager _map = default!; | ||
|
||
private const string _cmd = "cmd-set-map-atmos"; | ||
public override string Command => "setmapatmos"; | ||
public override string Description => Loc.GetString($"{_cmd}-desc"); | ||
public override string Help => Loc.GetString($"{_cmd}-help"); | ||
|
||
public override void Execute(IConsoleShell shell, string argStr, string[] args) | ||
{ | ||
if (args.Length < 2) | ||
{ | ||
shell.WriteLine(Help); | ||
return; | ||
} | ||
|
||
int.TryParse(args[0], out var id); | ||
var map = _map.GetMapEntityId(new MapId(id)); | ||
if (!map.IsValid()) | ||
{ | ||
shell.WriteError(Loc.GetString("cmd-parse-failure-mapid", ("arg", args[0]))); | ||
return; | ||
} | ||
|
||
if (!bool.TryParse(args[1], out var space)) | ||
{ | ||
shell.WriteError(Loc.GetString("cmd-parse-failure-bool", ("arg", args[1]))); | ||
return; | ||
} | ||
|
||
if (space || args.Length < 4) | ||
{ | ||
_entities.RemoveComponent<MapAtmosphereComponent>(map); | ||
shell.WriteLine(Loc.GetString($"{_cmd}-removed", ("map", id))); | ||
return; | ||
} | ||
|
||
if (!float.TryParse(args[2], out var temp)) | ||
{ | ||
shell.WriteError(Loc.GetString("cmd-parse-failure-float", ("arg", args[2]))); | ||
return; | ||
} | ||
|
||
var mix = new GasMixture(Atmospherics.CellVolume) {Temperature = Math.Min(temp, Atmospherics.TCMB)}; | ||
for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++) | ||
{ | ||
if (args.Length == 3 + i) | ||
break; | ||
|
||
if (!float.TryParse(args[3+i], out var moles)) | ||
{ | ||
shell.WriteError(Loc.GetString("cmd-parse-failure-float", ("arg", args[3+i]))); | ||
return; | ||
} | ||
|
||
mix.AdjustMoles(i, moles); | ||
} | ||
|
||
var atmos = _entities.EntitySysManager.GetEntitySystem<AtmosphereSystem>(); | ||
atmos.SetMapAtmosphere(map, space, mix); | ||
shell.WriteLine(Loc.GetString($"{_cmd}-updated", ("map", id))); | ||
} | ||
|
||
public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) | ||
{ | ||
if (args.Length == 1) | ||
return CompletionResult.FromHintOptions(CompletionHelper.MapIds(_entities), Loc.GetString($"{_cmd}-hint-map")); | ||
|
||
if (args.Length == 2) | ||
return CompletionResult.FromHintOptions(new[]{ "false", "true"}, Loc.GetString($"{_cmd}-hint-space")); | ||
|
||
if (!bool.TryParse(args[1], out var space) || space) | ||
return CompletionResult.Empty; | ||
|
||
if (args.Length == 3) | ||
return CompletionResult.FromHint(Loc.GetString($"{_cmd}-hint-temp")); | ||
|
||
var gas = (Gas) args.Length - 4; | ||
return CompletionResult.FromHint(Loc.GetString($"{_cmd}-hint-gas" , ("gas", gas.ToString()))); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.