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

light: tweak the glass tinting again

This commit is contained in:
Eric Wasylishen 2016-11-03 18:11:58 -06:00
parent e6df5098fd
commit 4f530fadb9
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
light/trace_embree.cc
View File

@ -903,12 +903,24 @@ void AddGlassToRay(const RTCIntersectContext* context, unsigned rayIndex, float
Q_assert(rayIndex < rs->_numrays);
Q_assert(glasscolor[0] >= 0.0 && glasscolor[0] <= 1.0);
Q_assert(glasscolor[1] >= 0.0 && glasscolor[1] <= 1.0);
Q_assert(glasscolor[2] >= 0.0 && glasscolor[2] <= 1.0);
//multiply ray color by glass color
vec3_t tinted;
for (int i=0; i<3; i++) {
tinted[i] = rs->_ray_colors[rayIndex][i] * glasscolor[i];
}
//absorb light based on opacity
VectorScale(tinted, opacity, rs->_ray_colors[rayIndex]);
// lerp between original ray color and fully tinted, based on opacity
vec3_t lerped = {0.0, 0.0, 0.0};
VectorMA(lerped, opacity, tinted, lerped);
VectorMA(lerped, 1.0-opacity, rs->_ray_colors[rayIndex], lerped);
// use the lerped color, scaled by (1-opacity) as the new ray color
// VectorScale(lerped, (1.0f - opacity), rs->_ray_colors[rayIndex]);
// use the lerped color
VectorCopy(lerped, rs->_ray_colors[rayIndex]);
}

2
testmaps/glasstest.map
View File

@ -5,7 +5,7 @@
"classname" "worldspawn"
"wad" "free_wad.wad"
"_sun_mangle" "330 -60 0"
"_sunlight" "100"
"_sunlight" "512"
"_sunlight_color" "100 150 255"
"light" "15"
// brush 0