Merge pull request #3012 from e2002e/gi_clipmaps

Gi clipmaps

Shaders/custom_mat_presets/custom_mat_deferred.frag.glsl

@@ -50,7 +50,7 @@ void main() {
 	#ifdef _EmissionShaded
 		fragColor[GBUF_IDX_EMISSION] = vec4(emissionCol, 0.0);
 	#endif
-	
+
 	#ifdef _SSRefraction
 		fragColor[GBUF_IDX_REFRACTION] = vec4(ior, opacity, 0.0, 0.0);
 	#endif

Shaders/deferred_light/deferred_light.frag.glsl

@@ -8,7 +8,7 @@
 #ifdef _Irr
 #include "std/shirr.glsl"
 #endif
-#ifdef _VoxelAOvar
+#ifdef _VoxelShadow
 #include "std/conetrace.glsl"
 #endif
 #ifdef _SSS
@@ -21,22 +21,25 @@
 uniform sampler2D gbufferD;
 uniform sampler2D gbuffer0;
 uniform sampler2D gbuffer1;
+
 #ifdef _gbuffer2
 	uniform sampler2D gbuffer2;
 #endif
 #ifdef _EmissionShaded
 	uniform sampler2D gbufferEmission;
 #endif
 
-#ifdef _VoxelAOvar
-uniform sampler3D voxels;
+#ifdef _VoxelGI
+uniform sampler2D voxels_diffuse;
+uniform sampler2D voxels_specular;
 #endif
-#ifdef _VoxelGITemporal
-uniform sampler3D voxelsLast;
-uniform float voxelBlend;
+#ifdef _VoxelAOvar
+uniform sampler2D voxels_ao;
 #endif
-#ifdef _VoxelGICam
-uniform vec3 eyeSnap;
+#ifdef _VoxelShadow
+uniform float clipmaps[voxelgiClipmapCount * 10];
+uniform sampler3D voxels;
+uniform sampler3D voxelsSDF;
 #endif
 
 uniform float envmapStrength;
@@ -273,26 +276,31 @@ void main() {
 
 	envl.rgb *= envmapStrength * occspec.x;
 
-#ifdef _VoxelAOvar
-
-	#ifdef _VoxelGICam
-	vec3 voxpos = (p - eyeSnap) / voxelgiHalfExtents;
-	#else
-	vec3 voxpos = p / voxelgiHalfExtents;
-	#endif
-
-	#ifndef _VoxelAONoTrace
-	#ifdef _VoxelGITemporal
-	envl.rgb *= 1.0 - (traceAO(voxpos, n, voxels) * voxelBlend +
-					   traceAO(voxpos, n, voxelsLast) * (1.0 - voxelBlend));
-	#else
-	envl.rgb *= 1.0 - traceAO(voxpos, n, voxels);
-	#endif
-	#endif
+#ifdef _VoxelGI
+	fragColor.rgb = textureLod(voxels_diffuse, texCoord, 0.0).rgb * voxelgiDiff * albedo;
+	if(roughness < 1.0 && occspec.y > 0.0)
+		fragColor.rgb += textureLod(voxels_specular, texCoord, 0.0).rgb * voxelgiRefl * occspec.y;
+#endif
 
+#ifdef _VoxelAOvar
+	envl.rgb *= 1.0 - textureLod(voxels_ao, texCoord, 0.0).r;
 #endif
 
+#ifndef _VoxelGI
 	fragColor.rgb = envl;
+#endif
+	// Show voxels
+	// vec3 origin = vec3(texCoord * 2.0 - 1.0, 0.99);
+	// vec3 direction = vec3(0.0, 0.0, -1.0);
+	// vec4 color = vec4(0.0f);
+	// for(uint step = 0; step < 400 && color.a < 0.99f; ++step) {
+	// 	vec3 point = origin + 0.005 * step * direction;
+	// 	color += (1.0f - color.a) * textureLod(voxels, point * 0.5 + 0.5, 0);
+	// }
+	// fragColor.rgb += color.rgb;
+
+	// Show SSAO
+	// fragColor.rgb = texture(ssaotex, texCoord).rrr;
 
 #ifdef _SSAO
 	// #ifdef _RTGI
@@ -320,19 +328,6 @@ void main() {
 	#endif
 #endif
 
-	// Show voxels
-	// vec3 origin = vec3(texCoord * 2.0 - 1.0, 0.99);
-	// vec3 direction = vec3(0.0, 0.0, -1.0);
-	// vec4 color = vec4(0.0f);
-	// for(uint step = 0; step < 400 && color.a < 0.99f; ++step) {
-	// 	vec3 point = origin + 0.005 * step * direction;
-	// 	color += (1.0f - color.a) * textureLod(voxels, point * 0.5 + 0.5, 0);
-	// }
-	// fragColor.rgb += color.rgb;
-
-	// Show SSAO
-	// fragColor.rgb = texture(ssaotex, texCoord).rrr;
-
 #ifdef _Sun
 	vec3 sh = normalize(v + sunDir);
 	float sdotNH = max(0.0, dot(n, sh));
@@ -373,12 +368,10 @@ void main() {
 		#endif
 	#endif
 
-	#ifdef _VoxelAOvar
 	#ifdef _VoxelShadow
-	svisibility *= 1.0 - traceShadow(voxels, voxpos, sunDir);
+	svisibility *= 1.0 - traceShadow(p, n, voxels, voxelsSDF, sunDir, clipmaps);
 	#endif
-	#endif
-
+
 	#ifdef _SSRS
 	// vec2 coords = getProjectedCoord(hitCoord);
 	// vec2 deltaCoords = abs(vec2(0.5, 0.5) - coords.xy);
@@ -440,10 +433,10 @@ void main() {
 		#ifdef _Spot
 		, true, spotData.x, spotData.y, spotDir, spotData.zw, spotRight
 		#endif
-		#ifdef _VoxelAOvar
 		#ifdef _VoxelShadow
-		, voxels, voxpos
-		#endif
+		, voxels 
+		, voxelsSDF
+		, clipmaps
 		#endif
 		#ifdef _MicroShadowing
 		, occspec.x
@@ -500,10 +493,10 @@ void main() {
 			, vec2(lightsArray[li * 3].w, lightsArray[li * 3 + 1].w) // scale
 			, lightsArraySpot[li * 2 + 1].xyz // right
 			#endif
-			#ifdef _VoxelAOvar
 			#ifdef _VoxelShadow
-			, voxels, voxpos
-			#endif
+			, voxels
+			, voxelsSDF
+			, clipmaps
 			#endif
 			#ifdef _MicroShadowing
 			, occspec.x
@@ -515,5 +508,13 @@ void main() {
 	}
 #endif // _Clusters
 
+/*
+#ifdef _VoxelRefract
+if(opac < 1.0) {
+	vec3 refraction = traceRefraction(p, n, voxels, v, ior, roughness, eye) * voxelgiRefr;
+	fragColor.rgb = mix(refraction, fragColor.rgb, opac);
+}
+#endif
+*/
 	fragColor.a = 1.0; // Mark as opaque
 }

Shaders/deferred_light/deferred_light.json

@@ -11,20 +11,20 @@
 					"name": "eye",
 					"link": "_cameraPosition"
 				},
-				{
-					"name": "eyeSnap",
-					"link": "_cameraPositionSnap",
-					"ifdef": ["_VoxelGICam"]
-				},
 				{
 					"name": "voxelBlend",
 					"link": "_voxelBlend",
-					"ifdef": ["_VoxelGITemporal"]
+					"ifdef": ["_VoxelTemporal"]
 				},
 				{
 					"name": "eyeLook",
 					"link": "_cameraLook"
 				},
+				{
+					"name": "clipmaps",
+					"link": "_clipmaps",
+					"ifdef": ["VoxelShadow"]
+				},
 				{
 					"name": "invVP",
 					"link": "_inverseViewProjectionMatrix"

Shaders/smaa_blend_weight/smaa_blend_weight.frag.glsl

@@ -364,7 +364,7 @@ vec4 SMAABlendingWeightCalculationPS(vec2 texcoord, vec2 pixcoord,
 		// one of the boundaries is enough.
 		weights.rg = SMAACalculateDiagWeights(texcoord, e, subsampleIndices);
 
-		// We give priority to diagonals, so if we find a diagonal we skip
+		// We give piority to diagonals, so if we find a diagonal we skip
 		// horizontal/vertical processing.
 		//SMAA_BRANCH
 		if (weights.r == -weights.g) { // weights.r + weights.g == 0.0

Shaders/ssrefr_pass/ssrefr_pass.frag.glsl

@@ -81,6 +81,7 @@ void main() {
     vec3 n;
     n.z = 1.0 - abs(enc.x) - abs(enc.y);
     n.xy = n.z >= 0.0 ? enc.xy : octahedronWrap(enc.xy);
+    n = normalize(n);
 
     vec3 viewNormal = V3 * n;
     vec3 viewPos = getPosView(viewRay, d, cameraProj);