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

ECS Atmos Part 2: Moves a lot of Gas Mixture methods to AtmosphereSystem. (#4218)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-06-23 11:35:30 +02:00
committed by GitHub
parent e16c23a747
commit 263c9ef974
34 changed files with 461 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/NodeContainer/NodeGroups/IPipeNet.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Server.NodeContainer.NodeGroups
public void Update()
{
Air.React(this);
EntitySystem.Get<AtmosphereSystem>().React(Air, this);
}
protected override void OnAddNode(Node node)
@@ -74,7 +74,7 @@ namespace Content.Server.NodeContainer.NodeGroups
if (newGroup is not IPipeNet newPipeNet)
return;
newPipeNet.Air.Merge(Air);
EntitySystem.Get<AtmosphereSystem>().Merge(newPipeNet.Air, Air);
}
protected override void AfterRemake(IEnumerable<INodeGroup> newGroups)
@@ -82,6 +82,7 @@ namespace Content.Server.NodeContainer.NodeGroups
RemoveFromGridAtmos();
var buffer = new GasMixture(Air.Volume) {Temperature = Air.Temperature};
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
foreach (var newGroup in newGroups)
{
@@ -91,9 +92,9 @@ namespace Content.Server.NodeContainer.NodeGroups
var newAir = newPipeNet.Air;
buffer.Clear();
buffer.Merge(Air);
atmosphereSystem.Merge(buffer, Air);
buffer.Multiply(MathF.Min(newAir.Volume / Air.Volume, 1f));
newAir.Merge(buffer);
atmosphereSystem.Merge(newAir, buffer);
}
}