epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an edge case where the wrong sheet may be mapped to a depth sprite.

Browse Source
This commit is contained in:
Paul Chote
2021-07-25 18:11:25 +01:00
committed by teinarss
parent 1f3f489328
commit 24f64ae1a8
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/Graphics/SpriteRenderer.cs
View File

@@ -82,28 +82,32 @@ namespace OpenRA.Graphics
for (; secondarySheetIndex < ns; secondarySheetIndex++) for (; secondarySheetIndex < ns; secondarySheetIndex++)
if (sheets[secondarySheetIndex] == secondarySheet) if (sheets[secondarySheetIndex] == secondarySheet)
break; break;
// If neither sheet has been mapped both index values will be set to ns.
// This is fine if they both reference the same texture, but if they don't
// we must increment the secondary sheet index to the next free sampler.
if (secondarySheetIndex == sheetIndex && secondarySheet != sheet)
secondarySheetIndex++;
} }
// Make sure that we have enough free samplers to map both if needed, otherwise flush // Make sure that we have enough free samplers to map both if needed, otherwise flush
var needSamplers = (sheetIndex == ns ? 1 : 0) + (secondarySheetIndex == ns ? 1 : 0); if (Math.Max(sheetIndex, secondarySheetIndex) >= sheets.Length)
if (ns + needSamplers >= sheets.Length)
{ {
Flush(); Flush();
sheetIndex = 0; sheetIndex = 0;
if (ss != null) secondarySheetIndex = ss != null && ss.SecondarySheet != sheet ? 1 : 0;
secondarySheetIndex = 1;
} }
if (sheetIndex >= ns) if (sheetIndex >= ns)
{ {
sheets[sheetIndex] = sheet; sheets[sheetIndex] = sheet;
ns += 1; ns++;
} }
if (secondarySheetIndex >= ns && ss != null) if (secondarySheetIndex >= ns && ss != null)
{ {
sheets[secondarySheetIndex] = ss.SecondarySheet; sheets[secondarySheetIndex] = ss.SecondarySheet;
ns += 1; ns++;
} }
return new int2(sheetIndex, secondarySheetIndex); return new int2(sheetIndex, secondarySheetIndex);