Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rt: fixup incorrect oit application 

Still doesn't work for us, as we also have purely emissive/additive
polygons. wOIT doesn't seem to support that fundamentally, each surface
should still attenuate the background.

Didn't even get to the _weighted_ part of it because of that.
This commit is contained in:
Ivan Avdeev 2023-04-27 09:42:24 -07:00 committed by Ivan Avdeev
parent 449bcc4db9
commit b79a65f8a1
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ref/vk/shaders/trace_additive.glsl
View File

@ -46,6 +46,16 @@ void traceAdditive(vec3 pos, vec3 dir, float L, inout vec3 emissive, inout vec3
emissive += vec3(1., 1., 1.);
}
#else
#ifdef WEIGHTED_OIT
// TODO Glow overshoot
if (overshoot < 0.) {
alpha_m1_mul *= (1. - alpha);
alpha_sum += alpha;
color_sum += color;
}
#else
// FIXME OIT incorrect
if (kusok.material.mode == MATERIAL_MODE_BLEND_GLOW) {
// Glow is additive + small overshoot
emissive += color * smoothstep(additive_soft_overshoot, 0., overshoot);
@ -53,28 +63,25 @@ void traceAdditive(vec3 pos, vec3 dir, float L, inout vec3 emissive, inout vec3
if (kusok.material.mode == MATERIAL_MODE_BLEND_ADD) {
emissive += color;
} else if (kusok.material.mode == MATERIAL_MODE_BLEND_MIX) {
#ifdef WEIGHTED_OIT
alpha_sum += alpha;
alpha_m1_mul *= (1. - alpha);
color_sum += color;
#else
// FIXME OIT incorrect
// FIXME this depends on the right order
emissive = emissive * (1. - alpha) + color;
background *= (1. - alpha);
#endif
} else {
// Signal unhandled blending type
emissive += vec3(1., 0., 1.);
}
}
#endif // WEIGHTED_OIT
#endif // DEBUG_BLEND_MODES
}
#ifdef WEIGHTED_OIT
if (alpha_sum > 1e-4)
background = color_sum / alpha_sum * (1. - alpha_m1_mul) + background * alpha_m1_mul;
emissive *= alpha_m1_mul;
background *= alpha_m1_mul;
emissive *= alpha_m1_mul;
if (alpha_sum > 1e-4)
emissive += color_sum / alpha_sum * (1. - alpha_m1_mul);
#endif
}
}
#endif //ifndef TRACE_ADDITIVE_GLSL_INCLUDED