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

Remove Explicit GridId References (#8315)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Decals/DecalOverlay.cs
View File

@@ -47,8 +47,7 @@ namespace Content.Client.Decals
{
if (zIndexDictionary.Count == 0) continue;
var gridUid = _mapManager.GetGridEuid(gridId);
var xform = xformQuery.GetComponent(gridUid);
var xform = xformQuery.GetComponent(gridId);
handle.SetTransform(_transform.GetWorldMatrix(xform, xformQuery));

10
Content.Client/Decals/DecalSystem.cs
View File

@@ -1,8 +1,6 @@
using Content.Shared.Decals;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Shared.Map;
using Robust.Shared.Utility;
namespace Content.Client.Decals
{
@@ -13,8 +11,8 @@ namespace Content.Client.Decals
[Dependency] private readonly SpriteSystem _sprites = default!;
private DecalOverlay _overlay = default!;
public Dictionary<GridId, SortedDictionary<int, SortedDictionary<uint, Decal>>> DecalRenderIndex = new();
private Dictionary<GridId, Dictionary<uint, int>> DecalZIndexIndex = new();
public Dictionary<EntityUid, SortedDictionary<int, SortedDictionary<uint, Decal>>> DecalRenderIndex = new();
private Dictionary<EntityUid, Dictionary<uint, int>> DecalZIndexIndex = new();
public override void Initialize()
{
@@ -58,13 +56,13 @@ namespace Content.Client.Decals
_overlayManager.RemoveOverlay(_overlay);
}
protected override bool RemoveDecalHook(GridId gridId, uint uid)
protected override bool RemoveDecalHook(EntityUid gridId, uint uid)
{
RemoveDecalFromRenderIndex(gridId, uid);
return base.RemoveDecalHook(gridId, uid);
}
private void RemoveDecalFromRenderIndex(GridId gridId, uint uid)
private void RemoveDecalFromRenderIndex(EntityUid gridId, uint uid)
{
var zIndex = DecalZIndexIndex[gridId][uid];