maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix volumetrics for cubemap

Browse source
This commit is contained in:
Lubos Lenco 2018-01-28 14:57:49 +01:00
parent 1c56653849
commit 1110cdb5d6
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Shaders/volumetric_light/volumetric_light.frag.glsl
View file

@ -20,7 +20,7 @@ uniform vec3 lightPos;
uniform float lightRadius;
uniform float shadowsBias;
uniform int lightShadow;
uniform vec2 lightPlane;
uniform vec2 lightProj;
in vec4 wvpposition;
out float fragColor;
@ -48,14 +48,19 @@ void rayStep(inout vec3 curPos, inout float curOpticalDepth, inout float scatter
curOpticalDepth *= exp(-tExt * stepLenWorld * density);
float visibility = 1.0;
vec4 lampPos = LWVP * vec4(curPos, 1.0);
if (lampPos.w > 0.0) {
lampPos.xyz /= lampPos.w;
visibility = float(texture(shadowMap, lampPos.xy).r > lampPos.z - shadowsBias);
if (lightShadow == 1) {
vec4 lampPos = LWVP * vec4(curPos, 1.0);
if (lampPos.w > 0.0) {
lampPos.xyz /= lampPos.w;
visibility = float(texture(shadowMap, lampPos.xy).r > lampPos.z - shadowsBias);
}
}
else { // Cubemap
vec3 lp = lightPos - curPos;
vec3 l = normalize(lp);
visibility = float(texture(shadowMapCube, -l).r + shadowsBias > lpToDepth(lp, lightProj));
}
// Cubemap
// visibility = float(texture(shadowMapCube, -l).r + shadowsBias > lpToDepth(lp, lightPlane));
scatteredLightAmount += curOpticalDepth * l1 * visibility;
}

4
Shaders/volumetric_light/volumetric_light.json
View file

@ -43,8 +43,8 @@
"link": "_blueNoise64"
},
{
"name": "lightPlane",
"link": "_lampPlane"
"name": "lightProj",
"link": "_lampPlaneProj"
},
{
"name": "lightShadow",