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

qbsp: add -omitdetailwall and -omitdetailillusionary

This commit is contained in:
Eric Wasylishen 2017-06-07 14:12:02 -06:00
parent 37401937ae
commit d01b740b5b
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qbsp/qbsp.hh
View File

@ -347,6 +347,8 @@ typedef struct options_s {
vec_t on_epsilon;
bool fObjExport;
bool fOmitDetail;
bool fOmitDetailWall;
bool fOmitDetailIllusionary;
bool fForcePRT1;
} options_t;

6
qbsp/brush.cc
View File

@ -1063,9 +1063,11 @@ Brush_LoadEntity(mapentity_t *dst, const mapentity_t *src, const int hullnum)
continue;
/* -omitdetail option */
if (options.fOmitDetail && detail)
if (options.fOmitDetail && detail && !(cflags & CFLAGS_DETAIL_WALL))
continue;
if (options.fOmitDetail && detail_illusionary)
if (options.fOmitDetailWall && detail && (cflags & CFLAGS_DETAIL_WALL))
continue;
if (options.fOmitDetailIllusionary && detail_illusionary)
continue;
/* turn solid brushes into detail, if we're in hull0 */

8
qbsp/qbsp.cc
View File

@ -652,7 +652,9 @@ PrintOptions(void)
" -epsilon [n] Customize ON_EPSILON (default 0.0001)\n"
" -forceprt1 Create a PRT1 file for loading in editors, even if PRT2 is required to run vis.\n"
" -objexport Export the map file as an .OBJ model after the CSG phase\n"
" -omitdetail Detail brushes are omitted from the compile\n"
" -omitdetail func_detail brushes are omitted from the compile\n"
" -omitdetailwall func_detail_wall brushes are omitted from the compile\n"
" -omitdetailillusionary func_detail_illusionary brushes are omitted from the compile\n"
" -convert <fmt> Convert a .MAP to a different .MAP format. fmt can be: quake, quake2, valve, bp (brush primitives).\n"
" sourcefile .MAP file to process\n"
" destfile .BSP file to output\n");
@ -835,6 +837,10 @@ ParseOptions(char *szOptions)
options.fObjExport = true;
} else if (!Q_strcasecmp(szTok, "omitdetail")) {
options.fOmitDetail = true;
} else if (!Q_strcasecmp(szTok, "omitdetailwall")) {
options.fOmitDetailWall = true;
} else if (!Q_strcasecmp(szTok, "omitdetailillusionary")) {
options.fOmitDetailIllusionary = true;
} else if (!Q_strcasecmp(szTok, "convert")) {
szTok2 = GetTok(szTok + strlen(szTok) + 1, szEnd);
if (!szTok2)