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

light: use glass texture colors to tint rays

This commit is contained in:
Eric Wasylishen 2016-11-03 02:26:53 -06:00
parent 3d98dd70de
commit 91fcfe5b9a
3 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/light/light.hh
View File

@ -405,6 +405,7 @@ const vec_t *GetSurfaceVertexNormal(const bsp2_t *bsp, const bsp2_dface_t *f, co
const bsp2_dface_t *Face_EdgeIndexSmoothed(const bsp2_t *bsp, const bsp2_dface_t *f, const int edgeindex);
const std::vector<bouncelight_t> &BounceLights();
std::vector<bouncelight_t> BounceLightsForFaceNum(int facenum);
void Palette_GetColor(int i, vec3_t samplecolor);
bool Leaf_HasSky(const bsp2_t *bsp, const bsp2_dleaf_t *leaf);
int light_main(int argc, const char **argv);

10
light/light.cc
View File

@ -949,6 +949,13 @@ std::vector<bouncelight_t> BounceLightsForFaceNum(int facenum)
return {};
}
void Palette_GetColor(int i, vec3_t samplecolor)
{
samplecolor[0] = (float)thepalette[3*i];
samplecolor[1] = (float)thepalette[3*i + 1];
samplecolor[2] = (float)thepalette[3*i + 2];
}
// Returns color in [0,1]
static void
Texture_AvgColor (const bsp2_t *bsp, const miptex_t *miptex, vec3_t color)
@ -962,7 +969,8 @@ Texture_AvgColor (const bsp2_t *bsp, const miptex_t *miptex, vec3_t color)
for (int x=0; x<miptex->width; x++) {
const int i = data[(miptex->width * y) + x];
vec3_t samplecolor = { (float)thepalette[3*i], (float)thepalette[3*i + 1], (float)thepalette[3*i + 2] };
vec3_t samplecolor;
Palette_GetColor(i, samplecolor);
VectorAdd(color, samplecolor, color);
}
}

33
light/trace_embree.cc
View File

@ -241,7 +241,7 @@ enum class filtertype_t {
INTERSECTION, OCCLUSION
};
void AddGlassToRay(const RTCIntersectContext* context, unsigned rayIndex, float opacity);
void AddGlassToRay(const RTCIntersectContext* context, unsigned rayIndex, float opacity, const vec3_t glasscolor);
// called to evaluate transparency
template<filtertype_t filtertype>
@ -282,12 +282,20 @@ Embree_FilterFuncN(int* valid,
const bsp2_dface_t *face = Embree_LookupFace(geomID, primID);
const modelinfo_t *modelinfo = Embree_LookupModelinfo(geomID, primID);
vec3_t hitpoint;
Embree_RayEndpoint(ray, potentialHit, N, i, hitpoint);
const int sample = SampleTexture(face, bsp_static, hitpoint);
float alpha = 1.0f;
if (modelinfo != nullptr) {
alpha = modelinfo->alpha.floatValue();
if (alpha < 1.0f) {
vec3_t samplecolor;
Palette_GetColor(sample, samplecolor);
VectorScale(samplecolor, 1/255.0, samplecolor);
// FIXME: Occluding twice (once for each side of the glass brush)
AddGlassToRay(context, rayIndex, alpha);
AddGlassToRay(context, rayIndex, alpha, samplecolor);
// reject hit
valid[i] = INVALID;
@ -297,10 +305,6 @@ Embree_FilterFuncN(int* valid,
const char *name = Face_TextureName(bsp_static, face);
if (name[0] == '{') {
vec3_t hitpoint;
Embree_RayEndpoint(ray, potentialHit, N, i, hitpoint);
const int sample = SampleTexture(face, bsp_static, hitpoint);
if (sample == 255) {
// reject hit
valid[i] = INVALID;
@ -870,10 +874,23 @@ raystream_t *Embree_MakeRayStream(int maxrays)
return new raystream_embree_t{maxrays};
}
void AddGlassToRay(const RTCIntersectContext* context, unsigned rayIndex, float opacity) {
void AddGlassToRay(const RTCIntersectContext* context, unsigned rayIndex, float opacity, const vec3_t glasscolor) {
raystream_embree_t *rs = static_cast<raystream_embree_t *>(context->userRayExt);
Q_assert(rayIndex < rs->_numrays);
VectorScale(rs->_ray_colors[rayIndex], 1.0 - opacity, rs->_ray_colors[rayIndex]);
//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];
}
// 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);
// save out the lerped value as the new ray color
VectorCopy(lerped, rs->_ray_colors[rayIndex]);
}