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

Fix warnings in MapRenderer module (#17865)

Browse Source
This commit is contained in:
TemporalOroboros
2023-08-07 18:07:08 -07:00
committed by GitHub
parent 75b349ab97
commit 7cdc7ab972
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.MapRenderer/Painters/EntityPainter.cs
View File

@@ -105,10 +105,10 @@ public sealed class EntityPainter
return (targetX * rsi.Size.X, targetY * rsi.Size.Y, rsi.Size.X, rsi.Size.Y);
}
var dir = entity.Sprite.GetLayerDirectionCount(layer) switch
var dir = entity.Sprite.GetLayerDirectionCount(layer) switch
{
0 => 0,
_ => (int)layer.EffectiveDirection(worldRotation)
_ => (int) layer.EffectiveDirection(worldRotation)
};
var (x, y, width, height) = GetRsiFrame(rsi, image, entity, layer, dir);
@@ -133,8 +133,8 @@ public sealed class EntityPainter
.Resize(imgX, imgY)
.Flip(FlipMode.Vertical));
var pointX = (int) entity.X - (imgX / 2) + EyeManager.PixelsPerMeter / 2;
var pointY = (int) entity.Y - (imgY / 2) + EyeManager.PixelsPerMeter / 2;
var pointX = (int) entity.X - imgX / 2 + EyeManager.PixelsPerMeter / 2;
var pointY = (int) entity.Y - imgY / 2 + EyeManager.PixelsPerMeter / 2;
canvas.Mutate(o => o.DrawImage(image, new Point(pointX, pointY), 1));
}
}

2
Content.MapRenderer/Painters/GridPainter.cs
View File

@@ -134,7 +134,7 @@ namespace Content.MapRenderer.Painters
return decals;
}
private (float x, float y) TransformLocalPosition(Vector2 position, MapGridComponent grid)
private static (float x, float y) TransformLocalPosition(Vector2 position, MapGridComponent grid)
{
var xOffset = (int) -grid.LocalAABB.Left;
var yOffset = (int) -grid.LocalAABB.Bottom;

26
Content.MapRenderer/Painters/MapPainter.cs
View File

@@ -21,7 +21,7 @@ namespace Content.MapRenderer.Painters
{
public sealed class MapPainter
{
public async IAsyncEnumerable<RenderedGridImage<Rgba32>> Paint(string map)
public static async IAsyncEnumerable<RenderedGridImage<Rgba32>> Paint(string map)
{
var stopwatch = new Stopwatch();
stopwatch.Start();
@@ -78,9 +78,9 @@ namespace Content.MapRenderer.Painters
var mapId = sMapManager.GetAllMapIds().Last();
grids = sMapManager.GetAllMapGrids(mapId).Select(o => (o.Owner, o)).ToArray();
foreach (var grid in grids)
foreach (var (uid, _) in grids)
{
var gridXform = xformQuery.GetComponent(grid.Uid);
var gridXform = xformQuery.GetComponent(uid);
xformSystem.SetWorldRotation(gridXform, Angle.Zero);
}
});
@@ -88,19 +88,19 @@ namespace Content.MapRenderer.Painters
await PoolManager.RunTicksSync(pairTracker.Pair, 10);
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
foreach (var grid in grids)
foreach (var (uid, grid) in grids)
{
// Skip empty grids
if (grid.Grid.LocalAABB.IsEmpty())
if (grid.LocalAABB.IsEmpty())
{
Console.WriteLine($"Warning: Grid {grid.Uid} was empty. Skipping image rendering.");
Console.WriteLine($"Warning: Grid {uid} was empty. Skipping image rendering.");
continue;
}
var tileXSize = grid.Grid.TileSize * TilePainter.TileImageSize;
var tileYSize = grid.Grid.TileSize * TilePainter.TileImageSize;
var tileXSize = grid.TileSize * TilePainter.TileImageSize;
var tileYSize = grid.TileSize * TilePainter.TileImageSize;
var bounds = grid.Grid.LocalAABB;
var bounds = grid.LocalAABB;
var left = bounds.Left;
var right = bounds.Right;
@@ -114,16 +114,16 @@ namespace Content.MapRenderer.Painters
await server.WaitPost(() =>
{
tilePainter.Run(gridCanvas, grid.Uid, grid.Grid);
entityPainter.Run(gridCanvas, grid.Uid, grid.Grid);
tilePainter.Run(gridCanvas, uid, grid);
entityPainter.Run(gridCanvas, uid, grid);
gridCanvas.Mutate(e => e.Flip(FlipMode.Vertical));
});
var renderedImage = new RenderedGridImage<Rgba32>(gridCanvas)
{
GridUid = grid.Uid,
Offset = xformSystem.GetWorldPosition(grid.Uid),
GridUid = uid,
Offset = xformSystem.GetWorldPosition(uid),
};
yield return renderedImage;