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

qbsp: fix -convert quake2

This commit is contained in:
Eric Wasylishen 2017-03-26 16:35:26 -06:00
parent f3caed2f8b
commit af355a87be
3 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
qbsp/map.cc
View File

@ -1622,7 +1622,7 @@ static void fprintDoubleAndSpc(FILE *f, double v)
} }
static void static void
ConvertMapFace(FILE *f, const mapface_t &mapface, const texcoord_style_t format, const mapformat_t mapformat) ConvertMapFace(FILE *f, const mapface_t &mapface, const conversion_t format)
{ {
EnsureTexturesLoaded(); EnsureTexturesLoaded();
const texture_t *texture = WADList_GetTexture(mapface.texname.c_str()); const texture_t *texture = WADList_GetTexture(mapface.texname.c_str());
@ -1639,7 +1639,8 @@ ConvertMapFace(FILE *f, const mapface_t &mapface, const texcoord_style_t format,
} }
switch(format) { switch(format) {
case texcoord_style_t::TX_QUAKED: { case conversion_t::quake:
case conversion_t::quake2: {
const texdef_quake_ed_t quakeed = TexDef_BSPToQuakeEd(mapface.plane, texture, texinfo.vecs, mapface.planepts); const texdef_quake_ed_t quakeed = TexDef_BSPToQuakeEd(mapface.plane, texture, texinfo.vecs, mapface.planepts);
fprintf(f, "%s ", mapface.texname.c_str()); fprintf(f, "%s ", mapface.texname.c_str());
@ -1649,13 +1650,13 @@ ConvertMapFace(FILE *f, const mapface_t &mapface, const texcoord_style_t format,
fprintDoubleAndSpc(f, quakeed.scale[0]); fprintDoubleAndSpc(f, quakeed.scale[0]);
fprintDoubleAndSpc(f, quakeed.scale[1]); fprintDoubleAndSpc(f, quakeed.scale[1]);
if (mapformat == mapformat_t::q2) { if (format == conversion_t::quake2) {
fprintf(f, "0 0 0"); fprintf(f, "0 0 0");
} }
break; break;
} }
case texcoord_style_t::TX_VALVE_220: { case conversion_t::valve: {
const texdef_valve_t valve = TexDef_BSPToValve(texinfo.vecs); const texdef_valve_t valve = TexDef_BSPToValve(texinfo.vecs);
fprintf(f, "%s [ ", mapface.texname.c_str()); fprintf(f, "%s [ ", mapface.texname.c_str());
@ -1673,7 +1674,7 @@ ConvertMapFace(FILE *f, const mapface_t &mapface, const texcoord_style_t format,
fprintDoubleAndSpc(f, valve.scale[1]); fprintDoubleAndSpc(f, valve.scale[1]);
break; break;
} }
case texcoord_style_t::TX_BRUSHPRIM: { case conversion_t::bp: {
int texSize[2]; int texSize[2];
texSize[0] = texture ? texture->width : 64; texSize[0] = texture ? texture->width : 64;
texSize[1] = texture ? texture->height : 64; texSize[1] = texture ? texture->height : 64;
@ -1700,31 +1701,31 @@ ConvertMapFace(FILE *f, const mapface_t &mapface, const texcoord_style_t format,
} }
static void static void
ConvertMapBrush(FILE *f, const mapbrush_t &mapbrush, const texcoord_style_t format, const mapformat_t mapformat) ConvertMapBrush(FILE *f, const mapbrush_t &mapbrush, const conversion_t format)
{ {
fprintf(f, "{\n"); fprintf(f, "{\n");
if (format == texcoord_style_t::TX_BRUSHPRIM) { if (format == conversion_t::bp) {
fprintf(f, "brushDef\n"); fprintf(f, "brushDef\n");
fprintf(f, "{\n"); fprintf(f, "{\n");
} }
for (int i=0; i<mapbrush.numfaces; i++) { for (int i=0; i<mapbrush.numfaces; i++) {
ConvertMapFace(f, mapbrush.face(i), format, mapformat); ConvertMapFace(f, mapbrush.face(i), format);
} }
if (format == texcoord_style_t::TX_BRUSHPRIM) { if (format == conversion_t::bp) {
fprintf(f, "}\n"); fprintf(f, "}\n");
} }
fprintf(f, "}\n"); fprintf(f, "}\n");
} }
static void static void
ConvertEntity(FILE *f, const mapentity_t *entity, const texcoord_style_t format, const mapformat_t mapformat) ConvertEntity(FILE *f, const mapentity_t *entity, const conversion_t format)
{ {
fprintf(f, "{\n"); fprintf(f, "{\n");
for (const epair_t *epair = entity->epairs; epair; epair = epair->next) { for (const epair_t *epair = entity->epairs; epair; epair = epair->next) {
fprintf(f, "\"%s\" \"%s\"\n", epair->key, epair->value); fprintf(f, "\"%s\" \"%s\"\n", epair->key, epair->value);
} }
for (int i=0; i<entity->nummapbrushes; i++) { for (int i=0; i<entity->nummapbrushes; i++) {
ConvertMapBrush(f, entity->mapbrush(i), format, mapformat); ConvertMapBrush(f, entity->mapbrush(i), format);
} }
fprintf(f, "}\n"); fprintf(f, "}\n");
} }
@ -1741,18 +1742,21 @@ void ConvertMapFile(void)
std::string filename = stripExt(options.szBSPName); std::string filename = stripExt(options.szBSPName);
switch(options.convertMapTexFormat) { switch(options.convertMapFormat) {
case texcoord_style_t::TX_QUAKED: case conversion_t::quake:
filename += "-quake.map"; filename += "-quake.map";
break; break;
case texcoord_style_t::TX_VALVE_220: case conversion_t::quake2:
filename += "-quake2.map";
break;
case conversion_t::valve:
filename += "-valve.map"; filename += "-valve.map";
break; break;
case texcoord_style_t::TX_BRUSHPRIM: case conversion_t::bp:
filename += "-bp.map"; filename += "-bp.map";
break; break;
default: default:
Error("Internal error: unknown texcoord_style_t\n"); Error("Internal error: unknown conversion_t\n");
} }
FILE *f = fopen(filename.c_str(), "wb"); FILE *f = fopen(filename.c_str(), "wb");
@ -1760,7 +1764,7 @@ void ConvertMapFile(void)
Error("Couldn't open file\n"); Error("Couldn't open file\n");
for (const mapentity_t &entity : map.entities) { for (const mapentity_t &entity : map.entities) {
ConvertEntity(f, &entity, options.convertMapTexFormat, options.convertMapFormat); ConvertEntity(f, &entity, options.convertMapFormat);
} }
fclose(f); fclose(f);

12
qbsp/qbsp.cc
View File

@ -819,17 +819,13 @@ ParseOptions(char *szOptions)
Error("Invalid argument to option %s", szTok); Error("Invalid argument to option %s", szTok);
if (!Q_strcasecmp(szTok2, "quake")) { if (!Q_strcasecmp(szTok2, "quake")) {
options.convertMapFormat = mapformat_t::q1; options.convertMapFormat = conversion_t::quake;
options.convertMapTexFormat = texcoord_style_t::TX_QUAKED;
} else if (!Q_strcasecmp(szTok2, "quake2")) { } else if (!Q_strcasecmp(szTok2, "quake2")) {
options.convertMapFormat = mapformat_t::q2; options.convertMapFormat = conversion_t::quake2;
options.convertMapTexFormat = texcoord_style_t::TX_QUAKED;
} else if (!Q_strcasecmp(szTok2, "valve")) { } else if (!Q_strcasecmp(szTok2, "valve")) {
options.convertMapFormat = mapformat_t::q1; options.convertMapFormat = conversion_t::valve;
options.convertMapTexFormat = texcoord_style_t::TX_VALVE_220;
} else if (!Q_strcasecmp(szTok2, "bp")) { } else if (!Q_strcasecmp(szTok2, "bp")) {
options.convertMapFormat = mapformat_t::q2; options.convertMapFormat = conversion_t::bp;
options.convertMapTexFormat = texcoord_style_t::TX_BRUSHPRIM;
} else { } else {
Error("Invalid argument to option %s", szTok); Error("Invalid argument to option %s", szTok);
} }

9
qbsp/qbsp.hh
View File

@ -484,9 +484,9 @@ typedef enum {
TX_BRUSHPRIM = 4 TX_BRUSHPRIM = 4
} texcoord_style_t; } texcoord_style_t;
typedef enum { enum class conversion_t {
q1, q2 quake, quake2, valve, bp
} mapformat_t; };
typedef struct options_s { typedef struct options_s {
bool fNofill; bool fNofill;
@ -494,8 +494,7 @@ typedef struct options_s {
bool fNoskip; bool fNoskip;
bool fOnlyents; bool fOnlyents;
bool fConvertMapFormat; bool fConvertMapFormat;
texcoord_style_t convertMapTexFormat; conversion_t convertMapFormat;
mapformat_t convertMapFormat;
bool fVerbose; bool fVerbose;
bool fAllverbose; bool fAllverbose;
bool fSplitspecial; bool fSplitspecial;