ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor refactorings in TexAtlas.PackAtlas

This commit is contained in:
YoshiRulz 2021-03-25 19:13:18 +10:00
parent fc30b0bd26
commit 89c1406f5a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/BizHawk.Bizware.BizwareGL/TexAtlas.cs
View File

@ -38,12 +38,13 @@ namespace BizHawk.Bizware.BizwareGL
/// </summary> /// </summary>
public static IReadOnlyList<(Size Size, List<RectItem> Items)> PackAtlas(IReadOnlyCollection<RectItem> items) public static IReadOnlyList<(Size Size, List<RectItem> Items)> PackAtlas(IReadOnlyCollection<RectItem> items)
{ {
List<(Size Size, List<RectItem> Items)> atlases = new(); List<(Size, List<RectItem>)> atlases = new();
// initially, we'll try all the items; none remain // initially, we'll try all the items; none remain
var currentItems = new List<RectItem>(items); var currentItems = new List<RectItem>(items);
var remainItems = new List<RectItem>(); var remainItems = new List<RectItem>();
RETRY1:
RETRY: RETRY:
// this is where the texture size range is determined. // this is where the texture size range is determined.
@ -84,31 +85,19 @@ namespace BizHawk.Bizware.BizwareGL
}); });
//find the best fit among the potential sizes that worked //find the best fit among the potential sizes that worked
long best = long.MaxValue; var best = long.MaxValue;
TryFitParam tfpFinal = null; var tfpFinal = todoSizes[0];
foreach (TryFitParam tfp in todoSizes) foreach (var tfp in todoSizes)
{ {
if (tfp.ok) if (!tfp.ok) continue;
var area = tfp.w * (long) tfp.h;
if (area > best) continue; // larger than best, not interested
if (area == best) // same area, compare perimeter as tie-breaker (to create squares, which are nicer to look at)
{ {
long area = (long)tfp.w * (long)tfp.h; if (tfp.w + tfp.h >= tfpFinal.w + tfpFinal.h) continue;
long perimeter = (long)tfp.w + (long)tfp.h;
if (area < best)
{
best = area;
tfpFinal = tfp;
}
else if (area == best)
{
//try to minimize perimeter (to create squares, which are nicer to look at)
if (tfpFinal == null)
{ }
else if (perimeter < tfpFinal.w + tfpFinal.h)
{
best = area;
tfpFinal = tfp;
}
}
} }
best = area;
tfpFinal = tfp;
} }
//did we find any fit? //did we find any fit?
@ -139,7 +128,7 @@ namespace BizHawk.Bizware.BizwareGL
currentItems.AddRange(remainItems); currentItems.AddRange(remainItems);
remainItems.Clear(); remainItems.Clear();
goto RETRY; goto RETRY1;
} }
if (atlases.Count > 1) Console.WriteLine($"Created animset with >1 texture ({atlases.Count} textures)"); if (atlases.Count > 1) Console.WriteLine($"Created animset with >1 texture ({atlases.Count} textures)");