Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix decal draw-order (#22953)

Browse Source 
* Fix decal draw-order

Using the new overlayspace ensures they don't draw above grids above them.

* a
This commit is contained in:
metalgearsloth
2023-12-31 03:12:39 +11:00
committed by GitHub
parent ad67a23aa1
commit 9ce847a840
1 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
Content.Client/Decals/Overlays/DecalOverlay.cs
View File

@@ -2,18 +2,17 @@ using Content.Shared.Decals;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Shared.Enums; using Robust.Shared.Enums;
using Robust.Shared.Map;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
namespace Content.Client.Decals.Overlays namespace Content.Client.Decals.Overlays
{ {
public sealed class DecalOverlay : Overlay public sealed class DecalOverlay : GridOverlay
{ {
private readonly SpriteSystem _sprites; private readonly SpriteSystem _sprites;
private readonly IEntityManager _entManager; private readonly IEntityManager _entManager;
private readonly IPrototypeManager _prototypeManager; private readonly IPrototypeManager _prototypeManager;
public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities;
private readonly Dictionary<string, (Texture Texture, bool SnapCardinals)> _cachedTextures = new(64); private readonly Dictionary<string, (Texture Texture, bool SnapCardinals)> _cachedTextures = new(64);
public DecalOverlay( public DecalOverlay(
@@ -28,52 +27,58 @@ namespace Content.Client.Decals.Overlays
protected override void Draw(in OverlayDrawArgs args) protected override void Draw(in OverlayDrawArgs args)
{ {
if (args.MapId == MapId.Nullspace)
return;
var grid = Grid;
if (!_entManager.TryGetComponent(grid, out DecalGridComponent? decalGrid) ||
!_entManager.TryGetComponent(grid, out TransformComponent? xform))
{
return;
}
if (xform.MapID != args.MapId)
return;
// Shouldn't need to clear cached textures unless the prototypes get reloaded. // Shouldn't need to clear cached textures unless the prototypes get reloaded.
var handle = args.WorldHandle; var handle = args.WorldHandle;
var xformSystem = _entManager.System<TransformSystem>(); var xformSystem = _entManager.System<TransformSystem>();
var eyeAngle = args.Viewport.Eye?.Rotation ?? Angle.Zero; var eyeAngle = args.Viewport.Eye?.Rotation ?? Angle.Zero;
var gridQuery = _entManager.AllEntityQueryEnumerator<DecalGridComponent, TransformComponent>(); var zIndexDictionary = decalGrid.DecalRenderIndex;
while (gridQuery.MoveNext(out var decalGrid, out var xform)) if (zIndexDictionary.Count == 0)
return;
var (_, worldRot, worldMatrix) = xformSystem.GetWorldPositionRotationMatrix(xform);
handle.SetTransform(worldMatrix);
foreach (var decals in zIndexDictionary.Values)
{ {
if (xform.MapID != args.MapId) foreach (var decal in decals.Values)
continue;
var zIndexDictionary = decalGrid.DecalRenderIndex;
if (zIndexDictionary.Count == 0)
continue;
var (_, worldRot, worldMatrix) = xformSystem.GetWorldPositionRotationMatrix(xform);
handle.SetTransform(worldMatrix);
foreach (var decals in zIndexDictionary.Values)
{ {
foreach (var decal in decals.Values) if (!_cachedTextures.TryGetValue(decal.Id, out var cache) && _prototypeManager.TryIndex<DecalPrototype>(decal.Id, out var decalProto))
{ {
if (!_cachedTextures.TryGetValue(decal.Id, out var cache) && _prototypeManager.TryIndex<DecalPrototype>(decal.Id, out var decalProto)) cache = (_sprites.Frame0(decalProto.Sprite), decalProto.SnapCardinals);
{ _cachedTextures[decal.Id] = cache;
cache = (_sprites.Frame0(decalProto.Sprite), decalProto.SnapCardinals);
_cachedTextures[decal.Id] = cache;
}
var cardinal = Angle.Zero;
if (cache.SnapCardinals)
{
var worldAngle = eyeAngle + worldRot;
cardinal = worldAngle.GetCardinalDir().ToAngle();
}
var angle = decal.Angle - cardinal;
if (angle.Equals(Angle.Zero))
handle.DrawTexture(cache.Texture, decal.Coordinates, decal.Color);
else
handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
} }
var cardinal = Angle.Zero;
if (cache.SnapCardinals)
{
var worldAngle = eyeAngle + worldRot;
cardinal = worldAngle.GetCardinalDir().ToAngle();
}
var angle = decal.Angle - cardinal;
if (angle.Equals(Angle.Zero))
handle.DrawTexture(cache.Texture, decal.Coordinates, decal.Color);
else
handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
} }
} }