From 3d3ee0b6e2cf64a522ecea2f40033d851ae1425f Mon Sep 17 00:00:00 2001
From: Lubos Lenco <lubos.lenco@gmail.com>
Date: Tue, 2 Jun 2020 10:41:28 +0200
Subject: [PATCH] Rotate irradiance

---
 Assets/painter/deferred_light.arm             | Bin 3682 -> 3514 bytes
 Assets/painter/world_pass.arm                 | Bin 748 -> 664 bytes
 Shaders/painter/deferred_light.frag.glsl      |   9 ++++-----
 .../painter/deferred_light_voxel.frag.glsl    |   9 ++++-----
 Shaders/painter/world_pass.frag.glsl          |  12 ++++--------
 Sources/arm/node/MakeMesh.hx                  |   9 ++++-----
 Sources/arm/render/Uniforms.hx                |   7 ++++---
 7 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/Assets/painter/deferred_light.arm b/Assets/painter/deferred_light.arm
index 67a0c81f644fe1f418a68094e8ff2d564d9ac38e..b247db8738e4c61ab7ef9b6b34bb48b6c697deed 100644
GIT binary patch
delta 143
zcmaDPvrBqH3nTyJyX>nc>vOXkncQY!U|`5g%uT(`1!Sb=mE|TDxFnV&g2i((^RjPq
a1I6PJ5}Wrj%Cj-@Qf9(^rp;ft^Oyj~n=U#4

delta 243
zcmdlb{YYj)3yS~)1H)uRM&Zfx*{4okz#^>A2NX!nE6YtR2rel~%}X!IxXl6-%E`>j
yzReG0#G^`1p2(u4$qm=zn3tZDiqOD=&;XX%oXc^aX|o5512YTA9=clW%L)Lbx=U*S

diff --git a/Assets/painter/world_pass.arm b/Assets/painter/world_pass.arm
index 70d45fd3f54846a88de476791d8c2e26b5b3d8cf..97056515161c1b8544b79f927fac5a5c24a87bdb 100644
GIT binary patch
delta 74
zcmaFEI)imW86(rg@^DKQ1_p+*)MS&}AVywdZt86=AR{%eEH|;hC9xzCES{5@mwlTX
OC?1cH*c{C`kr4ngrxt(!

delta 159
zcmbQi`i6Bv86)$=^6+|A1_p+-oczR++blp<USe+QZ9X6)HLol;u^_mlC^av=Bm*p$
zlbM%&n;$3_k1Bbe87Kx;QBqludK-&@+;9UO^U`xt5vK7l0PTVr2bS8*&Nz_~0EXHz
AW&i*H

diff --git a/Shaders/painter/deferred_light.frag.glsl b/Shaders/painter/deferred_light.frag.glsl
index f3d60a4c..64b53ac7 100644
--- a/Shaders/painter/deferred_light.frag.glsl
+++ b/Shaders/painter/deferred_light.frag.glsl
@@ -44,8 +44,7 @@ uniform float voxelBlend;
 uniform vec3 eyeSnap;
 #endif
 
-uniform float envmapStrength;
-uniform float envmapAngle;
+uniform vec4 envmapData; // angle, sin(angle), cos(angle), strength
 #ifdef _Irr
 uniform vec4 shirr[7];
 #endif
@@ -206,7 +205,7 @@ void main() {
 
 	// Envmap
 #ifdef _Irr
-	vec3 envl = shIrradiance(n, shirr);
+	vec3 envl = shIrradiance(vec3(n.x * envmapData.z - n.y * envmapData.y, n.x * envmapData.y + n.y * envmapData.z, n.z), shirr);
 	#ifdef _EnvTex
 	envl /= PI;
 	#endif
@@ -217,7 +216,7 @@ void main() {
 #ifdef _Rad
 	vec3 reflectionWorld = reflect(-v, n);
 	float lod = getMipFromRoughness(roughness, envmapNumMipmaps);
-	vec3 prefilteredColor = textureLod(senvmapRadiance, envMapEquirect(reflectionWorld, envmapAngle), lod).rgb;
+	vec3 prefilteredColor = textureLod(senvmapRadiance, envMapEquirect(reflectionWorld, envmapData.x), lod).rgb;
 #endif
 
 #ifdef _EnvLDR
@@ -237,7 +236,7 @@ void main() {
 	#endif
 #endif
 
-	envl.rgb *= envmapStrength * occ;
+	envl.rgb *= envmapData.w * occ;
 
 #ifdef _VoxelAOvar
 
diff --git a/Shaders/painter/deferred_light_voxel.frag.glsl b/Shaders/painter/deferred_light_voxel.frag.glsl
index 46364d55..be39d05d 100644
--- a/Shaders/painter/deferred_light_voxel.frag.glsl
+++ b/Shaders/painter/deferred_light_voxel.frag.glsl
@@ -45,8 +45,7 @@ uniform float voxelBlend;
 uniform vec3 eyeSnap;
 #endif
 
-uniform float envmapStrength;
-uniform float envmapAngle;
+uniform vec4 envmapData;
 #ifdef _Irr
 uniform vec4 shirr[7];
 #endif
@@ -207,7 +206,7 @@ void main() {
 
 	// Envmap
 #ifdef _Irr
-	vec3 envl = shIrradiance(n, shirr);
+	vec3 envl = shIrradiance(vec3(n.x * envmapData.z - n.y * envmapData.y, n.x * envmapData.y + n.y * envmapData.z, n.z), shirr);
 	#ifdef _EnvTex
 	envl /= PI;
 	#endif
@@ -218,7 +217,7 @@ void main() {
 #ifdef _Rad
 	vec3 reflectionWorld = reflect(-v, n);
 	float lod = getMipFromRoughness(roughness, envmapNumMipmaps);
-	vec3 prefilteredColor = textureLod(senvmapRadiance, envMapEquirect(reflectionWorld, envmapAngle), lod).rgb;
+	vec3 prefilteredColor = textureLod(senvmapRadiance, envMapEquirect(reflectionWorld, envmapData.x), lod).rgb;
 #endif
 
 #ifdef _EnvLDR
@@ -238,7 +237,7 @@ void main() {
 	#endif
 #endif
 
-	envl.rgb *= envmapStrength * occ;
+	envl.rgb *= envmapData.w * occ;
 
 #ifdef _VoxelAOvar
 
diff --git a/Shaders/painter/world_pass.frag.glsl b/Shaders/painter/world_pass.frag.glsl
index 56f3b466..fc739a17 100644
--- a/Shaders/painter/world_pass.frag.glsl
+++ b/Shaders/painter/world_pass.frag.glsl
@@ -1,6 +1,5 @@
 #version 450
 
-#define _EnvStr
 #define _EnvTex
 
 #ifdef _EnvTex
@@ -37,10 +36,7 @@
 	uniform sampler2D envmap;
 #endif
 
-#ifdef _EnvStr
-uniform float envmapStrength;
-#endif
-uniform float envmapAngle;
+uniform vec4 envmapData; // angle, sin(angle), cos(angle), strength
 
 in vec3 normal;
 out vec4 fragColor;
@@ -138,7 +134,7 @@ void main() {
 #ifndef _EnvSky // Prevent case when sky radiance is enabled
 #ifdef _EnvTex
 	vec3 n = normalize(normal);
-	fragColor.rgb = texture(envmap, envMapEquirect(n, envmapAngle)).rgb * envmapStrength;
+	fragColor.rgb = texture(envmap, envMapEquirect(n, envmapData.x)).rgb * envmapData.w;
 	#ifdef _EnvLDR
 	fragColor.rgb = pow(fragColor.rgb, vec3(2.2));
 	#endif
@@ -148,7 +144,7 @@ void main() {
 #ifdef _EnvImg // Static background
 	// Will have to get rid of gl_FragCoord, pass tc from VS
 	vec2 texco = gl_FragCoord.xy / screenSize;
-	fragColor.rgb = texture(envmap, vec2(texco.x, 1.0 - texco.y)).rgb * envmapStrength;
+	fragColor.rgb = texture(envmap, vec2(texco.x, 1.0 - texco.y)).rgb * envmapData.w;
 #endif
 
 #ifdef _EnvSky
@@ -160,7 +156,7 @@ void main() {
 	float cos_gamma = dot(n, hosekSunDirection);
 	float gamma_val = acos(cos_gamma);
 
-	fragColor.rgb = Z * hosekWilkie(cos_theta, gamma_val, cos_gamma) * envmapStrength;
+	fragColor.rgb = Z * hosekWilkie(cos_theta, gamma_val, cos_gamma) * envmapData.w;
 #endif
 
 #ifdef _EnvClouds
diff --git a/Sources/arm/node/MakeMesh.hx b/Sources/arm/node/MakeMesh.hx
index 6ea09a69..26647058 100644
--- a/Sources/arm/node/MakeMesh.hx
+++ b/Sources/arm/node/MakeMesh.hx
@@ -349,11 +349,11 @@ class MakeMesh {
 					frag.write('vec2 envBRDF = texture(senvmapBrdf, vec2(roughness, 1.0 - dotNV)).xy;');
 					frag.add_uniform('sampler2D senvmapRadiance', '_envmapRadiance');
 					frag.add_uniform('int envmapNumMipmaps', '_envmapNumMipmaps');
-					frag.add_uniform('float envmapAngle', '_envmapAngle');
+					frag.add_uniform('vec4 envmapData', '_envmapData'); // angle, sin(angle), cos(angle), strength
 					frag.write('vec3 wreflect = reflect(-vVec, wn);');
 					frag.write('float envlod = roughness * float(envmapNumMipmaps);');
 					frag.add_function(MaterialFunctions.str_envMapEquirect);
-					frag.write('vec3 prefilteredColor = textureLod(senvmapRadiance, envMapEquirect(wreflect, envmapAngle), envlod).rgb;');
+					frag.write('vec3 prefilteredColor = textureLod(senvmapRadiance, envMapEquirect(wreflect, envmapData.x), envlod).rgb;');
 
 					frag.add_uniform('vec3 lightArea0', '_lightArea0');
 					frag.add_uniform('vec3 lightArea1', '_lightArea1');
@@ -382,12 +382,11 @@ class MakeMesh {
 					frag.write('vec3 direct = albedo * ltcdiff + ltcspec * 0.05;');
 					frag.write('direct *= lightColor * (1.0 / (ldist * ldist));');
 
-					frag.add_uniform('float envmapStrength', '_envmapStrength');
 					frag.add_uniform('vec4 shirr[7]', '_envmapIrradiance');
 					frag.add_function(MaterialFunctions.str_shIrradiance);
-					frag.write('vec3 indirect = albedo * (shIrradiance(wn, shirr) / 3.14159265);');
+					frag.write('vec3 indirect = albedo * (shIrradiance(vec3(wn.x * envmapData.z - wn.y * envmapData.y, wn.x * envmapData.y + wn.y * envmapData.z, wn.z), shirr) / 3.14159265);');
 					frag.write('indirect += prefilteredColor * (f0 * envBRDF.x + envBRDF.y) * 1.5;');
-					frag.write('indirect *= envmapStrength * occlusion;');
+					frag.write('indirect *= envmapData.w * occlusion;');
 					frag.write('fragColor[1] = vec4(direct + indirect, 1.0);');
 				}
 				else { // Deferred, Pathtraced
diff --git a/Sources/arm/render/Uniforms.hx b/Sources/arm/render/Uniforms.hx
index 48b6dfa5..3280cd73 100644
--- a/Sources/arm/render/Uniforms.hx
+++ b/Sources/arm/render/Uniforms.hx
@@ -77,9 +77,6 @@ class Uniforms {
 		if (link == "_objectId") {
 			return Project.paintObjects.indexOf(Context.paintObject);
 		}
-		if (link == "_envmapAngle") {
-			return Context.envmapAngle;
-		}
 		#end
 		#if arm_world
 		if (link == "_voxelgiHalfExtentsUni") {
@@ -321,6 +318,10 @@ class Uniforms {
 			if (Context.paint2d) vec.x -= 1.0;
 			return vec;
 		}
+		if (link == "_envmapData") {
+			vec.set(Context.envmapAngle, Math.sin(-Context.envmapAngle), Math.cos(-Context.envmapAngle), Scene.active.world.probe.raw.strength);
+			return vec;
+		}
 		#end
 		return null;
 	}