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

light: q2: change sky lighting logic: only emit light if: sky flag set, light flag set, value nonzero 

TODO: may need to use "value" more than just checking for nonzero
This commit is contained in:
Eric Wasylishen 2021-01-01 00:30:40 -07:00
parent 3b629f3ce9
commit 09623934e8
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
light/trace_embree.cc
View File

@ -624,6 +624,7 @@ Embree_TraceInit(const mbsp_t *bsp)
} }
const int contents = Face_Contents(bsp, face); //mxd const int contents = Face_Contents(bsp, face); //mxd
const gtexinfo_t *texinfo = Face_Texinfo(bsp, face);
//mxd. Skip NODRAW faces, but not SKY ones (Q2's sky01.wal has both flags set) //mxd. Skip NODRAW faces, but not SKY ones (Q2's sky01.wal has both flags set)
if(bsp->loadversion == Q2_BSPVERSION && (contents & Q2_SURF_NODRAW) && !(contents & Q2_SURF_SKY)) if(bsp->loadversion == Q2_BSPVERSION && (contents & Q2_SURF_NODRAW) && !(contents & Q2_SURF_SKY))
@ -645,9 +646,22 @@ Embree_TraceInit(const mbsp_t *bsp)
} }
// handle sky // handle sky
if (/* !Q_strncasecmp("sky", texname, 3) */ bsp->loadversion == Q2_BSPVERSION ? contents & Q2_SURF_SKY : contents == CONTENTS_SKY) { //mxd if (bsp->loadversion == Q2_BSPVERSION) {
skyfaces.push_back(face); // Q2: arghrad compat: sky faces only emit sunlight if:
continue; // sky flag set, light flag set, value nonzero
if ((contents & Q2_SURF_SKY) != 0
&& (contents & Q2_SURF_LIGHT) != 0
&& texinfo->value != 0)
{
skyfaces.push_back(face);
continue;
}
} else {
// Q1
if (!Q_strncasecmp("sky", texname, 3)) {
skyfaces.push_back(face);
continue;
}
} }
// liquids // liquids