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

Fix clamp

Browse source
This commit is contained in:
luboslenco 2018-03-26 13:05:16 +02:00
parent 7fef6c5e2c
commit 47993efd18
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Shaders/std/conetrace.glsl
View file

@ -9,7 +9,6 @@
const float MAX_DISTANCE = 1.73205080757 * voxelgiRange;
const float VOXEL_SIZE = (2.0 / voxelgiResolution.x) * voxelgiStep;
const float blendFac = (1.0 / max(voxelgiOcc, 0.1));
// uniform sampler3D voxels;
// uniform sampler3D voxelsLast;
@ -84,7 +83,7 @@ vec4 traceDiffuse(const vec3 origin, const vec3 normal, sampler3D voxels) {
vec4 col = traceCone(voxels, origin, normal, aperture, MAX_DISTANCE, normal);
col += traceCone(voxels, origin, mix(normal, -o1, angleMix), aperture, MAX_DISTANCE, normal);
col += traceCone(voxels, origin, mix(normal, c2, angleMix), aperture, MAX_DISTANCE, normal);
return col / (3.0 * blendFac);
return col / (3.0 * voxelgiOcc);
#endif
#ifdef _VoxelCones5
@ -93,7 +92,7 @@ vec4 traceDiffuse(const vec3 origin, const vec3 normal, sampler3D voxels) {
col += traceCone(voxels, origin, mix(normal, -o2, angleMix), aperture, MAX_DISTANCE, normal);
col += traceCone(voxels, origin, mix(normal, c1, angleMix), aperture, MAX_DISTANCE, normal);
col += traceCone(voxels, origin, mix(normal, c2, angleMix), aperture, MAX_DISTANCE, normal);
return col / (5.0 * blendFac);
return col / (5.0 * voxelgiOcc);
#endif
#ifdef _VoxelCones9
@ -109,7 +108,7 @@ vec4 traceDiffuse(const vec3 origin, const vec3 normal, sampler3D voxels) {
col += traceCone(voxels, origin, mix(normal, -c1, angleMix), aperture, MAX_DISTANCE, normal);
col += traceCone(voxels, origin, mix(normal, c2, angleMix), aperture, MAX_DISTANCE, normal);
col += traceCone(voxels, origin, mix(normal, -c2, angleMix), aperture, MAX_DISTANCE, normal);
return col / (9.0 * blendFac);
return col / (9.0 * voxelgiOcc);
#endif
return vec4(0.0);
@ -168,7 +167,7 @@ float traceAO(const vec3 origin, const vec3 normal, sampler3D voxels) {
float col = traceConeAO(voxels, origin, normal, aperture, MAX_DISTANCE);
col += traceConeAO(voxels, origin, mix(normal, o1, angleMix), aperture, MAX_DISTANCE);
col += traceConeAO(voxels, origin, mix(normal, -c2, angleMix), aperture, MAX_DISTANCE);
return col / (3.0 * blendFac);
return col / (3.0 * voxelgiOcc);
#endif
#ifdef _VoxelCones5
@ -177,7 +176,7 @@ float traceAO(const vec3 origin, const vec3 normal, sampler3D voxels) {
col += traceConeAO(voxels, origin, mix(normal, o2, angleMix), aperture, MAX_DISTANCE);
col += traceConeAO(voxels, origin, mix(normal, -c1, angleMix), aperture, MAX_DISTANCE);
col += traceConeAO(voxels, origin, mix(normal, -c2, angleMix), aperture, MAX_DISTANCE);
return col / (5.0 * blendFac);
return col / (5.0 * voxelgiOcc);
#endif
#ifdef _VoxelCones9
@ -191,7 +190,7 @@ float traceAO(const vec3 origin, const vec3 normal, sampler3D voxels) {
col += traceConeAO(voxels, origin, mix(normal, -o2, angleMix), aperture, MAX_DISTANCE);
col += traceConeAO(voxels, origin, mix(normal, c1, angleMix), aperture, MAX_DISTANCE);
col += traceConeAO(voxels, origin, mix(normal, c2, angleMix), aperture, MAX_DISTANCE);
return col / (9.0 * blendFac);
return col / (9.0 * voxelgiOcc);
#endif
return 0.0;

5
Shaders/voxel_bounce/voxel_bounce.comp.glsl
View file

@ -23,9 +23,10 @@ void main() {
vec3 wposition = ((gl_GlobalInvocationID.xyz - hres) / hres) * voxelgiHalfExtents;
uint unor = imageLoad(voxelsNor, ivec3(gl_GlobalInvocationID.xyz)).r;
vec3 wnormal = decNor(unor);
vec3 wnormal = normalize(decNor(unor));
col.rgb += traceDiffuse(((gl_GlobalInvocationID.xyz - hres) / hres), wnormal, voxelsFrom).rgb * voxelgiDiff;
col.rgb += traceDiffuse(((gl_GlobalInvocationID.xyz - hres) / hres), wnormal, voxelsFrom).rgb * voxelgiDiff * 0.5;
col = clamp(col, vec4(0.0), vec4(1.0));
imageStore(voxelsTo, ivec3(gl_GlobalInvocationID.xyz), col);
}

2
Shaders/voxel_light/voxel_light.comp.glsl
View file

@ -65,6 +65,8 @@ void main() {
}
col.rgb *= visibility * lightColor * dotNL;
col = clamp(col, vec4(0.0), vec4(1.0));
// imageStore(voxels, ivec3(gl_GlobalInvocationID.xyz), col);
imageAtomicAdd(voxels, ivec3(gl_GlobalInvocationID.xyz), convVec4ToRGBA8(col * 255));
}