olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bspinfo: fix naming of lightmap png export when more than 1 style is used

This commit is contained in:
Eric Wasylishen 2024-01-29 22:55:29 -07:00
parent d5b5d1a3ce
commit 135aee178f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/bspinfo.cc
View File

@ -474,7 +474,7 @@ full_atlas_t build_lightmap_atlas(const mbsp_t &bsp, const bspxentries_t &bspx,
} }
static void export_obj_and_lightmaps(const mbsp_t &bsp, const bspxentries_t &bspx, bool use_bspx, bool use_decoupled, static void export_obj_and_lightmaps(const mbsp_t &bsp, const bspxentries_t &bspx, bool use_bspx, bool use_decoupled,
fs::path obj_path, fs::path lightmaps_path) fs::path obj_path, const fs::path &lightmaps_path_base)
{ {
// FIXME: pass in .lit // FIXME: pass in .lit
const auto atlas = build_lightmap_atlas(bsp, bspx, {}, use_bspx, use_decoupled); const auto atlas = build_lightmap_atlas(bsp, bspx, {}, use_bspx, use_decoupled);
@ -483,9 +483,13 @@ static void export_obj_and_lightmaps(const mbsp_t &bsp, const bspxentries_t &bsp
return; return;
} }
// e.g. mapname.bsp.lm
const std::string stem = lightmaps_path_base.stem().string();
// write .png's, one per style // write .png's, one per style
for (const auto &[i, full_atlas] : atlas.style_to_lightmap_atlas) { for (const auto &[i, full_atlas] : atlas.style_to_lightmap_atlas) {
lightmaps_path.replace_filename(lightmaps_path.stem().string() + "_" + std::to_string(i) + ".png"); auto lightmaps_path = lightmaps_path_base;
lightmaps_path.replace_filename(stem + "_" + std::to_string(i) + ".png");
std::ofstream strm(lightmaps_path, std::ofstream::out | std::ofstream::binary); std::ofstream strm(lightmaps_path, std::ofstream::out | std::ofstream::binary);
stbi_write_png_to_func( stbi_write_png_to_func(
[](void *context, void *data, int size) { [](void *context, void *data, int size) {