From fa48825cb54427e7dba3791c738ed2dd769a40fd Mon Sep 17 00:00:00 2001 From: Kevin Shanahan Date: Tue, 24 Dec 2013 19:08:46 +1030 Subject: [PATCH] qbsp: make transparent water the default for visibility calculations Signed-off-by: Kevin Shanahan --- changelog.txt | 1 + man/qbsp.1 | 4 +++- qbsp/qbsp.c | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 117959bb..3f8768d2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ Unreleased * qbsp: Cope with textures names containing '{' or '}' (e.g. for alpha mask) * qbsp: Increase MAXEDGES limit from 32 to 64 +* qbsp: Make transparent water the default (same as txqbsp) 2013-10-03 TyrUtils v0.14 diff --git a/man/qbsp.1 b/man/qbsp.1 index b4b1f73e..95f5fe48 100644 --- a/man/qbsp.1 +++ b/man/qbsp.1 @@ -32,7 +32,9 @@ Print out almost no information at all .IP "\fB\-splitspecial\fP" Doesn't combine sky and water faces into one large face .IP "\fB\-transwater\fP" -Computes portal information for transparent water +Computes portal information for transparent water (default) +.IP "\fB\-notranswater\fP" +Computes portal information for opaque water .IP "\fB\-transsky\fP" Computes portal information for transparent sky .IP "\fB\-oldaxis\fP" diff --git a/qbsp/qbsp.c b/qbsp/qbsp.c index ce4f1a31..a8169b95 100644 --- a/qbsp/qbsp.c +++ b/qbsp/qbsp.c @@ -369,7 +369,7 @@ PrintOptions(void) " -verbose Print out more .MAP information\n" " -noverbose Print out almost no information at all\n" " -splitspecial Doesn't combine sky and water faces into one large face\n" - " -transwater Computes portal information for transparent water\n" + " -notranswater Computes portal information for opaque water\n" " -transsky Computes portal information for transparent sky\n" " -oldaxis Uses original QBSP texture alignment algorithm\n" " -forcegoodtree Force use of expensive processing for SolidBSP stage\n" @@ -449,6 +449,7 @@ ParseOptions(char *szOptions) /* Default to the original Quake BSP Version... */ options.BSPVersion = BSPVERSION; + options.fTranswater = true; szEnd = szOptions + strlen(szOptions); szTok = GetTok(szOptions, szEnd); @@ -476,6 +477,8 @@ ParseOptions(char *szOptions) options.fAllverbose = true; else if (!strcasecmp(szTok, "splitspecial")) options.fSplitspecial = true; + else if (!strcasecmp(szTok, "notranswater")) + options.fTranswater = false; else if (!strcasecmp(szTok, "transwater")) options.fTranswater = true; else if (!strcasecmp(szTok, "transsky"))