Skip to content

Fix some packing bugs #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaoticgd merged 3 commits into from
Jul 30, 2026
Merged

Fix some packing bugs #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dc1502
Fix FMT_TEXTURE_PIF4 and FMT_TEXTURE_PIF8 texture packing hints
chaoticgd Jul 30, 2026
f8ba7ae
Fix frontbin packing for GC
chaoticgd Jul 30, 2026
b800476
Fix credit image packing for GC
chaoticgd Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/assetmgr/asset_dispatch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class Asset;
#define FMT_TEXTURE_RGBA "rgba"
#define FMT_TEXTURE_RGBA_512_416 "rawrgba,512,416"
#define FMT_TEXTURE_RGBA_512_448 "rawrgba,512,448"
#define FMT_TEXTURE_PIF4 "pif,4,unswizzled"
#define FMT_TEXTURE_PIF4 "pif,4,1,unswizzled"
#define FMT_TEXTURE_PIF4_SWIZZLED "pif,4,1,swizzled"
#define FMT_TEXTURE_PIF8 "pif,8,unswizzled"
#define FMT_TEXTURE_PIF8 "pif,8,1,unswizzled"
#define FMT_TEXTURE_PIF8_SWIZZLED "pif,8,1,swizzled"
#define FMT_MOBY_CLASS_PHAT "phat"
#define FMT_MOBY_CLASS_MESH_ONLY_ARMOR "gadget"
Expand Down
8 changes: 7 additions & 1 deletion src/wrenchbuild/common/texture_asset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,13 @@ static void pack_texture_asset(
} else {
verify_not_reached("Tried to pack a texture with an invalid palette size specified in the hint.");
}
s32 mip_levels = atoi(next_hint(&hint));
s32 mip_levels = 1;
const char* mip_levels_str = next_hint(&hint);
if (mip_levels_str && strlen(mip_levels_str) > 0) {
mip_levels = atoi(mip_levels_str);
verify(mip_levels > 0, "Invalid mipmap level count '%s' passed in hint for asset '%s'.",
mip_levels_str, src.absolute_link().to_string().c_str());
}
const char* swizzled = next_hint(&hint);
// TODO: Once we've figure out swizzling for where palette_size == 4
// make sure to enable that here.
Expand Down
2 changes: 1 addition & 1 deletion src/wrenchbuild/globals/bonus_wad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static void pack_rac_gc_bonus_wad(
pack_compressed_assets_sa(dest, ARRAY_PAIR(header.item_images), src.get_item_images(), config, "item_images", FMT_TEXTURE_PIF8);
if constexpr(std::is_same_v<Header, GcBonusWadHeader>) {
header.credits_text = pack_rac_gc_credits_text(dest, src.get_credits_text(), config);
pack_compressed_assets_sa(dest, ARRAY_PAIR(header.credits_images), src.get_credits_images(), config, "credits_images", FMT_TEXTURE_RGBA);
pack_assets_sa(dest, ARRAY_PAIR(header.credits_images), src.get_credits_images(), config, FMT_TEXTURE_RGBA);
pack_compressed_assets_sa(dest, ARRAY_PAIR(header.random_stuff), src.get_random_stuff(), config, "random_stuff", FMT_TEXTURE_PIF8);
pack_compressed_assets_sa(dest, ARRAY_PAIR(header.movie_images), src.get_movie_images(), config, "movie_images", FMT_TEXTURE_PIF8);
pack_compressed_assets_sa(dest, ARRAY_PAIR(header.cinematic_images), src.get_cinematic_images(), config, "cinematic_images", FMT_TEXTURE_PIF8);
Expand Down
4 changes: 2 additions & 2 deletions src/wrenchbuild/globals/misc_wad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ static void pack_gc_misc_wad(
header.debug_font = pack_asset_sa<SectorRange>(dest, src.get_debug_font(), config, FMT_TEXTURE_PIF8);
header.irx = pack_compressed_asset_sa<SectorRange>(dest, src.get_irx(), config, "irx");
header.save_game = pack_asset_sa<SectorRange>(dest, src.get_save_game(), config);
header.frontbin = pack_asset_sa<SectorRange>(dest, src.get_frontbin(), config);
header.frontbin = pack_asset_sa<SectorRange>(dest, src.get_frontbin(), config, FMT_ELFFILE_RATCHET_EXECUTABLE);
header.frontbin_net = pack_compressed_asset_sa<SectorRange>(dest, src.get_frontbin_net(), config, "frontbin_net");
header.frontend = pack_asset_sa<SectorRange>(dest, src.get_frontend(), config, FMT_ELFFILE_RATCHET_EXECUTABLE);
header.frontend = pack_asset_sa<SectorRange>(dest, src.get_frontend(), config);
header.exit = pack_asset_sa<SectorRange>(dest, src.get_exit(), config);
}

Expand Down
Loading