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

Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp

This commit is contained in:
Eric Wasylishen 2022-10-30 14:33:24 -06:00
parent f9fc0fc478 022655b268
commit 9fa0b2ecef
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qbsp/faces.cc
View File

@ -43,7 +43,14 @@ struct makefaces_stats_t : logging::stat_tracker_t
static bool ShouldOmitFace(face_t *f)
{
if (!qbsp_options.includeskip.value() && f->get_texinfo().flags.is_nodraw)
{
// TODO: move to game specific
// always include LIGHT
if (qbsp_options.target_game->id == GAME_QUAKE_II && (f->get_texinfo().flags.native & Q2_SURF_LIGHT))
return false;
return true;
}
if (map.mtexinfos.at(f->texinfo).flags.is_hint)
return true;

13
qbsp/writebsp.cc
View File

@ -60,7 +60,12 @@ size_t ExportMapTexinfo(size_t texinfonum)
if (src.outputnum.has_value())
return src.outputnum.value();
else if (!qbsp_options.includeskip.value() && src.flags.is_nodraw)
return -1;
{
// TODO: move to game specific
// always include LIGHT
if (qbsp_options.target_game->id != GAME_QUAKE_II || !(src.flags.native & Q2_SURF_LIGHT))
return -1;
}
// this will be the index of the exported texinfo in the BSP lump
const size_t i = map.bsp.texinfo.size();
@ -172,7 +177,11 @@ static void ExportLeaf(node_t *node)
for (auto &face : node->markfaces) {
if (!qbsp_options.includeskip.value() && face->get_texinfo().flags.is_nodraw) {
continue;
// TODO: move to game specific
// always include LIGHT
if (qbsp_options.target_game->id != GAME_QUAKE_II || !(face->get_texinfo().flags.native & Q2_SURF_LIGHT))
continue;
}
/* grab final output faces */