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

Fix cross-map decal rendering (#10548)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-15 05:25:33 +12:00
committed by GitHub
parent 340a3724a2
commit dc8f6d6bac
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ namespace Content.Client.Decals
private readonly SharedTransformSystem _transform; private readonly SharedTransformSystem _transform;
private readonly SpriteSystem _sprites; private readonly SpriteSystem _sprites;
private readonly IEntityManager _entManager; private readonly IEntityManager _entManager;
private readonly IMapManager _mapManager;
private readonly IPrototypeManager _prototypeManager; private readonly IPrototypeManager _prototypeManager;
public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities; public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
@@ -26,14 +25,12 @@ namespace Content.Client.Decals
SharedTransformSystem transforms, SharedTransformSystem transforms,
SpriteSystem sprites, SpriteSystem sprites,
IEntityManager entManager, IEntityManager entManager,
IMapManager mapManager,
IPrototypeManager prototypeManager) IPrototypeManager prototypeManager)
{ {
_decals = decals; _decals = decals;
_transform = transforms; _transform = transforms;
_sprites = sprites; _sprites = sprites;
_entManager = entManager; _entManager = entManager;
_mapManager = mapManager;
_prototypeManager = prototypeManager; _prototypeManager = prototypeManager;
} }
@@ -47,7 +44,14 @@ namespace Content.Client.Decals
{ {
if (zIndexDictionary.Count == 0) continue; if (zIndexDictionary.Count == 0) continue;
var xform = xformQuery.GetComponent(gridId); if (!xformQuery.TryGetComponent(gridId, out var xform))
{
Logger.Error($"Tried to draw decals on a non-existent grid. GridUid: {gridId}");
continue;
}
if (xform.MapID != args.MapId)
continue;
handle.SetTransform(_transform.GetWorldMatrix(xform, xformQuery)); handle.SetTransform(_transform.GetWorldMatrix(xform, xformQuery));

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

@@ -19,7 +19,7 @@ namespace Content.Client.Decals
{ {
base.Initialize(); base.Initialize();
_overlay = new DecalOverlay(this, _transforms, _sprites, EntityManager, MapManager, PrototypeManager); _overlay = new DecalOverlay(this, _transforms, _sprites, EntityManager, PrototypeManager);
_overlayManager.AddOverlay(_overlay); _overlayManager.AddOverlay(_overlay);
SubscribeNetworkEvent<DecalChunkUpdateEvent>(OnChunkUpdate); SubscribeNetworkEvent<DecalChunkUpdateEvent>(OnChunkUpdate);