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

Replace GridEntityId with Owner (#12743)

Browse Source
This commit is contained in:
metalgearsloth
2022-12-12 14:59:02 +11:00
committed by GitHub
parent 4cbf78646a
commit 3b3963083b
75 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,19 +49,19 @@ namespace Content.MapRenderer.Painters
var stopwatch = new Stopwatch();
stopwatch.Start();
if (!_entities.TryGetValue(grid.GridEntityId, out var entities))
if (!_entities.TryGetValue(grid.Owner, out var entities))
{
Console.WriteLine($"No entities found on grid {grid.GridEntityId}");
Console.WriteLine($"No entities found on grid {grid.Owner}");
return;
}
// Decals are always painted before entities, and are also optional.
if (_decals.TryGetValue(grid.GridEntityId, out var decals))
if (_decals.TryGetValue(grid.Owner, out var decals))
_decalPainter.Run(gridCanvas, decals);
_entityPainter.Run(gridCanvas, entities);
Console.WriteLine($"{nameof(GridPainter)} painted grid {grid.GridEntityId} in {(int) stopwatch.Elapsed.TotalMilliseconds} ms");
Console.WriteLine($"{nameof(GridPainter)} painted grid {grid.Owner} in {(int) stopwatch.Elapsed.TotalMilliseconds} ms");
}
private ConcurrentDictionary<EntityUid, List<EntityData>> GetEntities()
@@ -120,14 +120,14 @@ namespace Content.MapRenderer.Painters
// actually has the correct z-indices for decals for some reason when the server doesn't,
// BUT can't do that yet because the client hasn't actually received everything yet
// for some reason decal moment i guess.
if (_sEntityManager.TryGetComponent<DecalGridComponent>(grid.GridEntityId, out var comp))
if (_sEntityManager.TryGetComponent<DecalGridComponent>(grid.Owner, out var comp))
{
foreach (var (_, list) in comp.ChunkCollection.ChunkCollection)
{
foreach (var (_, decal) in list)
{
var (x, y) = TransformLocalPosition(decal.Coordinates, grid);
decals.GetOrNew(grid.GridEntityId).Add(new DecalData(decal, x, y));
decals.GetOrNew(grid.Owner).Add(new DecalData(decal, x, y));
}
}
}

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

@@ -77,7 +77,7 @@ namespace Content.MapRenderer.Painters
foreach (var grid in grids)
{
var gridXform = xformQuery.GetComponent(grid.GridEntityId);
var gridXform = xformQuery.GetComponent(grid.Owner);
gridXform.WorldRotation = Angle.Zero;
}
});
@@ -90,7 +90,7 @@ namespace Content.MapRenderer.Painters
// Skip empty grids
if (grid.LocalAABB.IsEmpty())
{
Console.WriteLine($"Warning: Grid {grid.GridEntityId} was empty. Skipping image rendering.");
Console.WriteLine($"Warning: Grid {grid.Owner} was empty. Skipping image rendering.");
continue;
}
@@ -119,8 +119,8 @@ namespace Content.MapRenderer.Painters
var renderedImage = new RenderedGridImage<Rgba32>(gridCanvas)
{
GridUid = grid.GridEntityId,
Offset = xformQuery.GetComponent(grid.GridEntityId).WorldPosition
GridUid = grid.Owner,
Offset = xformQuery.GetComponent(grid.Owner).WorldPosition
};
yield return renderedImage;

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

@@ -57,7 +57,7 @@ namespace Content.MapRenderer.Painters
i++;
});
Console.WriteLine($"{nameof(TilePainter)} painted {i} tiles on grid {grid.GridEntityId} in {(int) stopwatch.Elapsed.TotalMilliseconds} ms");
Console.WriteLine($"{nameof(TilePainter)} painted {i} tiles on grid {grid.Owner} in {(int) stopwatch.Elapsed.TotalMilliseconds} ms");
}
private Dictionary<string, List<Image>> GetTileImages(