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

Fix map renderer error when painting decals with paths that start with /Textures (#16822)

Browse Source
This commit is contained in:
DrSmugleaf
2023-05-25 18:46:27 -07:00
committed by GitHub
parent 9f3f3b4998
commit ca8adf10aa
3 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.MapRenderer/Painters/DecalPainter.cs
View File

@@ -28,7 +28,7 @@ public sealed class DecalPainter
_sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
}
public void Run(Image canvas, List<DecalData> decals)
public void Run(Image canvas, Span<DecalData> decals)
{
var stopwatch = new Stopwatch();
stopwatch.Start();
@@ -48,7 +48,7 @@ public sealed class DecalPainter
Run(canvas, decal);
}
Console.WriteLine($"{nameof(DecalPainter)} painted {decals.Count} decals in {(int) stopwatch.Elapsed.TotalMilliseconds} ms");
Console.WriteLine($"{nameof(DecalPainter)} painted {decals.Length} decals in {(int) stopwatch.Elapsed.TotalMilliseconds} ms");
}
private void Run(Image canvas, DecalData data)
@@ -67,7 +67,13 @@ public sealed class DecalPainter
}
else if (sprite is SpriteSpecifier.Rsi rsi)
{
stream = _cResourceCache.ContentFileRead($"/Textures/{rsi.RsiPath}/{rsi.RsiState}.png");
var path = $"{rsi.RsiPath}/{rsi.RsiState}.png";
if (!path.StartsWith("/Textures"))
{
path = $"/Textures/{path}";
}
stream = _cResourceCache.ContentFileRead(path);
}
else
{