A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
chore(shaders): refresh the WGSL twins the shared library moved
esengineb1ecdc803464
diff --git a/fixtures/scenes/mat-builtin-lit/lit.esshader b/fixtures/scenes/mat-builtin-lit/lit.esshaderindex 9b416dfed..e70d1be16 100644--- a/fixtures/scenes/mat-builtin-lit/lit.esshader+++ b/fixtures/scenes/mat-builtin-lit/lit.esshader@@ -27,7 +27,7 @@ void main() {// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.// source-hash: 5330079245724fa2-// assembled-hash: 416df6c37e7dcbce+// assembled-hash: ca1eb542f2c993bfstruct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -108,7 +108,7 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.// source-hash: 5330079245724fa2-// assembled-hash: 416df6c37e7dcbce+// assembled-hash: ca1eb542f2c993bfstruct FrameConstants {u_projection: mat4x4<f32>,u_camera: vec4<f32>,@@ -317,34 +317,34 @@ fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>,var local_3: f32;var t1_: f32;var t2_: f32;- var phi_191_: bool;- var phi_200_: bool;- var phi_208_: bool;+ var phi_194_: bool;+ var phi_203_: bool;+ var phi_211_: bool;let _e103 = (*p0_)[0u];let _e105 = (*box)[0u];let _e106 = (_e103 >= _e105);- phi_191_ = _e106;+ phi_194_ = _e106;if _e106 {let _e108 = (*p0_)[1u];let _e110 = (*box)[1u];- phi_191_ = (_e108 >= _e110);+ phi_194_ = (_e108 >= _e110);}- let _e113 = phi_191_;- phi_200_ = _e113;+ let _e113 = phi_194_;+ phi_203_ = _e113;if _e113 {let _e115 = (*p0_)[0u];let _e117 = (*box)[2u];- phi_200_ = (_e115 <= _e117);+ phi_203_ = (_e115 <= _e117);}- let _e120 = phi_200_;- phi_208_ = _e120;+ let _e120 = phi_203_;+ phi_211_ = _e120;if _e120 {let _e122 = (*p0_)[1u];let _e124 = (*box)[3u];- phi_208_ = (_e122 <= _e124);+ phi_211_ = (_e122 <= _e124);}- let _e127 = phi_208_;+ let _e127 = phi_211_;if _e127 {return 0f;}@@ -632,46 +632,75 @@ fn lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b(pd: ptr<function, vec4<f32>>,return vec3<f32>(_e92.x, _e92.y, max(_e94, 1f));}-fn envIrradiance_u0028_vf3_u003b(N_2: ptr<function, vec3<f32>>) -> vec3<f32> {+fn envDirection_u0028_vf3_u003b(d_2: ptr<function, vec3<f32>>) -> vec3<f32> {+ var a_4: f32;+ var s_1: f32;+ var c: f32;++ let _e91 = unnamed_1.u_envTint[3u];+ a_4 = -(_e91);+ let _e93 = a_4;+ s_1 = sin(_e93);+ let _e95 = a_4;+ c = cos(_e95);+ let _e97 = c;+ let _e99 = (*d_2)[0u];+ let _e101 = s_1;+ let _e103 = (*d_2)[2u];+ let _e107 = (*d_2)[1u];+ let _e108 = s_1;+ let _e111 = (*d_2)[0u];+ let _e113 = c;+ let _e115 = (*d_2)[2u];+ return vec3<f32>(((_e97 * _e99) + (_e101 * _e103)), _e107, ((-(_e108) * _e111) + (_e113 * _e115)));+}++fn envIrradiance_u0028_vf3_u003b(Nw: ptr<function, vec3<f32>>) -> vec3<f32> {+ var N_2: vec3<f32>;+ var param_10: vec3<f32>;var sh_2: vec3<f32>;- let _e89 = unnamed_1.u_envIrradiance[0i];- let _e94 = unnamed_1.u_envIrradiance[1i];- let _e97 = (*N_2)[1u];- let _e103 = unnamed_1.u_envIrradiance[2i];- let _e106 = (*N_2)[2u];- let _e112 = unnamed_1.u_envIrradiance[3i];- let _e115 = (*N_2)[0u];- let _e121 = unnamed_1.u_envIrradiance[4i];- let _e124 = (*N_2)[0u];- let _e127 = (*N_2)[1u];- let _e133 = unnamed_1.u_envIrradiance[5i];- let _e136 = (*N_2)[1u];- let _e139 = (*N_2)[2u];- let _e145 = unnamed_1.u_envIrradiance[6i];- let _e148 = (*N_2)[2u];- let _e151 = (*N_2)[2u];- let _e159 = unnamed_1.u_envIrradiance[7i];- let _e162 = (*N_2)[0u];- let _e165 = (*N_2)[2u];- let _e171 = unnamed_1.u_envIrradiance[8i];- let _e174 = (*N_2)[0u];- let _e176 = (*N_2)[0u];- let _e179 = (*N_2)[1u];- let _e181 = (*N_2)[1u];- sh_2 = (((((((((_e89.xyz * 0.282095f) + (_e94.xyz * (0.488603f * _e97))) + (_e103.xyz * (0.488603f * _e106))) + (_e112.xyz * (0.488603f * _e115))) + (_e121.xyz * ((1.092548f * _e124) * _e127))) + (_e133.xyz * ((1.092548f * _e136) * _e139))) + (_e145.xyz * (0.315392f * (((3f * _e148) * _e151) - 1f)))) + (_e159.xyz * ((1.092548f * _e162) * _e165))) + (_e171.xyz * (0.546274f * ((_e174 * _e176) - (_e179 * _e181)))));- let _e188 = unnamed_1.u_ambient;- let _e190 = sh_2;- let _e193 = unnamed_1.u_envTint;- return (_e188.xyz + (max(_e190, vec3<f32>(0f, 0f, 0f)) * _e193.xyz));+ let _e89 = (*Nw);+ param_10 = _e89;+ let _e90 = envDirection_u0028_vf3_u003b((¶m_10));+ N_2 = _e90;+ let _e93 = unnamed_1.u_envIrradiance[0i];+ let _e98 = unnamed_1.u_envIrradiance[1i];+ let _e101 = N_2[1u];+ let _e107 = unnamed_1.u_envIrradiance[2i];+ let _e110 = N_2[2u];+ let _e116 = unnamed_1.u_envIrradiance[3i];+ let _e119 = N_2[0u];+ let _e125 = unnamed_1.u_envIrradiance[4i];+ let _e128 = N_2[0u];+ let _e131 = N_2[1u];+ let _e137 = unnamed_1.u_envIrradiance[5i];+ let _e140 = N_2[1u];+ let _e143 = N_2[2u];+ let _e149 = unnamed_1.u_envIrradiance[6i];+ let _e152 = N_2[2u];+ let _e155 = N_2[2u];+ let _e163 = unnamed_1.u_envIrradiance[7i];+ let _e166 = N_2[0u];+ let _e169 = N_2[2u];+ let _e175 = unnamed_1.u_envIrradiance[8i];+ let _e178 = N_2[0u];+ let _e180 = N_2[0u];+ let _e183 = N_2[1u];+ let _e185 = N_2[1u];+ sh_2 = (((((((((_e93.xyz * 0.282095f) + (_e98.xyz * (0.488603f * _e101))) + (_e107.xyz * (0.488603f * _e110))) + (_e116.xyz * (0.488603f * _e119))) + (_e125.xyz * ((1.092548f * _e128) * _e131))) + (_e137.xyz * ((1.092548f * _e140) * _e143))) + (_e149.xyz * (0.315392f * (((3f * _e152) * _e155) - 1f)))) + (_e163.xyz * ((1.092548f * _e166) * _e169))) + (_e175.xyz * (0.546274f * ((_e178 * _e180) - (_e183 * _e185)))));+ let _e192 = unnamed_1.u_ambient;+ let _e194 = sh_2;+ let _e197 = unnamed_1.u_envTint;+ return (_e192.xyz + (max(_e194, vec3<f32>(0f, 0f, 0f)) * _e197.xyz));}fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b(albedo: ptr<function, vec3<f32>>, N_3: ptr<function, vec3<f32>>, worldPos_3: ptr<function, vec3<f32>>, V: ptr<function, vec3<f32>>, metallic: ptr<function, f32>, roughness_3: ptr<function, f32>, specular: ptr<function, f32>, ao: ptr<function, f32>) -> vec3<f32> {var F0_1: vec3<f32>;- var a_4: f32;+ var a_5: f32;var NdotV_2: f32;var lit: vec3<f32>;- var param_10: vec3<f32>;+ var param_11: vec3<f32>;var gloss: vec3<f32>;var i_2: i32;var pd_1: vec4<f32>;@@ -680,71 +709,71 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0var target_1: vec2<f32>;var castShadow: bool;var toL: vec3<f32>;- var param_11: vec4<f32>;var param_12: vec4<f32>;- var param_13: vec3<f32>;- var dist_1: f32;+ var param_13: vec4<f32>;var param_14: vec3<f32>;+ var dist_1: f32;+ var param_15: vec3<f32>;var atten: f32;var L_1: vec3<f32>;- var param_15: vec3<f32>;var param_16: vec3<f32>;+ var param_17: vec3<f32>;var toLight_3: vec2<f32>;var local_8: vec2<f32>;var sp_1: vec4<f32>;var toL_1: vec3<f32>;- var param_17: vec4<f32>;var param_18: vec4<f32>;- var param_19: vec3<f32>;- var dist_2: f32;+ var param_19: vec4<f32>;var param_20: vec3<f32>;+ var dist_2: f32;var param_21: vec3<f32>;var param_22: vec3<f32>;- var param_23: vec4<f32>;+ var param_23: vec3<f32>;var param_24: vec4<f32>;- var param_25: vec3<f32>;- var param_26: f32;- var param_27: vec2<f32>;+ var param_25: vec4<f32>;+ var param_26: vec3<f32>;+ var param_27: f32;var param_28: vec2<f32>;- var param_29: f32;+ var param_29: vec2<f32>;+ var param_30: f32;var sm: vec4<f32>;- var param_30: vec3<f32>;var param_31: vec3<f32>;var param_32: vec3<f32>;- var param_33: vec2<f32>;- var param_34: i32;+ var param_33: vec3<f32>;+ var param_34: vec2<f32>;var param_35: i32;+ var param_36: i32;var ndotl: f32;var radiance: vec3<f32>;var H: vec3<f32>;var brdf: f32;- var param_36: f32;var param_37: f32;var param_38: f32;var param_39: f32;var param_40: f32;var param_41: f32;- var param_42: vec3<f32>;+ var param_42: f32;+ var param_43: vec3<f32>;var ab: vec2<f32>;- var param_43: f32;var param_44: f32;- var param_45: vec3<f32>;- var param_46: f32;- var phi_938_: bool;- var phi_992_: bool;+ var param_45: f32;+ var param_46: vec3<f32>;+ var param_47: f32;+ var phi_979_: bool;+ var phi_1033_: bool;let _e156 = (*albedo);let _e157 = (*metallic);F0_1 = mix(vec3<f32>(0.04f, 0.04f, 0.04f), _e156, vec3(_e157));let _e160 = (*roughness_3);let _e161 = (*roughness_3);- a_4 = max((_e160 * _e161), 0.001f);+ a_5 = max((_e160 * _e161), 0.001f);let _e164 = (*N_3);let _e165 = (*V);NdotV_2 = max(dot(_e164, _e165), 0.0001f);let _e168 = (*N_3);- param_10 = _e168;- let _e169 = envIrradiance_u0028_vf3_u003b((¶m_10));+ param_11 = _e168;+ let _e169 = envIrradiance_u0028_vf3_u003b((¶m_11));let _e170 = (*ao);lit = (_e169 * _e170);gloss = vec3<f32>(0f, 0f, 0f);@@ -767,25 +796,25 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e192 = pd_1[2u];if (_e192 < 0.5f) {let _e194 = pd_1;- param_11 = _e194;+ param_12 = _e194;let _e195 = sh_3;- param_12 = _e195;+ param_13 = _e195;let _e196 = (*worldPos_3);- param_13 = _e196;- let _e197 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_11), (¶m_12), (¶m_13));+ param_14 = _e196;+ let _e197 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_12), (¶m_13), (¶m_14));toL = _e197;let _e198 = toL;- param_14 = _e198;- let _e199 = lightDistance_u0028_vf3_u003b((¶m_14));+ param_15 = _e198;+ let _e199 = lightDistance_u0028_vf3_u003b((¶m_15));dist_1 = _e199;let _e200 = dist_1;let _e202 = pd_1[3u];atten = max(0f, (1f - (_e200 / max(_e202, 0.0001f))));let _e207 = toL;- param_15 = _e207;+ param_16 = _e207;let _e208 = (*N_3);- param_16 = _e208;- let _e209 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_15), (¶m_16));+ param_17 = _e208;+ let _e209 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_16), (¶m_17));L_1 = _e209;} else {let _e211 = pd_1[2u];@@ -807,13 +836,13 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0toLight_3 = _e232;let _e234 = sh_3[1u];let _e235 = (_e234 > 0f);- phi_938_ = _e235;+ phi_979_ = _e235;if _e235 {let _e236 = toLight_3;let _e237 = toLight_3;- phi_938_ = (dot(_e236, _e237) > 0.5f);+ phi_979_ = (dot(_e236, _e237) > 0.5f);}- let _e241 = phi_938_;+ let _e241 = phi_979_;castShadow = _e241;let _e242 = (*worldPos_3);let _e244 = toLight_3;@@ -824,55 +853,55 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e253 = unnamed_1.u_lights[_e249].spot;sp_1 = _e253;let _e254 = pd_1;- param_17 = _e254;+ param_18 = _e254;let _e255 = sh_3;- param_18 = _e255;+ param_19 = _e255;let _e256 = (*worldPos_3);- param_19 = _e256;- let _e257 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_17), (¶m_18), (¶m_19));+ param_20 = _e256;+ let _e257 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_18), (¶m_19), (¶m_20));toL_1 = _e257;let _e258 = toL_1;- param_20 = _e258;- let _e259 = lightDistance_u0028_vf3_u003b((¶m_20));+ param_21 = _e258;+ let _e259 = lightDistance_u0028_vf3_u003b((¶m_21));dist_2 = _e259;let _e260 = dist_2;let _e262 = pd_1[3u];atten = max(0f, (1f - (_e260 / max(_e262, 0.0001f))));let _e267 = toL_1;- param_21 = _e267;+ param_22 = _e267;let _e268 = (*N_3);- param_22 = _e268;- let _e269 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_21), (¶m_22));+ param_23 = _e268;+ let _e269 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_22), (¶m_23));L_1 = _e269;let _e270 = sp_1;- param_23 = _e270;+ param_24 = _e270;let _e271 = sh_3;- param_24 = _e271;+ param_25 = _e271;let _e272 = toL_1;- param_25 = _e272;+ param_26 = _e272;let _e273 = dist_2;- param_26 = _e273;- let _e274 = spotCone_u0028_vf4_u003b_vf4_u003b_vf3_u003b_f1_u003b((¶m_23), (¶m_24), (¶m_25), (¶m_26));+ param_27 = _e273;+ let _e274 = spotCone_u0028_vf4_u003b_vf4_u003b_vf3_u003b_f1_u003b((¶m_24), (¶m_25), (¶m_26), (¶m_27));let _e275 = atten;atten = (_e275 * _e274);}}let _e277 = castShadow;- phi_992_ = _e277;+ phi_1033_ = _e277;if _e277 {let _e279 = col[3u];- phi_992_ = (_e279 > 0f);+ phi_1033_ = (_e279 > 0f);}- let _e282 = phi_992_;+ let _e282 = phi_1033_;let _e283 = atten;if (_e282 && (_e283 > 0f)) {let _e286 = (*worldPos_3);- param_27 = _e286.xy;+ param_28 = _e286.xy;let _e288 = target_1;- param_28 = _e288;+ param_29 = _e288;let _e290 = sh_3[0u];- param_29 = _e290;- let _e291 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_27), (¶m_28), (¶m_29));+ param_30 = _e290;+ let _e291 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_28), (¶m_29), (¶m_30));let _e292 = atten;atten = (_e292 * _e291);}@@ -887,15 +916,15 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e311 = sm[0u];let _e314 = sm[1u];let _e316 = (*worldPos_3);- param_30 = _e316;+ param_31 = _e316;let _e317 = (*N_3);- param_31 = _e317;+ param_32 = _e317;let _e318 = L_1;- param_32 = _e318;- param_33 = vec2<f32>(_e306, _e308);- param_34 = i32(_e311);- param_35 = i32(_e314);- let _e319 = shadowFactor3D_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf2_u003b_i1_u003b_i1_u003b((¶m_30), (¶m_31), (¶m_32), (¶m_33), (¶m_34), (¶m_35));+ param_33 = _e318;+ param_34 = vec2<f32>(_e306, _e308);+ param_35 = i32(_e311);+ param_36 = i32(_e314);+ let _e319 = shadowFactor3D_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf2_u003b_i1_u003b_i1_u003b((¶m_31), (¶m_32), (¶m_33), (¶m_34), (¶m_35), (¶m_36));let _e320 = atten;atten = (_e320 * _e319);}@@ -917,27 +946,27 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0H = normalize((_e340 + _e341));let _e344 = (*N_3);let _e345 = H;- param_36 = max(dot(_e344, _e345), 0f);- let _e348 = a_4;- param_37 = _e348;- let _e349 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_36), (¶m_37));+ param_37 = max(dot(_e344, _e345), 0f);+ let _e348 = a_5;+ param_38 = _e348;+ let _e349 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_37), (¶m_38));let _e350 = NdotV_2;- param_38 = _e350;+ param_39 = _e350;let _e351 = ndotl;- param_39 = _e351;+ param_40 = _e351;let _e352 = (*roughness_3);- param_40 = _e352;- let _e353 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_38), (¶m_39), (¶m_40));+ param_41 = _e352;+ let _e353 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_39), (¶m_40), (¶m_41));let _e355 = NdotV_2;let _e357 = ndotl;brdf = ((_e349 * _e353) / max(((4f * _e355) * _e357), 0.0001f));let _e361 = radiance;let _e362 = (*V);let _e363 = H;- param_41 = max(dot(_e362, _e363), 0f);+ param_42 = max(dot(_e362, _e363), 0f);let _e366 = F0_1;- param_42 = _e366;- let _e367 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_41), (¶m_42));+ param_43 = _e366;+ let _e367 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_42), (¶m_43));let _e369 = brdf;let _e371 = (*specular);let _e374 = gloss;@@ -953,17 +982,17 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0}}let _e378 = NdotV_2;- param_43 = _e378;+ param_44 = _e378;let _e379 = (*roughness_3);- param_44 = _e379;- let _e380 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_43), (¶m_44));+ param_45 = _e379;+ let _e380 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_44), (¶m_45));ab = _e380;let _e381 = (*V);let _e383 = (*N_3);- param_45 = reflect(-(_e381), _e383);+ param_46 = reflect(-(_e381), _e383);let _e385 = (*roughness_3);- param_46 = _e385;- let _e386 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_45), (¶m_46));+ param_47 = _e385;+ let _e386 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_46), (¶m_47));let _e387 = (*ao);let _e388 = (*specular);let _e391 = F0_1;@@ -996,51 +1025,51 @@ fn viewDirection_u0028_vf3_u003b(worldPos_4: ptr<function, vec3<f32>>) -> vec3<ffn applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b(albedo_1: ptr<function, vec3<f32>>, N_4: ptr<function, vec3<f32>>, worldPos_5: ptr<function, vec2<f32>>, ao_1: ptr<function, f32>) -> vec3<f32> {var P: vec3<f32>;- var param_47: vec3<f32>;var param_48: vec3<f32>;var param_49: vec3<f32>;var param_50: vec3<f32>;var param_51: vec3<f32>;- var param_52: f32;+ var param_52: vec3<f32>;var param_53: f32;var param_54: f32;var param_55: f32;+ var param_56: f32;let _e99 = (*worldPos_5);P = vec3<f32>(_e99.x, _e99.y, 0f);let _e103 = P;- param_47 = _e103;- let _e104 = viewDirection_u0028_vf3_u003b((¶m_47));+ param_48 = _e103;+ let _e104 = viewDirection_u0028_vf3_u003b((¶m_48));let _e105 = (*albedo_1);- param_48 = _e105;+ param_49 = _e105;let _e106 = (*N_4);- param_49 = _e106;+ param_50 = _e106;let _e107 = P;- param_50 = _e107;- param_51 = _e104;- param_52 = 0f;- param_53 = 1f;- param_54 = 0f;+ param_51 = _e107;+ param_52 = _e104;+ param_53 = 0f;+ param_54 = 1f;+ param_55 = 0f;let _e108 = (*ao_1);- param_55 = _e108;- let _e109 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_48), (¶m_49), (¶m_50), (¶m_51), (¶m_52), (¶m_53), (¶m_54), (¶m_55));+ param_56 = _e108;+ let _e109 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_49), (¶m_50), (¶m_51), (¶m_52), (¶m_53), (¶m_54), (¶m_55), (¶m_56));return _e109;}fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo_2: ptr<function, vec3<f32>>, N_5: ptr<function, vec3<f32>>, worldPos_6: ptr<function, vec2<f32>>) -> vec3<f32> {- var param_56: vec3<f32>;var param_57: vec3<f32>;- var param_58: vec2<f32>;- var param_59: f32;+ var param_58: vec3<f32>;+ var param_59: vec2<f32>;+ var param_60: f32;let _e92 = (*albedo_2);- param_56 = _e92;+ param_57 = _e92;let _e93 = (*N_5);- param_57 = _e93;+ param_58 = _e93;let _e94 = (*worldPos_6);- param_58 = _e94;- param_59 = 1f;- let _e95 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_56), (¶m_57), (¶m_58), (¶m_59));+ param_59 = _e94;+ param_60 = 1f;+ let _e95 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_57), (¶m_58), (¶m_59), (¶m_60));return _e95;}@@ -1053,10 +1082,10 @@ fn sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(map_est: texture_2d<f32>, mapfn main_1() {var base: vec4<f32>;var N_6: vec3<f32>;- var param_60: vec2<f32>;- var param_61: vec3<f32>;+ var param_61: vec2<f32>;var param_62: vec3<f32>;- var param_63: vec2<f32>;+ var param_63: vec3<f32>;+ var param_64: vec2<f32>;let _e91 = v_texCoord_1;let _e92 = textureSample(es_bt0_est, es_bt0_ess, _e91);@@ -1064,16 +1093,16 @@ fn main_1() {let _e96 = unnamed_2.u_tint;base = ((_e92 * _e93) * _e96);let _e98 = v_texCoord_1;- param_60 = _e98;- let _e99 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normalMap_est, u_normalMap_ess, (¶m_60));+ param_61 = _e98;+ let _e99 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normalMap_est, u_normalMap_ess, (¶m_61));N_6 = _e99;let _e100 = base;- param_61 = _e100.xyz;+ param_62 = _e100.xyz;let _e102 = N_6;- param_62 = _e102;+ param_63 = _e102;let _e103 = v_worldPos_1;- param_63 = _e103;- let _e104 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_61), (¶m_62), (¶m_63));+ param_64 = _e103;+ let _e104 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_62), (¶m_63), (¶m_64));let _e106 = base[3u];fragColor = vec4<f32>(_e104.x, _e104.y, _e104.z, _e106);return;diff --git a/fixtures/scenes/mat-lit-flatnormal/lit-fn.esshader b/fixtures/scenes/mat-lit-flatnormal/lit-fn.esshaderindex 1f60e4a09..96c51e60b 100644--- a/fixtures/scenes/mat-lit-flatnormal/lit-fn.esshader+++ b/fixtures/scenes/mat-lit-flatnormal/lit-fn.esshader@@ -47,7 +47,7 @@ void main() {// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.// source-hash: a8853729e0f76d55-// assembled-hash: ea3b72b665a606f0+// assembled-hash: 16b98c0f8747453astruct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -120,7 +120,7 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.// source-hash: a8853729e0f76d55-// assembled-hash: ea3b72b665a606f0+// assembled-hash: 16b98c0f8747453astruct FrameConstants {u_projection: mat4x4<f32>,u_camera: vec4<f32>,@@ -323,34 +323,34 @@ fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>,var local_3: f32;var t1_: f32;var t2_: f32;- var phi_191_: bool;- var phi_200_: bool;- var phi_208_: bool;+ var phi_194_: bool;+ var phi_203_: bool;+ var phi_211_: bool;let _e102 = (*p0_)[0u];let _e104 = (*box)[0u];let _e105 = (_e102 >= _e104);- phi_191_ = _e105;+ phi_194_ = _e105;if _e105 {let _e107 = (*p0_)[1u];let _e109 = (*box)[1u];- phi_191_ = (_e107 >= _e109);+ phi_194_ = (_e107 >= _e109);}- let _e112 = phi_191_;- phi_200_ = _e112;+ let _e112 = phi_194_;+ phi_203_ = _e112;if _e112 {let _e114 = (*p0_)[0u];let _e116 = (*box)[2u];- phi_200_ = (_e114 <= _e116);+ phi_203_ = (_e114 <= _e116);}- let _e119 = phi_200_;- phi_208_ = _e119;+ let _e119 = phi_203_;+ phi_211_ = _e119;if _e119 {let _e121 = (*p0_)[1u];let _e123 = (*box)[3u];- phi_208_ = (_e121 <= _e123);+ phi_211_ = (_e121 <= _e123);}- let _e126 = phi_208_;+ let _e126 = phi_211_;if _e126 {return 0f;}@@ -638,46 +638,75 @@ fn lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b(pd: ptr<function, vec4<f32>>,return vec3<f32>(_e91.x, _e91.y, max(_e93, 1f));}-fn envIrradiance_u0028_vf3_u003b(N_2: ptr<function, vec3<f32>>) -> vec3<f32> {+fn envDirection_u0028_vf3_u003b(d_2: ptr<function, vec3<f32>>) -> vec3<f32> {+ var a_4: f32;+ var s_1: f32;+ var c: f32;++ let _e90 = unnamed_1.u_envTint[3u];+ a_4 = -(_e90);+ let _e92 = a_4;+ s_1 = sin(_e92);+ let _e94 = a_4;+ c = cos(_e94);+ let _e96 = c;+ let _e98 = (*d_2)[0u];+ let _e100 = s_1;+ let _e102 = (*d_2)[2u];+ let _e106 = (*d_2)[1u];+ let _e107 = s_1;+ let _e110 = (*d_2)[0u];+ let _e112 = c;+ let _e114 = (*d_2)[2u];+ return vec3<f32>(((_e96 * _e98) + (_e100 * _e102)), _e106, ((-(_e107) * _e110) + (_e112 * _e114)));+}++fn envIrradiance_u0028_vf3_u003b(Nw: ptr<function, vec3<f32>>) -> vec3<f32> {+ var N_2: vec3<f32>;+ var param_10: vec3<f32>;var sh_2: vec3<f32>;- let _e88 = unnamed_1.u_envIrradiance[0i];- let _e93 = unnamed_1.u_envIrradiance[1i];- let _e96 = (*N_2)[1u];- let _e102 = unnamed_1.u_envIrradiance[2i];- let _e105 = (*N_2)[2u];- let _e111 = unnamed_1.u_envIrradiance[3i];- let _e114 = (*N_2)[0u];- let _e120 = unnamed_1.u_envIrradiance[4i];- let _e123 = (*N_2)[0u];- let _e126 = (*N_2)[1u];- let _e132 = unnamed_1.u_envIrradiance[5i];- let _e135 = (*N_2)[1u];- let _e138 = (*N_2)[2u];- let _e144 = unnamed_1.u_envIrradiance[6i];- let _e147 = (*N_2)[2u];- let _e150 = (*N_2)[2u];- let _e158 = unnamed_1.u_envIrradiance[7i];- let _e161 = (*N_2)[0u];- let _e164 = (*N_2)[2u];- let _e170 = unnamed_1.u_envIrradiance[8i];- let _e173 = (*N_2)[0u];- let _e175 = (*N_2)[0u];- let _e178 = (*N_2)[1u];- let _e180 = (*N_2)[1u];- sh_2 = (((((((((_e88.xyz * 0.282095f) + (_e93.xyz * (0.488603f * _e96))) + (_e102.xyz * (0.488603f * _e105))) + (_e111.xyz * (0.488603f * _e114))) + (_e120.xyz * ((1.092548f * _e123) * _e126))) + (_e132.xyz * ((1.092548f * _e135) * _e138))) + (_e144.xyz * (0.315392f * (((3f * _e147) * _e150) - 1f)))) + (_e158.xyz * ((1.092548f * _e161) * _e164))) + (_e170.xyz * (0.546274f * ((_e173 * _e175) - (_e178 * _e180)))));- let _e187 = unnamed_1.u_ambient;- let _e189 = sh_2;- let _e192 = unnamed_1.u_envTint;- return (_e187.xyz + (max(_e189, vec3<f32>(0f, 0f, 0f)) * _e192.xyz));+ let _e88 = (*Nw);+ param_10 = _e88;+ let _e89 = envDirection_u0028_vf3_u003b((¶m_10));+ N_2 = _e89;+ let _e92 = unnamed_1.u_envIrradiance[0i];+ let _e97 = unnamed_1.u_envIrradiance[1i];+ let _e100 = N_2[1u];+ let _e106 = unnamed_1.u_envIrradiance[2i];+ let _e109 = N_2[2u];+ let _e115 = unnamed_1.u_envIrradiance[3i];+ let _e118 = N_2[0u];+ let _e124 = unnamed_1.u_envIrradiance[4i];+ let _e127 = N_2[0u];+ let _e130 = N_2[1u];+ let _e136 = unnamed_1.u_envIrradiance[5i];+ let _e139 = N_2[1u];+ let _e142 = N_2[2u];+ let _e148 = unnamed_1.u_envIrradiance[6i];+ let _e151 = N_2[2u];+ let _e154 = N_2[2u];+ let _e162 = unnamed_1.u_envIrradiance[7i];+ let _e165 = N_2[0u];+ let _e168 = N_2[2u];+ let _e174 = unnamed_1.u_envIrradiance[8i];+ let _e177 = N_2[0u];+ let _e179 = N_2[0u];+ let _e182 = N_2[1u];+ let _e184 = N_2[1u];+ sh_2 = (((((((((_e92.xyz * 0.282095f) + (_e97.xyz * (0.488603f * _e100))) + (_e106.xyz * (0.488603f * _e109))) + (_e115.xyz * (0.488603f * _e118))) + (_e124.xyz * ((1.092548f * _e127) * _e130))) + (_e136.xyz * ((1.092548f * _e139) * _e142))) + (_e148.xyz * (0.315392f * (((3f * _e151) * _e154) - 1f)))) + (_e162.xyz * ((1.092548f * _e165) * _e168))) + (_e174.xyz * (0.546274f * ((_e177 * _e179) - (_e182 * _e184)))));+ let _e191 = unnamed_1.u_ambient;+ let _e193 = sh_2;+ let _e196 = unnamed_1.u_envTint;+ return (_e191.xyz + (max(_e193, vec3<f32>(0f, 0f, 0f)) * _e196.xyz));}fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b(albedo: ptr<function, vec3<f32>>, N_3: ptr<function, vec3<f32>>, worldPos_3: ptr<function, vec3<f32>>, V: ptr<function, vec3<f32>>, metallic: ptr<function, f32>, roughness_3: ptr<function, f32>, specular: ptr<function, f32>, ao: ptr<function, f32>) -> vec3<f32> {var F0_1: vec3<f32>;- var a_4: f32;+ var a_5: f32;var NdotV_2: f32;var lit: vec3<f32>;- var param_10: vec3<f32>;+ var param_11: vec3<f32>;var gloss: vec3<f32>;var i_2: i32;var pd_1: vec4<f32>;@@ -686,71 +715,71 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0var target_1: vec2<f32>;var castShadow: bool;var toL: vec3<f32>;- var param_11: vec4<f32>;var param_12: vec4<f32>;- var param_13: vec3<f32>;- var dist_1: f32;+ var param_13: vec4<f32>;var param_14: vec3<f32>;+ var dist_1: f32;+ var param_15: vec3<f32>;var atten: f32;var L_1: vec3<f32>;- var param_15: vec3<f32>;var param_16: vec3<f32>;+ var param_17: vec3<f32>;var toLight_3: vec2<f32>;var local_8: vec2<f32>;var sp_1: vec4<f32>;var toL_1: vec3<f32>;- var param_17: vec4<f32>;var param_18: vec4<f32>;- var param_19: vec3<f32>;- var dist_2: f32;+ var param_19: vec4<f32>;var param_20: vec3<f32>;+ var dist_2: f32;var param_21: vec3<f32>;var param_22: vec3<f32>;- var param_23: vec4<f32>;+ var param_23: vec3<f32>;var param_24: vec4<f32>;- var param_25: vec3<f32>;- var param_26: f32;- var param_27: vec2<f32>;+ var param_25: vec4<f32>;+ var param_26: vec3<f32>;+ var param_27: f32;var param_28: vec2<f32>;- var param_29: f32;+ var param_29: vec2<f32>;+ var param_30: f32;var sm: vec4<f32>;- var param_30: vec3<f32>;var param_31: vec3<f32>;var param_32: vec3<f32>;- var param_33: vec2<f32>;- var param_34: i32;+ var param_33: vec3<f32>;+ var param_34: vec2<f32>;var param_35: i32;+ var param_36: i32;var ndotl: f32;var radiance: vec3<f32>;var H: vec3<f32>;var brdf: f32;- var param_36: f32;var param_37: f32;var param_38: f32;var param_39: f32;var param_40: f32;var param_41: f32;- var param_42: vec3<f32>;+ var param_42: f32;+ var param_43: vec3<f32>;var ab: vec2<f32>;- var param_43: f32;var param_44: f32;- var param_45: vec3<f32>;- var param_46: f32;- var phi_938_: bool;- var phi_992_: bool;+ var param_45: f32;+ var param_46: vec3<f32>;+ var param_47: f32;+ var phi_979_: bool;+ var phi_1033_: bool;let _e155 = (*albedo);let _e156 = (*metallic);F0_1 = mix(vec3<f32>(0.04f, 0.04f, 0.04f), _e155, vec3(_e156));let _e159 = (*roughness_3);let _e160 = (*roughness_3);- a_4 = max((_e159 * _e160), 0.001f);+ a_5 = max((_e159 * _e160), 0.001f);let _e163 = (*N_3);let _e164 = (*V);NdotV_2 = max(dot(_e163, _e164), 0.0001f);let _e167 = (*N_3);- param_10 = _e167;- let _e168 = envIrradiance_u0028_vf3_u003b((¶m_10));+ param_11 = _e167;+ let _e168 = envIrradiance_u0028_vf3_u003b((¶m_11));let _e169 = (*ao);lit = (_e168 * _e169);gloss = vec3<f32>(0f, 0f, 0f);@@ -773,25 +802,25 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e191 = pd_1[2u];if (_e191 < 0.5f) {let _e193 = pd_1;- param_11 = _e193;+ param_12 = _e193;let _e194 = sh_3;- param_12 = _e194;+ param_13 = _e194;let _e195 = (*worldPos_3);- param_13 = _e195;- let _e196 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_11), (¶m_12), (¶m_13));+ param_14 = _e195;+ let _e196 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_12), (¶m_13), (¶m_14));toL = _e196;let _e197 = toL;- param_14 = _e197;- let _e198 = lightDistance_u0028_vf3_u003b((¶m_14));+ param_15 = _e197;+ let _e198 = lightDistance_u0028_vf3_u003b((¶m_15));dist_1 = _e198;let _e199 = dist_1;let _e201 = pd_1[3u];atten = max(0f, (1f - (_e199 / max(_e201, 0.0001f))));let _e206 = toL;- param_15 = _e206;+ param_16 = _e206;let _e207 = (*N_3);- param_16 = _e207;- let _e208 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_15), (¶m_16));+ param_17 = _e207;+ let _e208 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_16), (¶m_17));L_1 = _e208;} else {let _e210 = pd_1[2u];@@ -813,13 +842,13 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0toLight_3 = _e231;let _e233 = sh_3[1u];let _e234 = (_e233 > 0f);- phi_938_ = _e234;+ phi_979_ = _e234;if _e234 {let _e235 = toLight_3;let _e236 = toLight_3;- phi_938_ = (dot(_e235, _e236) > 0.5f);+ phi_979_ = (dot(_e235, _e236) > 0.5f);}- let _e240 = phi_938_;+ let _e240 = phi_979_;castShadow = _e240;let _e241 = (*worldPos_3);let _e243 = toLight_3;@@ -830,55 +859,55 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e252 = unnamed_1.u_lights[_e248].spot;sp_1 = _e252;let _e253 = pd_1;- param_17 = _e253;+ param_18 = _e253;let _e254 = sh_3;- param_18 = _e254;+ param_19 = _e254;let _e255 = (*worldPos_3);- param_19 = _e255;- let _e256 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_17), (¶m_18), (¶m_19));+ param_20 = _e255;+ let _e256 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_18), (¶m_19), (¶m_20));toL_1 = _e256;let _e257 = toL_1;- param_20 = _e257;- let _e258 = lightDistance_u0028_vf3_u003b((¶m_20));+ param_21 = _e257;+ let _e258 = lightDistance_u0028_vf3_u003b((¶m_21));dist_2 = _e258;let _e259 = dist_2;let _e261 = pd_1[3u];atten = max(0f, (1f - (_e259 / max(_e261, 0.0001f))));let _e266 = toL_1;- param_21 = _e266;+ param_22 = _e266;let _e267 = (*N_3);- param_22 = _e267;- let _e268 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_21), (¶m_22));+ param_23 = _e267;+ let _e268 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_22), (¶m_23));L_1 = _e268;let _e269 = sp_1;- param_23 = _e269;+ param_24 = _e269;let _e270 = sh_3;- param_24 = _e270;+ param_25 = _e270;let _e271 = toL_1;- param_25 = _e271;+ param_26 = _e271;let _e272 = dist_2;- param_26 = _e272;- let _e273 = spotCone_u0028_vf4_u003b_vf4_u003b_vf3_u003b_f1_u003b((¶m_23), (¶m_24), (¶m_25), (¶m_26));+ param_27 = _e272;+ let _e273 = spotCone_u0028_vf4_u003b_vf4_u003b_vf3_u003b_f1_u003b((¶m_24), (¶m_25), (¶m_26), (¶m_27));let _e274 = atten;atten = (_e274 * _e273);}}let _e276 = castShadow;- phi_992_ = _e276;+ phi_1033_ = _e276;if _e276 {let _e278 = col[3u];- phi_992_ = (_e278 > 0f);+ phi_1033_ = (_e278 > 0f);}- let _e281 = phi_992_;+ let _e281 = phi_1033_;let _e282 = atten;if (_e281 && (_e282 > 0f)) {let _e285 = (*worldPos_3);- param_27 = _e285.xy;+ param_28 = _e285.xy;let _e287 = target_1;- param_28 = _e287;+ param_29 = _e287;let _e289 = sh_3[0u];- param_29 = _e289;- let _e290 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_27), (¶m_28), (¶m_29));+ param_30 = _e289;+ let _e290 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_28), (¶m_29), (¶m_30));let _e291 = atten;atten = (_e291 * _e290);}@@ -893,15 +922,15 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e310 = sm[0u];let _e313 = sm[1u];let _e315 = (*worldPos_3);- param_30 = _e315;+ param_31 = _e315;let _e316 = (*N_3);- param_31 = _e316;+ param_32 = _e316;let _e317 = L_1;- param_32 = _e317;- param_33 = vec2<f32>(_e305, _e307);- param_34 = i32(_e310);- param_35 = i32(_e313);- let _e318 = shadowFactor3D_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf2_u003b_i1_u003b_i1_u003b((¶m_30), (¶m_31), (¶m_32), (¶m_33), (¶m_34), (¶m_35));+ param_33 = _e317;+ param_34 = vec2<f32>(_e305, _e307);+ param_35 = i32(_e310);+ param_36 = i32(_e313);+ let _e318 = shadowFactor3D_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf2_u003b_i1_u003b_i1_u003b((¶m_31), (¶m_32), (¶m_33), (¶m_34), (¶m_35), (¶m_36));let _e319 = atten;atten = (_e319 * _e318);}@@ -923,27 +952,27 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0H = normalize((_e339 + _e340));let _e343 = (*N_3);let _e344 = H;- param_36 = max(dot(_e343, _e344), 0f);- let _e347 = a_4;- param_37 = _e347;- let _e348 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_36), (¶m_37));+ param_37 = max(dot(_e343, _e344), 0f);+ let _e347 = a_5;+ param_38 = _e347;+ let _e348 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_37), (¶m_38));let _e349 = NdotV_2;- param_38 = _e349;+ param_39 = _e349;let _e350 = ndotl;- param_39 = _e350;+ param_40 = _e350;let _e351 = (*roughness_3);- param_40 = _e351;- let _e352 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_38), (¶m_39), (¶m_40));+ param_41 = _e351;+ let _e352 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_39), (¶m_40), (¶m_41));let _e354 = NdotV_2;let _e356 = ndotl;brdf = ((_e348 * _e352) / max(((4f * _e354) * _e356), 0.0001f));let _e360 = radiance;let _e361 = (*V);let _e362 = H;- param_41 = max(dot(_e361, _e362), 0f);+ param_42 = max(dot(_e361, _e362), 0f);let _e365 = F0_1;- param_42 = _e365;- let _e366 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_41), (¶m_42));+ param_43 = _e365;+ let _e366 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_42), (¶m_43));let _e368 = brdf;let _e370 = (*specular);let _e373 = gloss;@@ -959,17 +988,17 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0}}let _e377 = NdotV_2;- param_43 = _e377;+ param_44 = _e377;let _e378 = (*roughness_3);- param_44 = _e378;- let _e379 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_43), (¶m_44));+ param_45 = _e378;+ let _e379 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_44), (¶m_45));ab = _e379;let _e380 = (*V);let _e382 = (*N_3);- param_45 = reflect(-(_e380), _e382);+ param_46 = reflect(-(_e380), _e382);let _e384 = (*roughness_3);- param_46 = _e384;- let _e385 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_45), (¶m_46));+ param_47 = _e384;+ let _e385 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_46), (¶m_47));let _e386 = (*ao);let _e387 = (*specular);let _e390 = F0_1;@@ -1002,51 +1031,51 @@ fn viewDirection_u0028_vf3_u003b(worldPos_4: ptr<function, vec3<f32>>) -> vec3<ffn applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b(albedo_1: ptr<function, vec3<f32>>, N_4: ptr<function, vec3<f32>>, worldPos_5: ptr<function, vec2<f32>>, ao_1: ptr<function, f32>) -> vec3<f32> {var P: vec3<f32>;- var param_47: vec3<f32>;var param_48: vec3<f32>;var param_49: vec3<f32>;var param_50: vec3<f32>;var param_51: vec3<f32>;- var param_52: f32;+ var param_52: vec3<f32>;var param_53: f32;var param_54: f32;var param_55: f32;+ var param_56: f32;let _e98 = (*worldPos_5);P = vec3<f32>(_e98.x, _e98.y, 0f);let _e102 = P;- param_47 = _e102;- let _e103 = viewDirection_u0028_vf3_u003b((¶m_47));+ param_48 = _e102;+ let _e103 = viewDirection_u0028_vf3_u003b((¶m_48));let _e104 = (*albedo_1);- param_48 = _e104;+ param_49 = _e104;let _e105 = (*N_4);- param_49 = _e105;+ param_50 = _e105;let _e106 = P;- param_50 = _e106;- param_51 = _e103;- param_52 = 0f;- param_53 = 1f;- param_54 = 0f;+ param_51 = _e106;+ param_52 = _e103;+ param_53 = 0f;+ param_54 = 1f;+ param_55 = 0f;let _e107 = (*ao_1);- param_55 = _e107;- let _e108 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_48), (¶m_49), (¶m_50), (¶m_51), (¶m_52), (¶m_53), (¶m_54), (¶m_55));+ param_56 = _e107;+ let _e108 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_49), (¶m_50), (¶m_51), (¶m_52), (¶m_53), (¶m_54), (¶m_55), (¶m_56));return _e108;}fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo_2: ptr<function, vec3<f32>>, N_5: ptr<function, vec3<f32>>, worldPos_6: ptr<function, vec2<f32>>) -> vec3<f32> {- var param_56: vec3<f32>;var param_57: vec3<f32>;- var param_58: vec2<f32>;- var param_59: f32;+ var param_58: vec3<f32>;+ var param_59: vec2<f32>;+ var param_60: f32;let _e91 = (*albedo_2);- param_56 = _e91;+ param_57 = _e91;let _e92 = (*N_5);- param_57 = _e92;+ param_58 = _e92;let _e93 = (*worldPos_6);- param_58 = _e93;- param_59 = 1f;- let _e94 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_56), (¶m_57), (¶m_58), (¶m_59));+ param_59 = _e93;+ param_60 = 1f;+ let _e94 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_57), (¶m_58), (¶m_59), (¶m_60));return _e94;}@@ -1059,27 +1088,27 @@ fn sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(map_est: texture_2d<f32>, mapfn main_1() {var base: vec4<f32>;var N_6: vec3<f32>;- var param_60: vec2<f32>;+ var param_61: vec2<f32>;var lit_1: vec3<f32>;- var param_61: vec3<f32>;var param_62: vec3<f32>;- var param_63: vec2<f32>;+ var param_63: vec3<f32>;+ var param_64: vec2<f32>;let _e91 = v_texCoord_1;let _e92 = textureSample(es_bt0_est, es_bt0_ess, _e91);let _e93 = v_color_1;base = (_e92 * _e93);let _e95 = v_texCoord_1;- param_60 = _e95;- let _e96 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normal_est, u_normal_ess, (¶m_60));+ param_61 = _e95;+ let _e96 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normal_est, u_normal_ess, (¶m_61));N_6 = _e96;let _e97 = base;- param_61 = _e97.xyz;+ param_62 = _e97.xyz;let _e99 = N_6;- param_62 = _e99;+ param_63 = _e99;let _e100 = v_worldPos_1;- param_63 = _e100;- let _e101 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_61), (¶m_62), (¶m_63));+ param_64 = _e100;+ let _e101 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_62), (¶m_63), (¶m_64));lit_1 = _e101;let _e102 = lit_1;let _e104 = base[3u];diff --git a/fixtures/scenes/mat-lit-normal/lit-normal.esshader b/fixtures/scenes/mat-lit-normal/lit-normal.esshaderindex a3b9596c3..9f1ad5bb4 100644--- a/fixtures/scenes/mat-lit-normal/lit-normal.esshader+++ b/fixtures/scenes/mat-lit-normal/lit-normal.esshader@@ -47,7 +47,7 @@ void main() {// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.// source-hash: 577c1ff7b66006ff-// assembled-hash: 9509ac04f870562e+// assembled-hash: b8931a8c9162b07dstruct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -120,7 +120,7 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.// source-hash: 577c1ff7b66006ff-// assembled-hash: 9509ac04f870562e+// assembled-hash: b8931a8c9162b07dstruct FrameConstants {u_projection: mat4x4<f32>,u_camera: vec4<f32>,@@ -323,34 +323,34 @@ fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>,var local_3: f32;var t1_: f32;var t2_: f32;- var phi_191_: bool;- var phi_200_: bool;- var phi_208_: bool;+ var phi_194_: bool;+ var phi_203_: bool;+ var phi_211_: bool;let _e102 = (*p0_)[0u];let _e104 = (*box)[0u];let _e105 = (_e102 >= _e104);- phi_191_ = _e105;+ phi_194_ = _e105;if _e105 {let _e107 = (*p0_)[1u];let _e109 = (*box)[1u];- phi_191_ = (_e107 >= _e109);+ phi_194_ = (_e107 >= _e109);}- let _e112 = phi_191_;- phi_200_ = _e112;+ let _e112 = phi_194_;+ phi_203_ = _e112;if _e112 {let _e114 = (*p0_)[0u];let _e116 = (*box)[2u];- phi_200_ = (_e114 <= _e116);+ phi_203_ = (_e114 <= _e116);}- let _e119 = phi_200_;- phi_208_ = _e119;+ let _e119 = phi_203_;+ phi_211_ = _e119;if _e119 {let _e121 = (*p0_)[1u];let _e123 = (*box)[3u];- phi_208_ = (_e121 <= _e123);+ phi_211_ = (_e121 <= _e123);}- let _e126 = phi_208_;+ let _e126 = phi_211_;if _e126 {return 0f;}@@ -638,46 +638,75 @@ fn lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b(pd: ptr<function, vec4<f32>>,return vec3<f32>(_e91.x, _e91.y, max(_e93, 1f));}-fn envIrradiance_u0028_vf3_u003b(N_2: ptr<function, vec3<f32>>) -> vec3<f32> {+fn envDirection_u0028_vf3_u003b(d_2: ptr<function, vec3<f32>>) -> vec3<f32> {+ var a_4: f32;+ var s_1: f32;+ var c: f32;++ let _e90 = unnamed_1.u_envTint[3u];+ a_4 = -(_e90);+ let _e92 = a_4;+ s_1 = sin(_e92);+ let _e94 = a_4;+ c = cos(_e94);+ let _e96 = c;+ let _e98 = (*d_2)[0u];+ let _e100 = s_1;+ let _e102 = (*d_2)[2u];+ let _e106 = (*d_2)[1u];+ let _e107 = s_1;+ let _e110 = (*d_2)[0u];+ let _e112 = c;+ let _e114 = (*d_2)[2u];+ return vec3<f32>(((_e96 * _e98) + (_e100 * _e102)), _e106, ((-(_e107) * _e110) + (_e112 * _e114)));+}++fn envIrradiance_u0028_vf3_u003b(Nw: ptr<function, vec3<f32>>) -> vec3<f32> {+ var N_2: vec3<f32>;+ var param_10: vec3<f32>;var sh_2: vec3<f32>;- let _e88 = unnamed_1.u_envIrradiance[0i];- let _e93 = unnamed_1.u_envIrradiance[1i];- let _e96 = (*N_2)[1u];- let _e102 = unnamed_1.u_envIrradiance[2i];- let _e105 = (*N_2)[2u];- let _e111 = unnamed_1.u_envIrradiance[3i];- let _e114 = (*N_2)[0u];- let _e120 = unnamed_1.u_envIrradiance[4i];- let _e123 = (*N_2)[0u];- let _e126 = (*N_2)[1u];- let _e132 = unnamed_1.u_envIrradiance[5i];- let _e135 = (*N_2)[1u];- let _e138 = (*N_2)[2u];- let _e144 = unnamed_1.u_envIrradiance[6i];- let _e147 = (*N_2)[2u];- let _e150 = (*N_2)[2u];- let _e158 = unnamed_1.u_envIrradiance[7i];- let _e161 = (*N_2)[0u];- let _e164 = (*N_2)[2u];- let _e170 = unnamed_1.u_envIrradiance[8i];- let _e173 = (*N_2)[0u];- let _e175 = (*N_2)[0u];- let _e178 = (*N_2)[1u];- let _e180 = (*N_2)[1u];- sh_2 = (((((((((_e88.xyz * 0.282095f) + (_e93.xyz * (0.488603f * _e96))) + (_e102.xyz * (0.488603f * _e105))) + (_e111.xyz * (0.488603f * _e114))) + (_e120.xyz * ((1.092548f * _e123) * _e126))) + (_e132.xyz * ((1.092548f * _e135) * _e138))) + (_e144.xyz * (0.315392f * (((3f * _e147) * _e150) - 1f)))) + (_e158.xyz * ((1.092548f * _e161) * _e164))) + (_e170.xyz * (0.546274f * ((_e173 * _e175) - (_e178 * _e180)))));- let _e187 = unnamed_1.u_ambient;- let _e189 = sh_2;- let _e192 = unnamed_1.u_envTint;- return (_e187.xyz + (max(_e189, vec3<f32>(0f, 0f, 0f)) * _e192.xyz));+ let _e88 = (*Nw);+ param_10 = _e88;+ let _e89 = envDirection_u0028_vf3_u003b((¶m_10));+ N_2 = _e89;+ let _e92 = unnamed_1.u_envIrradiance[0i];+ let _e97 = unnamed_1.u_envIrradiance[1i];+ let _e100 = N_2[1u];+ let _e106 = unnamed_1.u_envIrradiance[2i];+ let _e109 = N_2[2u];+ let _e115 = unnamed_1.u_envIrradiance[3i];+ let _e118 = N_2[0u];+ let _e124 = unnamed_1.u_envIrradiance[4i];+ let _e127 = N_2[0u];+ let _e130 = N_2[1u];+ let _e136 = unnamed_1.u_envIrradiance[5i];+ let _e139 = N_2[1u];+ let _e142 = N_2[2u];+ let _e148 = unnamed_1.u_envIrradiance[6i];+ let _e151 = N_2[2u];+ let _e154 = N_2[2u];+ let _e162 = unnamed_1.u_envIrradiance[7i];+ let _e165 = N_2[0u];+ let _e168 = N_2[2u];+ let _e174 = unnamed_1.u_envIrradiance[8i];+ let _e177 = N_2[0u];+ let _e179 = N_2[0u];+ let _e182 = N_2[1u];+ let _e184 = N_2[1u];+ sh_2 = (((((((((_e92.xyz * 0.282095f) + (_e97.xyz * (0.488603f * _e100))) + (_e106.xyz * (0.488603f * _e109))) + (_e115.xyz * (0.488603f * _e118))) + (_e124.xyz * ((1.092548f * _e127) * _e130))) + (_e136.xyz * ((1.092548f * _e139) * _e142))) + (_e148.xyz * (0.315392f * (((3f * _e151) * _e154) - 1f)))) + (_e162.xyz * ((1.092548f * _e165) * _e168))) + (_e174.xyz * (0.546274f * ((_e177 * _e179) - (_e182 * _e184)))));+ let _e191 = unnamed_1.u_ambient;+ let _e193 = sh_2;+ let _e196 = unnamed_1.u_envTint;+ return (_e191.xyz + (max(_e193, vec3<f32>(0f, 0f, 0f)) * _e196.xyz));}fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b(albedo: ptr<function, vec3<f32>>, N_3: ptr<function, vec3<f32>>, worldPos_3: ptr<function, vec3<f32>>, V: ptr<function, vec3<f32>>, metallic: ptr<function, f32>, roughness_3: ptr<function, f32>, specular: ptr<function, f32>, ao: ptr<function, f32>) -> vec3<f32> {var F0_1: vec3<f32>;- var a_4: f32;+ var a_5: f32;var NdotV_2: f32;var lit: vec3<f32>;- var param_10: vec3<f32>;+ var param_11: vec3<f32>;var gloss: vec3<f32>;var i_2: i32;var pd_1: vec4<f32>;@@ -686,71 +715,71 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0var target_1: vec2<f32>;var castShadow: bool;var toL: vec3<f32>;- var param_11: vec4<f32>;var param_12: vec4<f32>;- var param_13: vec3<f32>;- var dist_1: f32;+ var param_13: vec4<f32>;var param_14: vec3<f32>;+ var dist_1: f32;+ var param_15: vec3<f32>;var atten: f32;var L_1: vec3<f32>;- var param_15: vec3<f32>;var param_16: vec3<f32>;+ var param_17: vec3<f32>;var toLight_3: vec2<f32>;var local_8: vec2<f32>;var sp_1: vec4<f32>;var toL_1: vec3<f32>;- var param_17: vec4<f32>;var param_18: vec4<f32>;- var param_19: vec3<f32>;- var dist_2: f32;+ var param_19: vec4<f32>;var param_20: vec3<f32>;+ var dist_2: f32;var param_21: vec3<f32>;var param_22: vec3<f32>;- var param_23: vec4<f32>;+ var param_23: vec3<f32>;var param_24: vec4<f32>;- var param_25: vec3<f32>;- var param_26: f32;- var param_27: vec2<f32>;+ var param_25: vec4<f32>;+ var param_26: vec3<f32>;+ var param_27: f32;var param_28: vec2<f32>;- var param_29: f32;+ var param_29: vec2<f32>;+ var param_30: f32;var sm: vec4<f32>;- var param_30: vec3<f32>;var param_31: vec3<f32>;var param_32: vec3<f32>;- var param_33: vec2<f32>;- var param_34: i32;+ var param_33: vec3<f32>;+ var param_34: vec2<f32>;var param_35: i32;+ var param_36: i32;var ndotl: f32;var radiance: vec3<f32>;var H: vec3<f32>;var brdf: f32;- var param_36: f32;var param_37: f32;var param_38: f32;var param_39: f32;var param_40: f32;var param_41: f32;- var param_42: vec3<f32>;+ var param_42: f32;+ var param_43: vec3<f32>;var ab: vec2<f32>;- var param_43: f32;var param_44: f32;- var param_45: vec3<f32>;- var param_46: f32;- var phi_938_: bool;- var phi_992_: bool;+ var param_45: f32;+ var param_46: vec3<f32>;+ var param_47: f32;+ var phi_979_: bool;+ var phi_1033_: bool;let _e155 = (*albedo);let _e156 = (*metallic);F0_1 = mix(vec3<f32>(0.04f, 0.04f, 0.04f), _e155, vec3(_e156));let _e159 = (*roughness_3);let _e160 = (*roughness_3);- a_4 = max((_e159 * _e160), 0.001f);+ a_5 = max((_e159 * _e160), 0.001f);let _e163 = (*N_3);let _e164 = (*V);NdotV_2 = max(dot(_e163, _e164), 0.0001f);let _e167 = (*N_3);- param_10 = _e167;- let _e168 = envIrradiance_u0028_vf3_u003b((¶m_10));+ param_11 = _e167;+ let _e168 = envIrradiance_u0028_vf3_u003b((¶m_11));let _e169 = (*ao);lit = (_e168 * _e169);gloss = vec3<f32>(0f, 0f, 0f);@@ -773,25 +802,25 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e191 = pd_1[2u];if (_e191 < 0.5f) {let _e193 = pd_1;- param_11 = _e193;+ param_12 = _e193;let _e194 = sh_3;- param_12 = _e194;+ param_13 = _e194;let _e195 = (*worldPos_3);- param_13 = _e195;- let _e196 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_11), (¶m_12), (¶m_13));+ param_14 = _e195;+ let _e196 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_12), (¶m_13), (¶m_14));toL = _e196;let _e197 = toL;- param_14 = _e197;- let _e198 = lightDistance_u0028_vf3_u003b((¶m_14));+ param_15 = _e197;+ let _e198 = lightDistance_u0028_vf3_u003b((¶m_15));dist_1 = _e198;let _e199 = dist_1;let _e201 = pd_1[3u];atten = max(0f, (1f - (_e199 / max(_e201, 0.0001f))));let _e206 = toL;- param_15 = _e206;+ param_16 = _e206;let _e207 = (*N_3);- param_16 = _e207;- let _e208 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_15), (¶m_16));+ param_17 = _e207;+ let _e208 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_16), (¶m_17));L_1 = _e208;} else {let _e210 = pd_1[2u];@@ -813,13 +842,13 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0toLight_3 = _e231;let _e233 = sh_3[1u];let _e234 = (_e233 > 0f);- phi_938_ = _e234;+ phi_979_ = _e234;if _e234 {let _e235 = toLight_3;let _e236 = toLight_3;- phi_938_ = (dot(_e235, _e236) > 0.5f);+ phi_979_ = (dot(_e235, _e236) > 0.5f);}- let _e240 = phi_938_;+ let _e240 = phi_979_;castShadow = _e240;let _e241 = (*worldPos_3);let _e243 = toLight_3;@@ -830,55 +859,55 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e252 = unnamed_1.u_lights[_e248].spot;sp_1 = _e252;let _e253 = pd_1;- param_17 = _e253;+ param_18 = _e253;let _e254 = sh_3;- param_18 = _e254;+ param_19 = _e254;let _e255 = (*worldPos_3);- param_19 = _e255;- let _e256 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_17), (¶m_18), (¶m_19));+ param_20 = _e255;+ let _e256 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_18), (¶m_19), (¶m_20));toL_1 = _e256;let _e257 = toL_1;- param_20 = _e257;- let _e258 = lightDistance_u0028_vf3_u003b((¶m_20));+ param_21 = _e257;+ let _e258 = lightDistance_u0028_vf3_u003b((¶m_21));dist_2 = _e258;let _e259 = dist_2;let _e261 = pd_1[3u];atten = max(0f, (1f - (_e259 / max(_e261, 0.0001f))));let _e266 = toL_1;- param_21 = _e266;+ param_22 = _e266;let _e267 = (*N_3);- param_22 = _e267;- let _e268 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_21), (¶m_22));+ param_23 = _e267;+ let _e268 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_22), (¶m_23));L_1 = _e268;let _e269 = sp_1;- param_23 = _e269;+ param_24 = _e269;let _e270 = sh_3;- param_24 = _e270;+ param_25 = _e270;let _e271 = toL_1;- param_25 = _e271;+ param_26 = _e271;let _e272 = dist_2;- param_26 = _e272;- let _e273 = spotCone_u0028_vf4_u003b_vf4_u003b_vf3_u003b_f1_u003b((¶m_23), (¶m_24), (¶m_25), (¶m_26));+ param_27 = _e272;+ let _e273 = spotCone_u0028_vf4_u003b_vf4_u003b_vf3_u003b_f1_u003b((¶m_24), (¶m_25), (¶m_26), (¶m_27));let _e274 = atten;atten = (_e274 * _e273);}}let _e276 = castShadow;- phi_992_ = _e276;+ phi_1033_ = _e276;if _e276 {let _e278 = col[3u];- phi_992_ = (_e278 > 0f);+ phi_1033_ = (_e278 > 0f);}- let _e281 = phi_992_;+ let _e281 = phi_1033_;let _e282 = atten;if (_e281 && (_e282 > 0f)) {let _e285 = (*worldPos_3);- param_27 = _e285.xy;+ param_28 = _e285.xy;let _e287 = target_1;- param_28 = _e287;+ param_29 = _e287;let _e289 = sh_3[0u];- param_29 = _e289;- let _e290 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_27), (¶m_28), (¶m_29));+ param_30 = _e289;+ let _e290 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_28), (¶m_29), (¶m_30));let _e291 = atten;atten = (_e291 * _e290);}@@ -893,15 +922,15 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e310 = sm[0u];let _e313 = sm[1u];let _e315 = (*worldPos_3);- param_30 = _e315;+ param_31 = _e315;let _e316 = (*N_3);- param_31 = _e316;+ param_32 = _e316;let _e317 = L_1;- param_32 = _e317;- param_33 = vec2<f32>(_e305, _e307);- param_34 = i32(_e310);- param_35 = i32(_e313);- let _e318 = shadowFactor3D_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf2_u003b_i1_u003b_i1_u003b((¶m_30), (¶m_31), (¶m_32), (¶m_33), (¶m_34), (¶m_35));+ param_33 = _e317;+ param_34 = vec2<f32>(_e305, _e307);+ param_35 = i32(_e310);+ param_36 = i32(_e313);+ let _e318 = shadowFactor3D_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf2_u003b_i1_u003b_i1_u003b((¶m_31), (¶m_32), (¶m_33), (¶m_34), (¶m_35), (¶m_36));let _e319 = atten;atten = (_e319 * _e318);}@@ -923,27 +952,27 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0H = normalize((_e339 + _e340));let _e343 = (*N_3);let _e344 = H;- param_36 = max(dot(_e343, _e344), 0f);- let _e347 = a_4;- param_37 = _e347;- let _e348 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_36), (¶m_37));+ param_37 = max(dot(_e343, _e344), 0f);+ let _e347 = a_5;+ param_38 = _e347;+ let _e348 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_37), (¶m_38));let _e349 = NdotV_2;- param_38 = _e349;+ param_39 = _e349;let _e350 = ndotl;- param_39 = _e350;+ param_40 = _e350;let _e351 = (*roughness_3);- param_40 = _e351;- let _e352 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_38), (¶m_39), (¶m_40));+ param_41 = _e351;+ let _e352 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_39), (¶m_40), (¶m_41));let _e354 = NdotV_2;let _e356 = ndotl;brdf = ((_e348 * _e352) / max(((4f * _e354) * _e356), 0.0001f));let _e360 = radiance;let _e361 = (*V);let _e362 = H;- param_41 = max(dot(_e361, _e362), 0f);+ param_42 = max(dot(_e361, _e362), 0f);let _e365 = F0_1;- param_42 = _e365;- let _e366 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_41), (¶m_42));+ param_43 = _e365;+ let _e366 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_42), (¶m_43));let _e368 = brdf;let _e370 = (*specular);let _e373 = gloss;@@ -959,17 +988,17 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0}}let _e377 = NdotV_2;- param_43 = _e377;+ param_44 = _e377;let _e378 = (*roughness_3);- param_44 = _e378;- let _e379 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_43), (¶m_44));+ param_45 = _e378;+ let _e379 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_44), (¶m_45));ab = _e379;let _e380 = (*V);let _e382 = (*N_3);- param_45 = reflect(-(_e380), _e382);+ param_46 = reflect(-(_e380), _e382);let _e384 = (*roughness_3);- param_46 = _e384;- let _e385 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_45), (¶m_46));+ param_47 = _e384;+ let _e385 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_46), (¶m_47));let _e386 = (*ao);let _e387 = (*specular);let _e390 = F0_1;@@ -1002,51 +1031,51 @@ fn viewDirection_u0028_vf3_u003b(worldPos_4: ptr<function, vec3<f32>>) -> vec3<ffn applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b(albedo_1: ptr<function, vec3<f32>>, N_4: ptr<function, vec3<f32>>, worldPos_5: ptr<function, vec2<f32>>, ao_1: ptr<function, f32>) -> vec3<f32> {var P: vec3<f32>;- var param_47: vec3<f32>;var param_48: vec3<f32>;var param_49: vec3<f32>;var param_50: vec3<f32>;var param_51: vec3<f32>;- var param_52: f32;+ var param_52: vec3<f32>;var param_53: f32;var param_54: f32;var param_55: f32;+ var param_56: f32;let _e98 = (*worldPos_5);P = vec3<f32>(_e98.x, _e98.y, 0f);let _e102 = P;- param_47 = _e102;- let _e103 = viewDirection_u0028_vf3_u003b((¶m_47));+ param_48 = _e102;+ let _e103 = viewDirection_u0028_vf3_u003b((¶m_48));let _e104 = (*albedo_1);- param_48 = _e104;+ param_49 = _e104;let _e105 = (*N_4);- param_49 = _e105;+ param_50 = _e105;let _e106 = P;- param_50 = _e106;- param_51 = _e103;- param_52 = 0f;- param_53 = 1f;- param_54 = 0f;+ param_51 = _e106;+ param_52 = _e103;+ param_53 = 0f;+ param_54 = 1f;+ param_55 = 0f;let _e107 = (*ao_1);- param_55 = _e107;- let _e108 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_48), (¶m_49), (¶m_50), (¶m_51), (¶m_52), (¶m_53), (¶m_54), (¶m_55));+ param_56 = _e107;+ let _e108 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_49), (¶m_50), (¶m_51), (¶m_52), (¶m_53), (¶m_54), (¶m_55), (¶m_56));return _e108;}fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo_2: ptr<function, vec3<f32>>, N_5: ptr<function, vec3<f32>>, worldPos_6: ptr<function, vec2<f32>>) -> vec3<f32> {- var param_56: vec3<f32>;var param_57: vec3<f32>;- var param_58: vec2<f32>;- var param_59: f32;+ var param_58: vec3<f32>;+ var param_59: vec2<f32>;+ var param_60: f32;let _e91 = (*albedo_2);- param_56 = _e91;+ param_57 = _e91;let _e92 = (*N_5);- param_57 = _e92;+ param_58 = _e92;let _e93 = (*worldPos_6);- param_58 = _e93;- param_59 = 1f;- let _e94 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_56), (¶m_57), (¶m_58), (¶m_59));+ param_59 = _e93;+ param_60 = 1f;+ let _e94 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_57), (¶m_58), (¶m_59), (¶m_60));return _e94;}@@ -1059,27 +1088,27 @@ fn sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(map_est: texture_2d<f32>, mapfn main_1() {var base: vec4<f32>;var N_6: vec3<f32>;- var param_60: vec2<f32>;+ var param_61: vec2<f32>;var lit_1: vec3<f32>;- var param_61: vec3<f32>;var param_62: vec3<f32>;- var param_63: vec2<f32>;+ var param_63: vec3<f32>;+ var param_64: vec2<f32>;let _e91 = v_texCoord_1;let _e92 = textureSample(es_bt0_est, es_bt0_ess, _e91);let _e93 = v_color_1;base = (_e92 * _e93);let _e95 = v_texCoord_1;- param_60 = _e95;- let _e96 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normal_est, u_normal_ess, (¶m_60));+ param_61 = _e95;+ let _e96 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normal_est, u_normal_ess, (¶m_61));N_6 = _e96;let _e97 = base;- param_61 = _e97.xyz;+ param_62 = _e97.xyz;let _e99 = N_6;- param_62 = _e99;+ param_63 = _e99;let _e100 = v_worldPos_1;- param_63 = _e100;- let _e101 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_61), (¶m_62), (¶m_63));+ param_64 = _e100;+ let _e101 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_62), (¶m_63), (¶m_64));lit_1 = _e101;let _e102 = lit_1;let _e104 = base[3u];diff --git a/fixtures/scenes/mat-lit/lit.esshader b/fixtures/scenes/mat-lit/lit.esshaderindex 45e4242d3..56f62fa92 100644--- a/fixtures/scenes/mat-lit/lit.esshader+++ b/fixtures/scenes/mat-lit/lit.esshader@@ -53,7 +53,7 @@ void main() {// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.// source-hash: 8c118f2b442c055e-// assembled-hash: 8e1e08bccdcce94f+// assembled-hash: 5c7e77cef9746685struct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -122,7 +122,7 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.// source-hash: 8c118f2b442c055e-// assembled-hash: 8e1e08bccdcce94f+// assembled-hash: 5c7e77cef9746685struct FrameConstants {u_projection: mat4x4<f32>,u_camera: vec4<f32>,@@ -321,34 +321,34 @@ fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>,var local_3: f32;var t1_: f32;var t2_: f32;- var phi_167_: bool;- var phi_176_: bool;- var phi_184_: bool;+ var phi_170_: bool;+ var phi_179_: bool;+ var phi_187_: bool;let _e101 = (*p0_)[0u];let _e103 = (*box)[0u];let _e104 = (_e101 >= _e103);- phi_167_ = _e104;+ phi_170_ = _e104;if _e104 {let _e106 = (*p0_)[1u];let _e108 = (*box)[1u];- phi_167_ = (_e106 >= _e108);+ phi_170_ = (_e106 >= _e108);}- let _e111 = phi_167_;- phi_176_ = _e111;+ let _e111 = phi_170_;+ phi_179_ = _e111;if _e111 {let _e113 = (*p0_)[0u];let _e115 = (*box)[2u];- phi_176_ = (_e113 <= _e115);+ phi_179_ = (_e113 <= _e115);}- let _e118 = phi_176_;- phi_184_ = _e118;+ let _e118 = phi_179_;+ phi_187_ = _e118;if _e118 {let _e120 = (*p0_)[1u];let _e122 = (*box)[3u];- phi_184_ = (_e120 <= _e122);+ phi_187_ = (_e120 <= _e122);}- let _e125 = phi_184_;+ let _e125 = phi_187_;if _e125 {return 0f;}@@ -636,46 +636,75 @@ fn lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b(pd: ptr<function, vec4<f32>>,return vec3<f32>(_e90.x, _e90.y, max(_e92, 1f));}-fn envIrradiance_u0028_vf3_u003b(N_2: ptr<function, vec3<f32>>) -> vec3<f32> {+fn envDirection_u0028_vf3_u003b(d_2: ptr<function, vec3<f32>>) -> vec3<f32> {+ var a_4: f32;+ var s_1: f32;+ var c: f32;++ let _e89 = unnamed_1.u_envTint[3u];+ a_4 = -(_e89);+ let _e91 = a_4;+ s_1 = sin(_e91);+ let _e93 = a_4;+ c = cos(_e93);+ let _e95 = c;+ let _e97 = (*d_2)[0u];+ let _e99 = s_1;+ let _e101 = (*d_2)[2u];+ let _e105 = (*d_2)[1u];+ let _e106 = s_1;+ let _e109 = (*d_2)[0u];+ let _e111 = c;+ let _e113 = (*d_2)[2u];+ return vec3<f32>(((_e95 * _e97) + (_e99 * _e101)), _e105, ((-(_e106) * _e109) + (_e111 * _e113)));+}++fn envIrradiance_u0028_vf3_u003b(Nw: ptr<function, vec3<f32>>) -> vec3<f32> {+ var N_2: vec3<f32>;+ var param_10: vec3<f32>;var sh_2: vec3<f32>;- let _e87 = unnamed_1.u_envIrradiance[0i];- let _e92 = unnamed_1.u_envIrradiance[1i];- let _e95 = (*N_2)[1u];- let _e101 = unnamed_1.u_envIrradiance[2i];- let _e104 = (*N_2)[2u];- let _e110 = unnamed_1.u_envIrradiance[3i];- let _e113 = (*N_2)[0u];- let _e119 = unnamed_1.u_envIrradiance[4i];- let _e122 = (*N_2)[0u];- let _e125 = (*N_2)[1u];- let _e131 = unnamed_1.u_envIrradiance[5i];- let _e134 = (*N_2)[1u];- let _e137 = (*N_2)[2u];- let _e143 = unnamed_1.u_envIrradiance[6i];- let _e146 = (*N_2)[2u];- let _e149 = (*N_2)[2u];- let _e157 = unnamed_1.u_envIrradiance[7i];- let _e160 = (*N_2)[0u];- let _e163 = (*N_2)[2u];- let _e169 = unnamed_1.u_envIrradiance[8i];- let _e172 = (*N_2)[0u];- let _e174 = (*N_2)[0u];- let _e177 = (*N_2)[1u];- let _e179 = (*N_2)[1u];- sh_2 = (((((((((_e87.xyz * 0.282095f) + (_e92.xyz * (0.488603f * _e95))) + (_e101.xyz * (0.488603f * _e104))) + (_e110.xyz * (0.488603f * _e113))) + (_e119.xyz * ((1.092548f * _e122) * _e125))) + (_e131.xyz * ((1.092548f * _e134) * _e137))) + (_e143.xyz * (0.315392f * (((3f * _e146) * _e149) - 1f)))) + (_e157.xyz * ((1.092548f * _e160) * _e163))) + (_e169.xyz * (0.546274f * ((_e172 * _e174) - (_e177 * _e179)))));- let _e186 = unnamed_1.u_ambient;- let _e188 = sh_2;- let _e191 = unnamed_1.u_envTint;- return (_e186.xyz + (max(_e188, vec3<f32>(0f, 0f, 0f)) * _e191.xyz));+ let _e87 = (*Nw);+ param_10 = _e87;+ let _e88 = envDirection_u0028_vf3_u003b((¶m_10));+ N_2 = _e88;+ let _e91 = unnamed_1.u_envIrradiance[0i];+ let _e96 = unnamed_1.u_envIrradiance[1i];+ let _e99 = N_2[1u];+ let _e105 = unnamed_1.u_envIrradiance[2i];+ let _e108 = N_2[2u];+ let _e114 = unnamed_1.u_envIrradiance[3i];+ let _e117 = N_2[0u];+ let _e123 = unnamed_1.u_envIrradiance[4i];+ let _e126 = N_2[0u];+ let _e129 = N_2[1u];+ let _e135 = unnamed_1.u_envIrradiance[5i];+ let _e138 = N_2[1u];+ let _e141 = N_2[2u];+ let _e147 = unnamed_1.u_envIrradiance[6i];+ let _e150 = N_2[2u];+ let _e153 = N_2[2u];+ let _e161 = unnamed_1.u_envIrradiance[7i];+ let _e164 = N_2[0u];+ let _e167 = N_2[2u];+ let _e173 = unnamed_1.u_envIrradiance[8i];+ let _e176 = N_2[0u];+ let _e178 = N_2[0u];+ let _e181 = N_2[1u];+ let _e183 = N_2[1u];+ sh_2 = (((((((((_e91.xyz * 0.282095f) + (_e96.xyz * (0.488603f * _e99))) + (_e105.xyz * (0.488603f * _e108))) + (_e114.xyz * (0.488603f * _e117))) + (_e123.xyz * ((1.092548f * _e126) * _e129))) + (_e135.xyz * ((1.092548f * _e138) * _e141))) + (_e147.xyz * (0.315392f * (((3f * _e150) * _e153) - 1f)))) + (_e161.xyz * ((1.092548f * _e164) * _e167))) + (_e173.xyz * (0.546274f * ((_e176 * _e178) - (_e181 * _e183)))));+ let _e190 = unnamed_1.u_ambient;+ let _e192 = sh_2;+ let _e195 = unnamed_1.u_envTint;+ return (_e190.xyz + (max(_e192, vec3<f32>(0f, 0f, 0f)) * _e195.xyz));}fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b(albedo: ptr<function, vec3<f32>>, N_3: ptr<function, vec3<f32>>, worldPos_3: ptr<function, vec3<f32>>, V: ptr<function, vec3<f32>>, metallic: ptr<function, f32>, roughness_3: ptr<function, f32>, specular: ptr<function, f32>, ao: ptr<function, f32>) -> vec3<f32> {var F0_1: vec3<f32>;- var a_4: f32;+ var a_5: f32;var NdotV_2: f32;var lit: vec3<f32>;- var param_10: vec3<f32>;+ var param_11: vec3<f32>;var gloss: vec3<f32>;var i_2: i32;var pd_1: vec4<f32>;@@ -684,71 +713,71 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0var target_1: vec2<f32>;var castShadow: bool;var toL: vec3<f32>;- var param_11: vec4<f32>;var param_12: vec4<f32>;- var param_13: vec3<f32>;- var dist_1: f32;+ var param_13: vec4<f32>;var param_14: vec3<f32>;+ var dist_1: f32;+ var param_15: vec3<f32>;var atten: f32;var L_1: vec3<f32>;- var param_15: vec3<f32>;var param_16: vec3<f32>;+ var param_17: vec3<f32>;var toLight_3: vec2<f32>;var local_8: vec2<f32>;var sp_1: vec4<f32>;var toL_1: vec3<f32>;- var param_17: vec4<f32>;var param_18: vec4<f32>;- var param_19: vec3<f32>;- var dist_2: f32;+ var param_19: vec4<f32>;var param_20: vec3<f32>;+ var dist_2: f32;var param_21: vec3<f32>;var param_22: vec3<f32>;- var param_23: vec4<f32>;+ var param_23: vec3<f32>;var param_24: vec4<f32>;- var param_25: vec3<f32>;- var param_26: f32;- var param_27: vec2<f32>;+ var param_25: vec4<f32>;+ var param_26: vec3<f32>;+ var param_27: f32;var param_28: vec2<f32>;- var param_29: f32;+ var param_29: vec2<f32>;+ var param_30: f32;var sm: vec4<f32>;- var param_30: vec3<f32>;var param_31: vec3<f32>;var param_32: vec3<f32>;- var param_33: vec2<f32>;- var param_34: i32;+ var param_33: vec3<f32>;+ var param_34: vec2<f32>;var param_35: i32;+ var param_36: i32;var ndotl: f32;var radiance: vec3<f32>;var H: vec3<f32>;var brdf: f32;- var param_36: f32;var param_37: f32;var param_38: f32;var param_39: f32;var param_40: f32;var param_41: f32;- var param_42: vec3<f32>;+ var param_42: f32;+ var param_43: vec3<f32>;var ab: vec2<f32>;- var param_43: f32;var param_44: f32;- var param_45: vec3<f32>;- var param_46: f32;- var phi_915_: bool;- var phi_969_: bool;+ var param_45: f32;+ var param_46: vec3<f32>;+ var param_47: f32;+ var phi_956_: bool;+ var phi_1010_: bool;let _e154 = (*albedo);let _e155 = (*metallic);F0_1 = mix(vec3<f32>(0.04f, 0.04f, 0.04f), _e154, vec3(_e155));let _e158 = (*roughness_3);let _e159 = (*roughness_3);- a_4 = max((_e158 * _e159), 0.001f);+ a_5 = max((_e158 * _e159), 0.001f);let _e162 = (*N_3);let _e163 = (*V);NdotV_2 = max(dot(_e162, _e163), 0.0001f);let _e166 = (*N_3);- param_10 = _e166;- let _e167 = envIrradiance_u0028_vf3_u003b((¶m_10));+ param_11 = _e166;+ let _e167 = envIrradiance_u0028_vf3_u003b((¶m_11));let _e168 = (*ao);lit = (_e167 * _e168);gloss = vec3<f32>(0f, 0f, 0f);@@ -771,25 +800,25 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e190 = pd_1[2u];if (_e190 < 0.5f) {let _e192 = pd_1;- param_11 = _e192;+ param_12 = _e192;let _e193 = sh_3;- param_12 = _e193;+ param_13 = _e193;let _e194 = (*worldPos_3);- param_13 = _e194;- let _e195 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_11), (¶m_12), (¶m_13));+ param_14 = _e194;+ let _e195 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_12), (¶m_13), (¶m_14));toL = _e195;let _e196 = toL;- param_14 = _e196;- let _e197 = lightDistance_u0028_vf3_u003b((¶m_14));+ param_15 = _e196;+ let _e197 = lightDistance_u0028_vf3_u003b((¶m_15));dist_1 = _e197;let _e198 = dist_1;let _e200 = pd_1[3u];atten = max(0f, (1f - (_e198 / max(_e200, 0.0001f))));let _e205 = toL;- param_15 = _e205;+ param_16 = _e205;let _e206 = (*N_3);- param_16 = _e206;- let _e207 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_15), (¶m_16));+ param_17 = _e206;+ let _e207 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_16), (¶m_17));L_1 = _e207;} else {let _e209 = pd_1[2u];@@ -811,13 +840,13 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0toLight_3 = _e230;let _e232 = sh_3[1u];let _e233 = (_e232 > 0f);- phi_915_ = _e233;+ phi_956_ = _e233;if _e233 {let _e234 = toLight_3;let _e235 = toLight_3;- phi_915_ = (dot(_e234, _e235) > 0.5f);+ phi_956_ = (dot(_e234, _e235) > 0.5f);}- let _e239 = phi_915_;+ let _e239 = phi_956_;castShadow = _e239;let _e240 = (*worldPos_3);let _e242 = toLight_3;@@ -828,55 +857,55 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e251 = unnamed_1.u_lights[_e247].spot;sp_1 = _e251;let _e252 = pd_1;- param_17 = _e252;+ param_18 = _e252;let _e253 = sh_3;- param_18 = _e253;+ param_19 = _e253;let _e254 = (*worldPos_3);- param_19 = _e254;- let _e255 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_17), (¶m_18), (¶m_19));+ param_20 = _e254;+ let _e255 = lightVector_u0028_vf4_u003b_vf4_u003b_vf3_u003b((¶m_18), (¶m_19), (¶m_20));toL_1 = _e255;let _e256 = toL_1;- param_20 = _e256;- let _e257 = lightDistance_u0028_vf3_u003b((¶m_20));+ param_21 = _e256;+ let _e257 = lightDistance_u0028_vf3_u003b((¶m_21));dist_2 = _e257;let _e258 = dist_2;let _e260 = pd_1[3u];atten = max(0f, (1f - (_e258 / max(_e260, 0.0001f))));let _e265 = toL_1;- param_21 = _e265;+ param_22 = _e265;let _e266 = (*N_3);- param_22 = _e266;- let _e267 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_21), (¶m_22));+ param_23 = _e266;+ let _e267 = towardLight_u0028_vf3_u003b_vf3_u003b((¶m_22), (¶m_23));L_1 = _e267;let _e268 = sp_1;- param_23 = _e268;+ param_24 = _e268;let _e269 = sh_3;- param_24 = _e269;+ param_25 = _e269;let _e270 = toL_1;- param_25 = _e270;+ param_26 = _e270;let _e271 = dist_2;- param_26 = _e271;- let _e272 = spotCone_u0028_vf4_u003b_vf4_u003b_vf3_u003b_f1_u003b((¶m_23), (¶m_24), (¶m_25), (¶m_26));+ param_27 = _e271;+ let _e272 = spotCone_u0028_vf4_u003b_vf4_u003b_vf3_u003b_f1_u003b((¶m_24), (¶m_25), (¶m_26), (¶m_27));let _e273 = atten;atten = (_e273 * _e272);}}let _e275 = castShadow;- phi_969_ = _e275;+ phi_1010_ = _e275;if _e275 {let _e277 = col[3u];- phi_969_ = (_e277 > 0f);+ phi_1010_ = (_e277 > 0f);}- let _e280 = phi_969_;+ let _e280 = phi_1010_;let _e281 = atten;if (_e280 && (_e281 > 0f)) {let _e284 = (*worldPos_3);- param_27 = _e284.xy;+ param_28 = _e284.xy;let _e286 = target_1;- param_28 = _e286;+ param_29 = _e286;let _e288 = sh_3[0u];- param_29 = _e288;- let _e289 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_27), (¶m_28), (¶m_29));+ param_30 = _e288;+ let _e289 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_28), (¶m_29), (¶m_30));let _e290 = atten;atten = (_e290 * _e289);}@@ -891,15 +920,15 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0let _e309 = sm[0u];let _e312 = sm[1u];let _e314 = (*worldPos_3);- param_30 = _e314;+ param_31 = _e314;let _e315 = (*N_3);- param_31 = _e315;+ param_32 = _e315;let _e316 = L_1;- param_32 = _e316;- param_33 = vec2<f32>(_e304, _e306);- param_34 = i32(_e309);- param_35 = i32(_e312);- let _e317 = shadowFactor3D_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf2_u003b_i1_u003b_i1_u003b((¶m_30), (¶m_31), (¶m_32), (¶m_33), (¶m_34), (¶m_35));+ param_33 = _e316;+ param_34 = vec2<f32>(_e304, _e306);+ param_35 = i32(_e309);+ param_36 = i32(_e312);+ let _e317 = shadowFactor3D_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf2_u003b_i1_u003b_i1_u003b((¶m_31), (¶m_32), (¶m_33), (¶m_34), (¶m_35), (¶m_36));let _e318 = atten;atten = (_e318 * _e317);}@@ -921,27 +950,27 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0H = normalize((_e338 + _e339));let _e342 = (*N_3);let _e343 = H;- param_36 = max(dot(_e342, _e343), 0f);- let _e346 = a_4;- param_37 = _e346;- let _e347 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_36), (¶m_37));+ param_37 = max(dot(_e342, _e343), 0f);+ let _e346 = a_5;+ param_38 = _e346;+ let _e347 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_37), (¶m_38));let _e348 = NdotV_2;- param_38 = _e348;+ param_39 = _e348;let _e349 = ndotl;- param_39 = _e349;+ param_40 = _e349;let _e350 = (*roughness_3);- param_40 = _e350;- let _e351 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_38), (¶m_39), (¶m_40));+ param_41 = _e350;+ let _e351 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_39), (¶m_40), (¶m_41));let _e353 = NdotV_2;let _e355 = ndotl;brdf = ((_e347 * _e351) / max(((4f * _e353) * _e355), 0.0001f));let _e359 = radiance;let _e360 = (*V);let _e361 = H;- param_41 = max(dot(_e360, _e361), 0f);+ param_42 = max(dot(_e360, _e361), 0f);let _e364 = F0_1;- param_42 = _e364;- let _e365 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_41), (¶m_42));+ param_43 = _e364;+ let _e365 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_42), (¶m_43));let _e367 = brdf;let _e369 = (*specular);let _e372 = gloss;@@ -957,17 +986,17 @@ fn applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u0}}let _e376 = NdotV_2;- param_43 = _e376;+ param_44 = _e376;let _e377 = (*roughness_3);- param_44 = _e377;- let _e378 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_43), (¶m_44));+ param_45 = _e377;+ let _e378 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_44), (¶m_45));ab = _e378;let _e379 = (*V);let _e381 = (*N_3);- param_45 = reflect(-(_e379), _e381);+ param_46 = reflect(-(_e379), _e381);let _e383 = (*roughness_3);- param_46 = _e383;- let _e384 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_45), (¶m_46));+ param_47 = _e383;+ let _e384 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_46), (¶m_47));let _e385 = (*ao);let _e386 = (*specular);let _e389 = F0_1;@@ -1000,51 +1029,51 @@ fn viewDirection_u0028_vf3_u003b(worldPos_4: ptr<function, vec3<f32>>) -> vec3<ffn applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b(albedo_1: ptr<function, vec3<f32>>, N_4: ptr<function, vec3<f32>>, worldPos_5: ptr<function, vec2<f32>>, ao_1: ptr<function, f32>) -> vec3<f32> {var P: vec3<f32>;- var param_47: vec3<f32>;var param_48: vec3<f32>;var param_49: vec3<f32>;var param_50: vec3<f32>;var param_51: vec3<f32>;- var param_52: f32;+ var param_52: vec3<f32>;var param_53: f32;var param_54: f32;var param_55: f32;+ var param_56: f32;let _e97 = (*worldPos_5);P = vec3<f32>(_e97.x, _e97.y, 0f);let _e101 = P;- param_47 = _e101;- let _e102 = viewDirection_u0028_vf3_u003b((¶m_47));+ param_48 = _e101;+ let _e102 = viewDirection_u0028_vf3_u003b((¶m_48));let _e103 = (*albedo_1);- param_48 = _e103;+ param_49 = _e103;let _e104 = (*N_4);- param_49 = _e104;+ param_50 = _e104;let _e105 = P;- param_50 = _e105;- param_51 = _e102;- param_52 = 0f;- param_53 = 1f;- param_54 = 0f;+ param_51 = _e105;+ param_52 = _e102;+ param_53 = 0f;+ param_54 = 1f;+ param_55 = 0f;let _e106 = (*ao_1);- param_55 = _e106;- let _e107 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_48), (¶m_49), (¶m_50), (¶m_51), (¶m_52), (¶m_53), (¶m_54), (¶m_55));+ param_56 = _e106;+ let _e107 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_49), (¶m_50), (¶m_51), (¶m_52), (¶m_53), (¶m_54), (¶m_55), (¶m_56));return _e107;}fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo_2: ptr<function, vec3<f32>>, N_5: ptr<function, vec3<f32>>, worldPos_6: ptr<function, vec2<f32>>) -> vec3<f32> {- var param_56: vec3<f32>;var param_57: vec3<f32>;- var param_58: vec2<f32>;- var param_59: f32;+ var param_58: vec3<f32>;+ var param_59: vec2<f32>;+ var param_60: f32;let _e90 = (*albedo_2);- param_56 = _e90;+ param_57 = _e90;let _e91 = (*N_5);- param_57 = _e91;+ param_58 = _e91;let _e92 = (*worldPos_6);- param_58 = _e92;- param_59 = 1f;- let _e93 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_56), (¶m_57), (¶m_58), (¶m_59));+ param_59 = _e92;+ param_60 = 1f;+ let _e93 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_57), (¶m_58), (¶m_59), (¶m_60));return _e93;}@@ -1052,9 +1081,9 @@ fn main_1() {var base: vec4<f32>;var N_6: vec3<f32>;var lit_1: vec3<f32>;- var param_60: vec3<f32>;var param_61: vec3<f32>;- var param_62: vec2<f32>;+ var param_62: vec3<f32>;+ var param_63: vec2<f32>;let _e89 = v_texCoord_1;let _e90 = textureSample(es_bt0_est, es_bt0_ess, _e89);@@ -1062,12 +1091,12 @@ fn main_1() {base = (_e90 * _e91);N_6 = vec3<f32>(0f, 0f, 1f);let _e93 = base;- param_60 = _e93.xyz;+ param_61 = _e93.xyz;let _e95 = N_6;- param_61 = _e95;+ param_62 = _e95;let _e96 = v_worldPos_1;- param_62 = _e96;- let _e97 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_60), (¶m_61), (¶m_62));+ param_63 = _e96;+ let _e97 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_61), (¶m_62), (¶m_63));lit_1 = _e97;let _e98 = lit_1;let _e100 = base[3u];