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

Update tiles to modern standards (#10436)

Browse Source
This commit is contained in:
metalgearsloth
2022-08-10 17:05:40 +10:00
committed by GitHub
parent dfec3a10a5
commit a549a85e81
80 changed files with 2627 additions and 2615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.MapRenderer/Painters/TilePainter.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Shared.Maps;
using Robust.Client.Graphics;
using Robust.Client.ResourceManagement;
using Robust.Shared.Map;
@@ -41,10 +42,15 @@ namespace Content.MapRenderer.Painters
grid.GetAllTiles().AsParallel().ForAll(tile =>
{
var sprite = _sTileDefinitionManager[tile.Tile.TypeId].Sprite;
if (sprite == null)
return;
var x = (int) (tile.X + xOffset);
var y = (int) (tile.Y + yOffset);
var sprite = _sTileDefinitionManager[tile.Tile.TypeId].SpriteName;
var image = images[sprite][tile.Tile.Variant];
var path = sprite.ToString();
var image = images[path][tile.Tile.Variant];
gridCanvas.Mutate(o => o.DrawImage(image, new Point(x * tileSize, y * tileSize), 1));
@@ -66,15 +72,15 @@ namespace Content.MapRenderer.Painters
foreach (var definition in tileDefinitionManager)
{
var sprite = definition.SpriteName;
images[sprite] = new List<Image>(definition.Variants);
var sprite = definition.Sprite;
if (string.IsNullOrEmpty(sprite))
{
if (sprite == null)
continue;
}
using var stream = resourceCache.ContentFileRead($"{TilesPath}{sprite}.png");
var path = sprite.ToString();
images[path] = new List<Image>(definition.Variants);
using var stream = resourceCache.ContentFileRead(path);
Image tileSheet = Image.Load<Rgba32>(stream);
if (tileSheet.Width != tileSize * definition.Variants || tileSheet.Height != tileSize)
@@ -85,7 +91,7 @@ namespace Content.MapRenderer.Painters
for (var i = 0; i < definition.Variants; i++)
{
var tileImage = tileSheet.Clone(o => o.Crop(new Rectangle(tileSize * i, 0, 32, 32)));
images[sprite].Add(tileImage);
images[path].Add(tileImage);
}
}