HRiggs/Performance-Fish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 1.6 support and fix prepatch regressions

Browse Source
This commit is contained in:
localavaster
2026-04-07 03:56:12 -06:00
parent a99972001e
commit c020968638
32 changed files with 609 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/PerformanceFish/Utility/CellIndexExtensions.cs
+18 -5
View File
@@ -12,7 +12,7 @@ public static class CellIndexExtensions
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int CellToIndex(this in IntVec3 cell, CellIndices cellIndices)
=> cell.CellToIndex(cellIndices.mapSizeX);
=> cell.CellToIndex(GetMapSizeX(cellIndices));
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int CellToIndex(this in IntVec3 cell, int mapSizeX) => (cell.z * mapSizeX) + cell.x;
@@ -22,7 +22,7 @@ public static class CellIndexExtensions
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int CellToIndex(this IntVec2 cell, CellIndices cellIndices)
=> cell.CellToIndex(cellIndices.mapSizeX);
=> cell.CellToIndex(GetMapSizeX(cellIndices));
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int CellToIndex(this IntVec2 cell, int mapSizeX) => (cell.z * mapSizeX) + cell.x;
@@ -31,7 +31,7 @@ public static class CellIndexExtensions
public static int CellToIndex(int x, int z, Map map) => CellToIndex(x, z, map.cellIndices);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int CellToIndex(int x, int z, CellIndices cellIndices) => CellToIndex(x, z, cellIndices.mapSizeX);
public static int CellToIndex(int x, int z, CellIndices cellIndices) => CellToIndex(x, z, GetMapSizeX(cellIndices));
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int CellToIndex(int x, int z, int mapSizeX) => (z * mapSizeX) + x;
@@ -41,11 +41,24 @@ public static class CellIndexExtensions
=> thingGrid.thingGrid[cellIndex.Value];
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool IsFogged(this FogGrid fogGrid, CellIndex cellIndex) => fogGrid.fogGrid[cellIndex.Value];
public static bool IsFogged(this FogGrid fogGrid, CellIndex cellIndex)
#if V1_6
=> fogGrid.fogGrid.IsSet(cellIndex.Value);
#else
=> fogGrid.fogGrid[cellIndex.Value];
#endif
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static float GetDepth(this SnowGrid snowGrid, CellIndex cellIndex) => snowGrid.depthGrid[cellIndex.Value];
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static float GetDepth(this SnowGrid snowGrid, int cellIndex) => snowGrid.depthGrid[cellIndex];
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static int GetMapSizeX(CellIndices cellIndices)
#if V1_6
=> cellIndices.SizeX;
#else
=> cellIndices.mapSizeX;
#endif
}
Source/PerformanceFish/Utility/MiscExtensions.cs
+10 -2
View File
@@ -97,7 +97,7 @@ public static class MiscExtensions
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int SizeX(this Map map) => map.cellIndices.mapSizeX;
public static int SizeX(this Map map) => map.Size.x;
public static Map? TryGetMapHeld(this Thing thing)
{
@@ -134,10 +134,18 @@ public static class MiscExtensions
public static void InvokeWhenCellIndicesReady(this Map map, Action<Map> action)
{
#if V1_6
if (map.cellIndices.NumGridCells > 0)
#else
if (map.cellIndices != null)
#endif
{
action(map);
}
else
{
map.Events().ComponentsConstructed += action;
}
}
public static void AddLetterSilently(this LetterStack letterStack, Letter letter, Color color, bool playSound = false,
@@ -164,4 +172,4 @@ public static class MiscExtensions
letterStack.letters.Add(letter);
letter.Received();
}
}
}