R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential issue if restitching is performed

Browse Source
This commit is contained in:
embeddedt 2023-05-01 08:42:57 -04:00
parent 8a1dbc0543
commit d0102af837
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/embeddedt/modernfix/textures/StbStitcher.java
View File

@ -184,17 +184,19 @@ public class StbStitcher {
STBRectPack.stbrp_pack_rects(ctx, rectBuf);
for (STBRPRect rect : rectBuf) {
Stitcher.Holder holder = holders[rect.id()];
// Ensure that everything is properly packed!
if (!rect.was_packed()) {
Stitcher.Holder holder = holders[rect.id()];
throw new StitcherException(holder.spriteInfo,
Stream.of(holders).map(arg -> arg.spriteInfo).collect(ImmutableList.toImmutableList()));
}
}
for (STBRPRect rect : rectBuf) {
Stitcher.Holder holder = holders[rect.id()];
// Initialize the sprite now with the position and size that we've calculated so far
infoList.add(new LoadableSpriteInfo(holder.spriteInfo, longestWidth, longestHeight, getX(rect), getY(rect)));
//holder.spriteInfo.initSprite(size, size, rect.x(), rect.y(), false);
}
return Pair.of(Pair.of(longestWidth, longestHeight), infoList);