Fix displacement map rendering in UI (#38042)

Fix displacement map rendering

918709c changed the way humans work to completely remove the stencil mask thing for clothing cutouts, in favor of displacement maps. Except it didn't actually remove the stencil parameters from the shader prototype, so this caused the shader to render incorrectly in SpriteView instances.

I introduced a new DisplacedDraw shader that doesn't have the stencil in use, as removing the old one would probably be a more annoying breaking change.

Fixes #37629

Author: PJB3005

Content.Client/Holopad/HolopadSystem.cs

@@ -27,6 +27,7 @@ public sealed class HolopadSystem : SharedHolopadSystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
 
     public override void Initialize()
     {
@@ -72,26 +73,25 @@ private void UpdateHologramSprite(EntityUid hologram, EntityUid? target)
             return;
 
         // Remove all sprite layers
-        for (int i = hologramSprite.AllLayers.Count() - 1; i >= 0; i--)
-            hologramSprite.RemoveLayer(i);
+        for (var i = hologramSprite.AllLayers.Count() - 1; i >= 0; i--)
+            _sprite.RemoveLayer((hologram, hologramSprite), i);
 
         if (TryComp<SpriteComponent>(target, out var targetSprite))
         {
             // Use the target's holographic avatar (if available)
             if (TryComp<HolographicAvatarComponent>(target, out var targetAvatar) &&
                 targetAvatar.LayerData != null)
             {
-                for (int i = 0; i < targetAvatar.LayerData.Length; i++)
+                for (var i = 0; i < targetAvatar.LayerData.Length; i++)
                 {
-                    var layer = targetAvatar.LayerData[i];
-                    hologramSprite.AddLayer(targetAvatar.LayerData[i], i);
+                    _sprite.AddLayer((hologram, hologramSprite), targetAvatar.LayerData[i], i);
                 }
             }
 
             // Otherwise copy the target's current physical appearance
             else
             {
-                hologramSprite.CopyFrom(targetSprite);
+                _sprite.CopySprite((target.Value, targetSprite), (hologram, hologramSprite));
             }
         }
 
@@ -101,25 +101,27 @@ private void UpdateHologramSprite(EntityUid hologram, EntityUid? target)
             if (string.IsNullOrEmpty(holopadhologram.RsiPath) || string.IsNullOrEmpty(holopadhologram.RsiState))
                 return;
 
-            var layer = new PrototypeLayerData();
-            layer.RsiPath = holopadhologram.RsiPath;
-            layer.State = holopadhologram.RsiState;
+            var layer = new PrototypeLayerData
+            {
+                RsiPath = holopadhologram.RsiPath,
+                State = holopadhologram.RsiState
+            };
 
-            hologramSprite.AddLayer(layer);
+            _sprite.AddLayer((hologram, hologramSprite), layer, null);
         }
 
         // Override specific values
-        hologramSprite.Color = Color.White;
-        hologramSprite.Offset = holopadhologram.Offset;
-        hologramSprite.DrawDepth = (int)DrawDepth.Mobs;
+        _sprite.SetColor((hologram, hologramSprite), Color.White);
+        _sprite.SetOffset((hologram, hologramSprite), holopadhologram.Offset);
+        _sprite.SetDrawDepth((hologram, hologramSprite), (int)DrawDepth.Mobs);
         hologramSprite.NoRotation = true;
         hologramSprite.DirectionOverride = Direction.South;
         hologramSprite.EnableDirectionOverride = true;
 
         // Remove shading from all layers (except displacement maps)
-        for (int i = 0; i < hologramSprite.AllLayers.Count(); i++)
+        for (var i = 0; i < hologramSprite.AllLayers.Count(); i++)
         {
-            if (hologramSprite.TryGetLayer(i, out var layer) && layer.ShaderPrototype != "DisplacedStencilDraw")
+            if (_sprite.TryGetLayer((hologram, hologramSprite), i, out var layer, false) && layer.ShaderPrototype != "DisplacedDraw")
                 hologramSprite.LayerSetShader(i, "unshaded");
         }
 

Content.Shared/DisplacementMap/DisplacementData.cs

@@ -15,5 +15,5 @@ public sealed partial class DisplacementData
     public Dictionary<int, PrototypeLayerData> SizeMaps = new();
 
     [DataField]
-    public string? ShaderOverride = "DisplacedStencilDraw";
+    public string? ShaderOverride = "DisplacedDraw";
 }

Resources/Prototypes/Shaders/displacement.yml

@@ -13,3 +13,10 @@
     func: NotEqual
   params:
     displacementSize: 127
+
+- type: shader
+  id: DisplacedDraw
+  kind: source
+  path: "/Textures/Shaders/displacement.swsl"
+  params:
+    displacementSize: 127