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

Improve tracing

Browse source
This commit is contained in:
Lubos Lenco 2017-12-05 21:41:17 +01:00
parent 0411b956c8
commit 0cabc9bca7
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Shaders/blur_shadow_pass/blur_shadow_pass.frag.glsl
View file

@ -15,17 +15,19 @@ out float fragColor;
const float blurWeights[10] = float[] (0.132572, 0.125472, 0.106373, 0.08078, 0.05495, 0.033482, 0.018275, 0.008934, 0.003912, 0.001535);
const float discardThreshold = 0.95;
float doBlur(const float blurWeight, const int pos, const vec3 nor, const vec2 texCoord) {
float doBlur(const float blurWeight, const int pos, const vec3 nor, const float depth, const vec2 texCoord) {
const float posadd = pos + 0.5;
vec3 nor2 = getNor(texture(gbuffer0, texCoord + pos * dirInv).rg);
float influenceFactor = step(discardThreshold, dot(nor2, nor));
vec4 g0 = texture(gbuffer0, texCoord + pos * dirInv);
vec3 nor2 = getNor(g0.rg);
float influenceFactor = step(discardThreshold, dot(nor2, nor)) * step(abs(depth - g0.a), 0.001);
float col = texture(tex, texCoord + posadd * dirInv).r;
fragColor += col * blurWeight * influenceFactor;
float weight = blurWeight * influenceFactor;
nor2 = getNor(texture(gbuffer0, texCoord - pos * dirInv).rg);
influenceFactor = step(discardThreshold, dot(nor2, nor));
g0 = texture(gbuffer0, texCoord - pos * dirInv);
nor2 = getNor(g0.rg);
influenceFactor = step(discardThreshold, dot(nor2, nor)) * step(abs(depth - g0.a), 0.001);
col = texture(tex, texCoord - posadd * dirInv).r;
fragColor += col * blurWeight * influenceFactor;
weight += blurWeight * influenceFactor;
@ -34,7 +36,9 @@ float doBlur(const float blurWeight, const int pos, const vec3 nor, const vec2 t
}
void main() {
vec3 nor = getNor(texture(gbuffer0, texCoord).rg);
vec4 g0 = texture(gbuffer0, texCoord);
vec3 nor = getNor(g0.rg);
float depth = g0.a;
float sm = texture(tex, texCoord).r;
fragColor = sm * blurWeights[0];
@ -42,9 +46,9 @@ void main() {
float d = texture(dist, texCoord).r;
int numTaps = clamp(int(d * 10 * penumbraScale), 2, 10 * penumbraScale);
#ifdef _PenumbraScale
for (int i = 1; i < numTaps; ++i) weight += doBlur(blurWeights[int(i / penumbraScale)], i, nor, texCoord);
for (int i = 1; i < numTaps; ++i) weight += doBlur(blurWeights[int(i / penumbraScale)], i, nor, depth, texCoord);
#else
for (int i = 1; i < numTaps; ++i) weight += doBlur(blurWeights[i - 1], i, nor, texCoord);
for (int i = 1; i < numTaps; ++i) weight += doBlur(blurWeights[i - 1], i, nor, depth, texCoord);
#endif
fragColor /= weight;
}

3
Shaders/ssgi_pass/ssgi_pass.frag.glsl
View file

@ -79,7 +79,8 @@ void rayCast(vec3 dir) {
#endif
for (int i = 0; i < ssgiMaxSteps; i++) {
hitCoord += dir;
if (getDeltaDepth(hitCoord) > 0.0) {
float delta = getDeltaDepth(hitCoord);
if (delta > 0.0 && delta < 0.2) {
dist = distance(vpos, hitCoord);
/* binarySearch(dir); */ break;
}