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
fix(render): a lit shader can be given a WGSL twin again
yhh59f2a6df550c
diff --git a/desktop/public/scenes/mat-graph/graph-tint.esshader b/desktop/public/scenes/mat-graph/graph-tint.esshaderindex ef852a3ce..d08118a71 100644--- a/desktop/public/scenes/mat-graph/graph-tint.esshader+++ b/desktop/public/scenes/mat-graph/graph-tint.esshader@@ -38,7 +38,7 @@ void main() {#pragma vertex wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 77f2e407b566eb7e+// source-hash: 67f8bff89c3862afstruct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -46,6 +46,7 @@ struct gl_PerVertex {struct FrameConstants {u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,}struct TimeConstants {@@ -109,11 +110,16 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,#pragma fragment wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 77f2e407b566eb7e+// source-hash: 67f8bff89c3862afstruct MaterialConstants {u_tint: vec4<f32>,}+struct FrameConstants {+ u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,+}+struct TimeConstants {u_time: vec4<f32>,u_viewport: vec4<f32>,@@ -127,22 +133,24 @@ var<private> v_texCoord_1: vec2<f32>;@group(0) @binding(1)var<uniform> unnamed: MaterialConstants;var<private> fragColor: vec4<f32>;+@group(0) @binding(0)+var<uniform> unnamed_1: FrameConstants;@group(0) @binding(3)-var<uniform> unnamed_1: TimeConstants;+var<uniform> unnamed_2: TimeConstants;var<private> v_color_1: vec4<f32>;fn main_1() {var n0_: vec4<f32>;var n1_: vec4<f32>;- let _e10 = v_texCoord_1;- let _e11 = textureSample(u_albedo_est, u_albedo_ess, _e10);- n0_ = _e11;- let _e12 = n0_;- let _e14 = unnamed.u_tint;- n1_ = (_e12 * _e14);- let _e16 = n1_;- fragColor = _e16;+ let _e11 = v_texCoord_1;+ let _e12 = textureSample(u_albedo_est, u_albedo_ess, _e11);+ n0_ = _e12;+ let _e13 = n0_;+ let _e15 = unnamed.u_tint;+ n1_ = (_e13 * _e15);+ let _e17 = n1_;+ fragColor = _e17;return;}diff --git a/desktop/public/scenes/mat-lit-flatnormal/lit-fn.esshader b/desktop/public/scenes/mat-lit-flatnormal/lit-fn.esshaderindex e0c5a7a58..7e52cae6d 100644--- a/desktop/public/scenes/mat-lit-flatnormal/lit-fn.esshader+++ b/desktop/public/scenes/mat-lit-flatnormal/lit-fn.esshader@@ -46,7 +46,7 @@ void main() {#pragma vertex wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 9f6f72d3305a8095+// source-hash: 01a4bc3e793ceb2estruct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -54,6 +54,7 @@ struct gl_PerVertex {struct FrameConstants {u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,}struct TimeConstants {@@ -116,7 +117,12 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,#pragma fragment wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 9f6f72d3305a8095+// source-hash: 01a4bc3e793ceb2e+struct FrameConstants {+ u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,+}+struct Light2D {posDir: vec4<f32>,color: vec4<f32>,@@ -129,6 +135,11 @@ struct LightConstants {u_lights: array<Light2D, 16>,u_occluderCount: vec4<f32>,u_occluders: array<vec4<f32>, 8>,+ u_shadowMatrix: mat4x4<f32>,+ u_shadowParams: vec4<f32>,+ u_envIrradiance: array<vec4<f32>, 9>,+ u_envParams: vec4<f32>,+ u_envTint: vec4<f32>,}struct TimeConstants {@@ -136,8 +147,10 @@ struct TimeConstants {u_viewport: vec4<f32>,}+@group(0) @binding(0)+var<uniform> unnamed: FrameConstants;@group(0) @binding(2)-var<uniform> unnamed: LightConstants;+var<uniform> unnamed_1: LightConstants;@group(1) @binding(0)var es_bt0_est: texture_2d<f32>;@group(1) @binding(8)@@ -151,7 +164,7 @@ var u_normal_ess: sampler;var<private> v_worldPos_1: vec2<f32>;var<private> fragColor: vec4<f32>;@group(0) @binding(3)-var<uniform> unnamed_1: TimeConstants;+var<uniform> unnamed_2: TimeConstants;@group(1) @binding(1)var es_bt1_est: texture_2d<f32>;@group(1) @binding(9)@@ -181,128 +194,236 @@ var es_bt7_est: texture_2d<f32>;@group(1) @binding(15)var es_bt7_ess: sampler;+fn envSampleMip_u0028_vf3_u003b_f1_u003b(R: ptr<function, vec3<f32>>, mip: ptr<function, f32>) -> vec3<f32> {+ return vec3<f32>(0f, 0f, 0f);+}++fn envRadiance_u0028_vf3_u003b_f1_u003b(R_1: ptr<function, vec3<f32>>, roughness: ptr<function, f32>) -> vec3<f32> {+ var lod: f32;+ var lo: f32;+ var a: vec3<f32>;+ var param: vec3<f32>;+ var param_1: f32;+ var b: vec3<f32>;+ var param_2: vec3<f32>;+ var param_3: f32;++ let _e93 = unnamed_1.u_envParams[0u];+ if (_e93 < 0.5f) {+ let _e96 = unnamed_1.u_ambient;+ return _e96.xyz;+ }+ let _e98 = (*roughness);+ let _e102 = unnamed_1.u_envParams[2u];+ lod = (clamp(_e98, 0f, 1f) * _e102);+ let _e104 = lod;+ lo = floor(_e104);+ let _e106 = (*R_1);+ param = _e106;+ let _e107 = lo;+ param_1 = _e107;+ let _e108 = envSampleMip_u0028_vf3_u003b_f1_u003b((¶m), (¶m_1));+ a = _e108;+ let _e109 = lo;+ let _e113 = unnamed_1.u_envParams[2u];+ let _e115 = (*R_1);+ param_2 = _e115;+ param_3 = min((_e109 + 1f), _e113);+ let _e116 = envSampleMip_u0028_vf3_u003b_f1_u003b((¶m_2), (¶m_3));+ b = _e116;+ let _e118 = unnamed_1.u_ambient;+ let _e120 = a;+ let _e121 = b;+ let _e122 = lod;+ let _e123 = lo;+ let _e128 = unnamed_1.u_envTint;+ return (_e118.xyz + (mix(_e120, _e121, vec3((_e122 - _e123))) * _e128.xyz));+}++fn envBRDFApprox_u0028_f1_u003b_f1_u003b(NdotV: ptr<function, f32>, roughness_1: ptr<function, f32>) -> vec2<f32> {+ var r: vec4<f32>;+ var a_1: f32;++ let _e85 = (*roughness_1);+ r = ((vec4<f32>(-1f, -0.0275f, -0.572f, 0.022f) * _e85) + vec4<f32>(1f, 0.0425f, 1.04f, -0.04f));+ let _e89 = r[0u];+ let _e91 = r[0u];+ let _e93 = (*NdotV);+ let _e98 = r[0u];+ let _e101 = r[1u];+ a_1 = ((min((_e89 * _e91), exp2((-9.28f * _e93))) * _e98) + _e101);+ let _e103 = a_1;+ let _e105 = r;+ return ((vec2<f32>(-1.04f, 1.04f) * _e103) + _e105.zw);+}++fn fresnelSchlick_u0028_f1_u003b_vf3_u003b(VdotH: ptr<function, f32>, F0_: ptr<function, vec3<f32>>) -> vec3<f32> {+ let _e83 = (*F0_);+ let _e84 = (*F0_);+ let _e86 = (*VdotH);+ return (_e83 + ((vec3<f32>(1f, 1f, 1f) - _e84) * pow((1f - _e86), 5f)));+}++fn geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b(NdotV_1: ptr<function, f32>, NdotL: ptr<function, f32>, roughness_2: ptr<function, f32>) -> f32 {+ var k: f32;++ let _e85 = (*roughness_2);+ let _e87 = (*roughness_2);+ k = (((_e85 + 1f) * (_e87 + 1f)) * 0.125f);+ let _e91 = (*NdotV_1);+ let _e92 = (*NdotV_1);+ let _e93 = k;+ let _e96 = k;+ let _e99 = (*NdotL);+ let _e100 = (*NdotL);+ let _e101 = k;+ let _e104 = k;+ return ((_e91 / ((_e92 * (1f - _e93)) + _e96)) * (_e99 / ((_e100 * (1f - _e101)) + _e104)));+}++fn distributionGGX_u0028_f1_u003b_f1_u003b(NdotH: ptr<function, f32>, a_2: ptr<function, f32>) -> f32 {+ var a2_: f32;+ var d: f32;++ let _e85 = (*a_2);+ let _e86 = (*a_2);+ a2_ = (_e85 * _e86);+ let _e88 = (*NdotH);+ let _e89 = (*NdotH);+ let _e91 = a2_;+ d = (((_e88 * _e89) * (_e91 - 1f)) + 1f);+ let _e95 = a2_;+ let _e96 = d;+ let _e98 = d;+ return (_e95 / max(((3.1415927f * _e96) * _e98), 0.0000001f));+}++fn shadowFactor3D_u0028_vf3_u003b(worldPos: ptr<function, vec3<f32>>) -> f32 {+ return 1f;+}+fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>, p1_: ptr<function, vec2<f32>>, box: ptr<function, vec4<f32>>) -> f32 {- var d: vec2<f32>;+ var d_1: vec2<f32>;var tmin: f32;var tmax: f32;- var a: i32;+ var a_3: i32;var da: f32;var local: f32;var p0a: f32;var local_1: f32;- var lo: f32;+ var lo_1: f32;var local_2: f32;var hi: f32;var local_3: f32;var t1_: f32;var t2_: f32;- var phi_73_: bool;- var phi_82_: bool;- var phi_91_: bool;-- let _e68 = (*p0_)[0u];- let _e70 = (*box)[0u];- let _e71 = (_e68 >= _e70);- phi_73_ = _e71;- if _e71 {- let _e73 = (*p0_)[1u];- let _e75 = (*box)[1u];- phi_73_ = (_e73 >= _e75);+ var phi_163_: bool;+ var phi_172_: bool;+ var phi_180_: bool;++ let _e99 = (*p0_)[0u];+ let _e101 = (*box)[0u];+ let _e102 = (_e99 >= _e101);+ phi_163_ = _e102;+ if _e102 {+ let _e104 = (*p0_)[1u];+ let _e106 = (*box)[1u];+ phi_163_ = (_e104 >= _e106);}- let _e78 = phi_73_;- phi_82_ = _e78;- if _e78 {- let _e80 = (*p0_)[0u];- let _e82 = (*box)[2u];- phi_82_ = (_e80 <= _e82);+ let _e109 = phi_163_;+ phi_172_ = _e109;+ if _e109 {+ let _e111 = (*p0_)[0u];+ let _e113 = (*box)[2u];+ phi_172_ = (_e111 <= _e113);}- let _e85 = phi_82_;- phi_91_ = _e85;- if _e85 {- let _e87 = (*p0_)[1u];- let _e89 = (*box)[3u];- phi_91_ = (_e87 <= _e89);+ let _e116 = phi_172_;+ phi_180_ = _e116;+ if _e116 {+ let _e118 = (*p0_)[1u];+ let _e120 = (*box)[3u];+ phi_180_ = (_e118 <= _e120);}- let _e92 = phi_91_;- if _e92 {+ let _e123 = phi_180_;+ if _e123 {return 0f;}- let _e93 = (*p1_);- let _e94 = (*p0_);- d = (_e93 - _e94);+ let _e124 = (*p1_);+ let _e125 = (*p0_);+ d_1 = (_e124 - _e125);tmin = 0f;tmax = 1f;- a = 0i;+ a_3 = 0i;loop {- let _e96 = a;- if (_e96 < 2i) {- let _e98 = a;- if (_e98 == 0i) {- let _e101 = d[0u];- local = _e101;+ let _e127 = a_3;+ if (_e127 < 2i) {+ let _e129 = a_3;+ if (_e129 == 0i) {+ let _e132 = d_1[0u];+ local = _e132;} else {- let _e103 = d[1u];- local = _e103;+ let _e134 = d_1[1u];+ local = _e134;}- let _e104 = local;- da = _e104;- let _e105 = a;- if (_e105 == 0i) {- let _e108 = (*p0_)[0u];- local_1 = _e108;+ let _e135 = local;+ da = _e135;+ let _e136 = a_3;+ if (_e136 == 0i) {+ let _e139 = (*p0_)[0u];+ local_1 = _e139;} else {- let _e110 = (*p0_)[1u];- local_1 = _e110;+ let _e141 = (*p0_)[1u];+ local_1 = _e141;}- let _e111 = local_1;- p0a = _e111;- let _e112 = a;- if (_e112 == 0i) {- let _e115 = (*box)[0u];- local_2 = _e115;+ let _e142 = local_1;+ p0a = _e142;+ let _e143 = a_3;+ if (_e143 == 0i) {+ let _e146 = (*box)[0u];+ local_2 = _e146;} else {- let _e117 = (*box)[1u];- local_2 = _e117;+ let _e148 = (*box)[1u];+ local_2 = _e148;}- let _e118 = local_2;- let _e119 = p0a;- lo = (_e118 - _e119);- let _e121 = a;- if (_e121 == 0i) {- let _e124 = (*box)[2u];- local_3 = _e124;+ let _e149 = local_2;+ let _e150 = p0a;+ lo_1 = (_e149 - _e150);+ let _e152 = a_3;+ if (_e152 == 0i) {+ let _e155 = (*box)[2u];+ local_3 = _e155;} else {- let _e126 = (*box)[3u];- local_3 = _e126;+ let _e157 = (*box)[3u];+ local_3 = _e157;}- let _e127 = local_3;- let _e128 = p0a;- hi = (_e127 - _e128);- let _e130 = da;- if (abs(_e130) < 0.00001f) {- let _e133 = lo;- let _e135 = hi;- if ((_e133 > 0f) || (_e135 < 0f)) {+ let _e158 = local_3;+ let _e159 = p0a;+ hi = (_e158 - _e159);+ let _e161 = da;+ if (abs(_e161) < 0.00001f) {+ let _e164 = lo_1;+ let _e166 = hi;+ if ((_e164 > 0f) || (_e166 < 0f)) {return 0f;}} else {- let _e138 = lo;- let _e139 = da;- t1_ = (_e138 / _e139);- let _e141 = hi;- let _e142 = da;- t2_ = (_e141 / _e142);- let _e144 = tmin;- let _e145 = t1_;- let _e146 = t2_;- tmin = max(_e144, min(_e145, _e146));- let _e149 = tmax;- let _e150 = t1_;- let _e151 = t2_;- tmax = min(_e149, max(_e150, _e151));- let _e154 = tmin;- let _e155 = tmax;- if (_e154 > _e155) {+ let _e169 = lo_1;+ let _e170 = da;+ t1_ = (_e169 / _e170);+ let _e172 = hi;+ let _e173 = da;+ t2_ = (_e172 / _e173);+ let _e175 = tmin;+ let _e176 = t1_;+ let _e177 = t2_;+ tmin = max(_e175, min(_e176, _e177));+ let _e180 = tmax;+ let _e181 = t1_;+ let _e182 = t2_;+ tmax = min(_e180, max(_e181, _e182));+ let _e185 = tmin;+ let _e186 = tmax;+ if (_e185 > _e186) {return 0f;}}@@ -311,19 +432,19 @@ fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>,break;}continuing {- let _e157 = a;- a = (_e157 + 1i);+ let _e188 = a_3;+ a_3 = (_e188 + 1i);}}return 1f;}-fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vec2<f32>>, target_: ptr<function, vec2<f32>>, softness: ptr<function, f32>) -> f32 {+fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos_1: ptr<function, vec2<f32>>, target_: ptr<function, vec2<f32>>, softness: ptr<function, f32>) -> f32 {var n: i32;var i: i32;- var param: vec2<f32>;- var param_1: vec2<f32>;- var param_2: vec4<f32>;+ var param_4: vec2<f32>;+ var param_5: vec2<f32>;+ var param_6: vec4<f32>;var dir: vec2<f32>;var dl: f32;var perp: vec2<f32>;@@ -333,36 +454,36 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecvar t: f32;var tp: vec2<f32>;var i_1: i32;- var param_3: vec2<f32>;- var param_4: vec2<f32>;- var param_5: vec4<f32>;+ var param_7: vec2<f32>;+ var param_8: vec2<f32>;+ var param_9: vec4<f32>;- let _e72 = unnamed.u_occluderCount[0u];- n = i32(_e72);- let _e74 = n;- if (_e74 <= 0i) {+ let _e103 = unnamed_1.u_occluderCount[0u];+ n = i32(_e103);+ let _e105 = n;+ if (_e105 <= 0i) {return 1f;}- let _e76 = (*softness);- if (_e76 < 0.0001f) {+ let _e107 = (*softness);+ if (_e107 < 0.0001f) {i = 0i;loop {- let _e78 = i;- if (_e78 < 8i) {- let _e80 = i;- let _e81 = n;- if (_e80 >= _e81) {+ let _e109 = i;+ if (_e109 < 8i) {+ let _e111 = i;+ let _e112 = n;+ if (_e111 >= _e112) {break;}- let _e83 = i;- let _e84 = (*worldPos);- param = _e84;- let _e85 = (*target_);- param_1 = _e85;- let _e88 = unnamed.u_occluders[_e83];- param_2 = _e88;- let _e89 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m), (¶m_1), (¶m_2));- if (_e89 > 0.5f) {+ let _e114 = i;+ let _e115 = (*worldPos_1);+ param_4 = _e115;+ let _e116 = (*target_);+ param_5 = _e116;+ let _e119 = unnamed_1.u_occluders[_e114];+ param_6 = _e119;+ let _e120 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m_4), (¶m_5), (¶m_6));+ if (_e120 > 0.5f) {return 0f;}continue;@@ -370,60 +491,60 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecbreak;}continuing {- let _e91 = i;- i = (_e91 + 1i);+ let _e122 = i;+ i = (_e122 + 1i);}}return 1f;}- let _e93 = (*target_);- let _e94 = (*worldPos);- dir = (_e93 - _e94);- let _e96 = dir;- dl = length(_e96);- let _e98 = dl;- if (_e98 > 0.0001f) {- let _e101 = dir[1u];- let _e104 = dir[0u];- let _e106 = dl;- local_4 = (vec2<f32>(-(_e101), _e104) / vec2(_e106));+ let _e124 = (*target_);+ let _e125 = (*worldPos_1);+ dir = (_e124 - _e125);+ let _e127 = dir;+ dl = length(_e127);+ let _e129 = dl;+ if (_e129 > 0.0001f) {+ let _e132 = dir[1u];+ let _e135 = dir[0u];+ let _e137 = dl;+ local_4 = (vec2<f32>(-(_e132), _e135) / vec2(_e137));} else {local_4 = vec2<f32>(1f, 0f);}- let _e109 = local_4;- perp = _e109;+ let _e140 = local_4;+ perp = _e140;blocked = 0f;s = 0i;loop {- let _e110 = s;- if (_e110 < 5i) {- let _e112 = s;- t = (((f32(_e112) / 4f) * 2f) - 1f);- let _e117 = (*target_);- let _e118 = perp;- let _e119 = t;- let _e120 = (*softness);- tp = (_e117 + (_e118 * (_e119 * _e120)));+ let _e141 = s;+ if (_e141 < 5i) {+ let _e143 = s;+ t = (((f32(_e143) / 4f) * 2f) - 1f);+ let _e148 = (*target_);+ let _e149 = perp;+ let _e150 = t;+ let _e151 = (*softness);+ tp = (_e148 + (_e149 * (_e150 * _e151)));i_1 = 0i;loop {- let _e124 = i_1;- if (_e124 < 8i) {- let _e126 = i_1;- let _e127 = n;- if (_e126 >= _e127) {+ let _e155 = i_1;+ if (_e155 < 8i) {+ let _e157 = i_1;+ let _e158 = n;+ if (_e157 >= _e158) {break;}- let _e129 = i_1;- let _e130 = (*worldPos);- param_3 = _e130;- let _e131 = tp;- param_4 = _e131;- let _e134 = unnamed.u_occluders[_e129];- param_5 = _e134;- let _e135 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m_3), (¶m_4), (¶m_5));- if (_e135 > 0.5f) {- let _e137 = blocked;- blocked = (_e137 + 1f);+ let _e160 = i_1;+ let _e161 = (*worldPos_1);+ param_7 = _e161;+ let _e162 = tp;+ param_8 = _e162;+ let _e165 = unnamed_1.u_occluders[_e160];+ param_9 = _e165;+ let _e166 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m_7), (¶m_8), (¶m_9));+ if (_e166 > 0.5f) {+ let _e168 = blocked;+ blocked = (_e168 + 1f);break;}continue;@@ -431,8 +552,8 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecbreak;}continuing {- let _e139 = i_1;- i_1 = (_e139 + 1i);+ let _e170 = i_1;+ i_1 = (_e170 + 1i);}}continue;@@ -440,212 +561,412 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecbreak;}continuing {- let _e141 = s;- s = (_e141 + 1i);+ let _e172 = s;+ s = (_e172 + 1i);}}- let _e143 = blocked;- return (1f - (_e143 / 5f));+ let _e174 = blocked;+ return (1f - (_e174 / 5f));+}++fn envIrradiance_u0028_vf3_u003b(N: ptr<function, vec3<f32>>) -> vec3<f32> {+ var sh: vec3<f32>;++ let _e85 = unnamed_1.u_envIrradiance[0i];+ let _e90 = unnamed_1.u_envIrradiance[1i];+ let _e93 = (*N)[1u];+ let _e99 = unnamed_1.u_envIrradiance[2i];+ let _e102 = (*N)[2u];+ let _e108 = unnamed_1.u_envIrradiance[3i];+ let _e111 = (*N)[0u];+ let _e117 = unnamed_1.u_envIrradiance[4i];+ let _e120 = (*N)[0u];+ let _e123 = (*N)[1u];+ let _e129 = unnamed_1.u_envIrradiance[5i];+ let _e132 = (*N)[1u];+ let _e135 = (*N)[2u];+ let _e141 = unnamed_1.u_envIrradiance[6i];+ let _e144 = (*N)[2u];+ let _e147 = (*N)[2u];+ let _e155 = unnamed_1.u_envIrradiance[7i];+ let _e158 = (*N)[0u];+ let _e161 = (*N)[2u];+ let _e167 = unnamed_1.u_envIrradiance[8i];+ let _e170 = (*N)[0u];+ let _e172 = (*N)[0u];+ let _e175 = (*N)[1u];+ let _e177 = (*N)[1u];+ sh = (((((((((_e85.xyz * 0.282095f) + (_e90.xyz * (0.488603f * _e93))) + (_e99.xyz * (0.488603f * _e102))) + (_e108.xyz * (0.488603f * _e111))) + (_e117.xyz * ((1.092548f * _e120) * _e123))) + (_e129.xyz * ((1.092548f * _e132) * _e135))) + (_e141.xyz * (0.315392f * (((3f * _e144) * _e147) - 1f)))) + (_e155.xyz * ((1.092548f * _e158) * _e161))) + (_e167.xyz * (0.546274f * ((_e170 * _e172) - (_e175 * _e177)))));+ let _e184 = unnamed_1.u_ambient;+ let _e186 = sh;+ let _e189 = unnamed_1.u_envTint;+ return (_e184.xyz + (max(_e186, vec3<f32>(0f, 0f, 0f)) * _e189.xyz));}-fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo: ptr<function, vec3<f32>>, N: ptr<function, vec3<f32>>, worldPos_1: ptr<function, vec2<f32>>) -> vec3<f32> {+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_1: ptr<function, vec3<f32>>, worldPos_2: 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 NdotV_2: f32;var lit: vec3<f32>;+ var param_10: vec3<f32>;+ var gloss: vec3<f32>;var i_2: i32;var pd: vec4<f32>;var col: vec4<f32>;- var sh: vec4<f32>;+ var sh_1: vec4<f32>;var target_1: vec2<f32>;var castShadow: bool;- var d_1: vec2<f32>;+ var d_2: vec2<f32>;var dist: f32;var atten: f32;var L: vec3<f32>;var toLight: vec2<f32>;var local_5: vec2<f32>;var sp: vec4<f32>;- var d_2: vec2<f32>;+ var d_3: vec2<f32>;var dist_1: f32;var toFrag: vec2<f32>;var local_6: vec2<f32>;- var param_6: vec2<f32>;- var param_7: vec2<f32>;- var param_8: f32;+ var param_11: vec2<f32>;+ var param_12: vec2<f32>;+ var param_13: f32;+ var param_14: vec3<f32>;var ndotl: f32;- var phi_458_: bool;- var phi_525_: bool;+ var radiance: vec3<f32>;+ var H: vec3<f32>;+ var brdf: f32;+ var param_15: f32;+ var param_16: f32;+ var param_17: f32;+ var param_18: f32;+ var param_19: f32;+ var param_20: f32;+ var param_21: vec3<f32>;+ var ab: vec2<f32>;+ var param_22: f32;+ var param_23: f32;+ var param_24: vec3<f32>;+ var param_25: f32;+ var phi_833_: bool;+ var phi_902_: bool;- let _e76 = unnamed.u_ambient;- lit = _e76.xyz;+ let _e132 = (*albedo);+ let _e133 = (*metallic);+ F0_1 = mix(vec3<f32>(0.04f, 0.04f, 0.04f), _e132, vec3(_e133));+ let _e136 = (*roughness_3);+ let _e137 = (*roughness_3);+ a_4 = max((_e136 * _e137), 0.001f);+ let _e140 = (*N_1);+ let _e141 = (*V);+ NdotV_2 = max(dot(_e140, _e141), 0.0001f);+ let _e144 = (*N_1);+ param_10 = _e144;+ let _e145 = envIrradiance_u0028_vf3_u003b((¶m_10));+ let _e146 = (*ao);+ lit = (_e145 * _e146);+ gloss = vec3<f32>(0f, 0f, 0f);i_2 = 0i;loop {- let _e78 = i_2;- if (_e78 < 16i) {- let _e80 = i_2;- let _e84 = unnamed.u_lights[_e80].posDir;- pd = _e84;- let _e85 = i_2;- let _e89 = unnamed.u_lights[_e85].color;- col = _e89;- let _e90 = i_2;- let _e94 = unnamed.u_lights[_e90].shadow;- sh = _e94;- let _e95 = pd;- target_1 = _e95.xy;+ let _e148 = i_2;+ if (_e148 < 16i) {+ let _e150 = i_2;+ let _e154 = unnamed_1.u_lights[_e150].posDir;+ pd = _e154;+ let _e155 = i_2;+ let _e159 = unnamed_1.u_lights[_e155].color;+ col = _e159;+ let _e160 = i_2;+ let _e164 = unnamed_1.u_lights[_e160].shadow;+ sh_1 = _e164;+ let _e165 = pd;+ target_1 = _e165.xy;castShadow = true;- let _e98 = pd[2u];- if (_e98 < 0.5f) {- let _e100 = pd;- let _e102 = (*worldPos_1);- d_1 = (_e100.xy - _e102);- let _e104 = d_1;- dist = length(_e104);- let _e106 = dist;- let _e108 = pd[3u];- atten = max(0f, (1f - (_e106 / max(_e108, 0.0001f))));- let _e113 = d_1;- let _e115 = pd[3u];- L = normalize(vec3<f32>(_e113.x, _e113.y, max(_e115, 1f)));+ let _e168 = pd[2u];+ if (_e168 < 0.5f) {+ let _e170 = pd;+ let _e172 = (*worldPos_2);+ d_2 = (_e170.xy - _e172.xy);+ let _e175 = d_2;+ dist = length(_e175);+ let _e177 = dist;+ let _e179 = pd[3u];+ atten = max(0f, (1f - (_e177 / max(_e179, 0.0001f))));+ let _e184 = d_2;+ let _e186 = pd[3u];+ L = normalize(vec3<f32>(_e184.x, _e184.y, max(_e186, 1f)));} else {- let _e122 = pd[2u];- if (_e122 < 1.5f) {+ let _e193 = pd[2u];+ if (_e193 < 1.5f) {atten = 1f;- let _e124 = pd;- let _e126 = -(_e124.xy);- L = normalize(vec3<f32>(_e126.x, _e126.y, 1f));- let _e131 = pd;- let _e133 = pd;- if (dot(_e131.xy, _e133.xy) > 0.00000001f) {- let _e137 = pd;- local_5 = normalize(-(_e137.xy));+ let _e195 = pd;+ let _e197 = -(_e195.xy);+ L = normalize(vec3<f32>(_e197.x, _e197.y, 1f));+ let _e202 = pd;+ let _e204 = pd;+ if (dot(_e202.xy, _e204.xy) > 0.00000001f) {+ let _e208 = pd;+ local_5 = normalize(-(_e208.xy));} else {local_5 = vec2<f32>(0f, 0f);}- let _e141 = local_5;- toLight = _e141;- let _e143 = sh[1u];- let _e144 = (_e143 > 0f);- phi_458_ = _e144;- if _e144 {- let _e145 = toLight;- let _e146 = toLight;- phi_458_ = (dot(_e145, _e146) > 0.5f);+ let _e212 = local_5;+ toLight = _e212;+ let _e214 = sh_1[1u];+ let _e215 = (_e214 > 0f);+ phi_833_ = _e215;+ if _e215 {+ let _e216 = toLight;+ let _e217 = toLight;+ phi_833_ = (dot(_e216, _e217) > 0.5f);}- let _e150 = phi_458_;- castShadow = _e150;- let _e151 = (*worldPos_1);- let _e152 = toLight;- let _e154 = sh[1u];- target_1 = (_e151 + (_e152 * _e154));+ let _e221 = phi_833_;+ castShadow = _e221;+ let _e222 = (*worldPos_2);+ let _e224 = toLight;+ let _e226 = sh_1[1u];+ target_1 = (_e222.xy + (_e224 * _e226));} else {- let _e157 = i_2;- let _e161 = unnamed.u_lights[_e157].spot;- sp = _e161;- let _e162 = pd;- let _e164 = (*worldPos_1);- d_2 = (_e162.xy - _e164);- let _e166 = d_2;- dist_1 = length(_e166);- let _e168 = dist_1;- let _e170 = pd[3u];- atten = max(0f, (1f - (_e168 / max(_e170, 0.0001f))));- let _e175 = d_2;- let _e177 = pd[3u];- L = normalize(vec3<f32>(_e175.x, _e175.y, max(_e177, 1f)));- let _e183 = dist_1;- if (_e183 > 0.0001f) {- let _e185 = d_2;- let _e187 = dist_1;- local_6 = (-(_e185) / vec2(_e187));+ let _e229 = i_2;+ let _e233 = unnamed_1.u_lights[_e229].spot;+ sp = _e233;+ let _e234 = pd;+ let _e236 = (*worldPos_2);+ d_3 = (_e234.xy - _e236.xy);+ let _e239 = d_3;+ dist_1 = length(_e239);+ let _e241 = dist_1;+ let _e243 = pd[3u];+ atten = max(0f, (1f - (_e241 / max(_e243, 0.0001f))));+ let _e248 = d_3;+ let _e250 = pd[3u];+ L = normalize(vec3<f32>(_e248.x, _e248.y, max(_e250, 1f)));+ let _e256 = dist_1;+ if (_e256 > 0.0001f) {+ let _e258 = d_3;+ let _e260 = dist_1;+ local_6 = (-(_e258) / vec2(_e260));} else {- let _e190 = sp;- local_6 = _e190.xy;+ let _e263 = sp;+ local_6 = _e263.xy;}- let _e192 = local_6;- toFrag = _e192;- let _e194 = sp[3u];- let _e196 = sp[2u];- let _e197 = sp;- let _e199 = toFrag;- let _e202 = atten;- atten = (_e202 * smoothstep(_e194, _e196, dot(_e197.xy, _e199)));+ let _e265 = local_6;+ toFrag = _e265;+ let _e267 = sp[3u];+ let _e269 = sp[2u];+ let _e270 = sp;+ let _e272 = toFrag;+ let _e275 = atten;+ atten = (_e275 * smoothstep(_e267, _e269, dot(_e270.xy, _e272)));}}- let _e204 = castShadow;- phi_525_ = _e204;- if _e204 {- let _e206 = col[3u];- phi_525_ = (_e206 > 0f);+ let _e277 = castShadow;+ phi_902_ = _e277;+ if _e277 {+ let _e279 = col[3u];+ phi_902_ = (_e279 > 0f);+ }+ let _e282 = phi_902_;+ let _e283 = atten;+ if (_e282 && (_e283 > 0f)) {+ let _e286 = (*worldPos_2);+ param_11 = _e286.xy;+ let _e288 = target_1;+ param_12 = _e288;+ let _e290 = sh_1[0u];+ param_13 = _e290;+ let _e291 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_11), (¶m_12), (¶m_13));+ let _e292 = atten;+ atten = (_e292 * _e291);}- let _e209 = phi_525_;- let _e210 = atten;- if (_e209 && (_e210 > 0f)) {- let _e213 = (*worldPos_1);- param_6 = _e213;- let _e214 = target_1;- param_7 = _e214;- let _e216 = sh[0u];- param_8 = _e216;- let _e217 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_6), (¶m_7), (¶m_8));- let _e218 = atten;- atten = (_e218 * _e217);+ let _e294 = i_2;+ let _e298 = unnamed_1.u_shadowParams[3u];+ let _e300 = atten;+ if ((f32(_e294) == _e298) && (_e300 > 0f)) {+ let _e303 = (*worldPos_2);+ param_14 = _e303;+ let _e304 = shadowFactor3D_u0028_vf3_u003b((¶m_14));+ let _e305 = atten;+ atten = (_e305 * _e304);+ }+ let _e307 = (*N_1);+ let _e308 = L;+ ndotl = max(dot(_e307, _e308), 0f);+ let _e311 = col;+ let _e314 = col[3u];+ let _e315 = ndotl;+ let _e317 = atten;+ radiance = (_e311.xyz * ((_e314 * _e315) * _e317));+ let _e320 = radiance;+ let _e321 = lit;+ lit = (_e321 + _e320);+ let _e323 = (*specular);+ if (_e323 > 0f) {+ let _e325 = L;+ let _e326 = (*V);+ H = normalize((_e325 + _e326));+ let _e329 = (*N_1);+ let _e330 = H;+ param_15 = max(dot(_e329, _e330), 0f);+ let _e333 = a_4;+ param_16 = _e333;+ let _e334 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_15), (¶m_16));+ let _e335 = NdotV_2;+ param_17 = _e335;+ let _e336 = ndotl;+ param_18 = _e336;+ let _e337 = (*roughness_3);+ param_19 = _e337;+ let _e338 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_17), (¶m_18), (¶m_19));+ let _e340 = NdotV_2;+ let _e342 = ndotl;+ brdf = ((_e334 * _e338) / max(((4f * _e340) * _e342), 0.0001f));+ let _e346 = radiance;+ let _e347 = (*V);+ let _e348 = H;+ param_20 = max(dot(_e347, _e348), 0f);+ let _e351 = F0_1;+ param_21 = _e351;+ let _e352 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_20), (¶m_21));+ let _e354 = brdf;+ let _e356 = (*specular);+ let _e359 = gloss;+ gloss = (_e359 + ((_e346 * _e352) * ((_e354 * 3.1415927f) * _e356)));}- let _e220 = (*N);- let _e221 = L;- ndotl = max(dot(_e220, _e221), 0f);- let _e224 = col;- let _e227 = col[3u];- let _e228 = ndotl;- let _e230 = atten;- let _e233 = lit;- lit = (_e233 + (_e224.xyz * ((_e227 * _e228) * _e230)));continue;} else {break;}continuing {- let _e235 = i_2;- i_2 = (_e235 + 1i);+ let _e361 = i_2;+ i_2 = (_e361 + 1i);}}- let _e237 = (*albedo);- let _e238 = lit;- return (_e237 * _e238);+ let _e363 = NdotV_2;+ param_22 = _e363;+ let _e364 = (*roughness_3);+ param_23 = _e364;+ let _e365 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_22), (¶m_23));+ ab = _e365;+ let _e366 = (*V);+ let _e368 = (*N_1);+ param_24 = reflect(-(_e366), _e368);+ let _e370 = (*roughness_3);+ param_25 = _e370;+ let _e371 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_24), (¶m_25));+ let _e372 = (*ao);+ let _e373 = (*specular);+ let _e376 = F0_1;+ let _e378 = ab[0u];+ let _e381 = ab[1u];+ let _e385 = gloss;+ gloss = (_e385 + ((_e371 * (_e372 * _e373)) * ((_e376 * _e378) + vec3(_e381))));+ let _e387 = (*albedo);+ let _e388 = (*metallic);+ let _e391 = lit;+ let _e393 = gloss;+ return (((_e387 * (1f - _e388)) * _e391) + _e393);+}++fn viewDirection_u0028_vf3_u003b(worldPos_3: ptr<function, vec3<f32>>) -> vec3<f32> {+ var local_7: vec3<f32>;++ let _e85 = unnamed.u_camera[3u];+ if (_e85 > 0.5f) {+ let _e88 = unnamed.u_camera;+ let _e90 = (*worldPos_3);+ local_7 = normalize((_e88.xyz - _e90));+ } else {+ let _e94 = unnamed.u_camera;+ local_7 = _e94.xyz;+ }+ let _e96 = local_7;+ return _e96;+}++fn applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b(albedo_1: ptr<function, vec3<f32>>, N_2: ptr<function, vec3<f32>>, worldPos_4: ptr<function, vec2<f32>>, ao_1: ptr<function, f32>) -> vec3<f32> {+ var P: vec3<f32>;+ var param_26: vec3<f32>;+ var param_27: vec3<f32>;+ var param_28: vec3<f32>;+ var param_29: vec3<f32>;+ var param_30: vec3<f32>;+ var param_31: f32;+ var param_32: f32;+ var param_33: f32;+ var param_34: f32;++ let _e95 = (*worldPos_4);+ P = vec3<f32>(_e95.x, _e95.y, 0f);+ let _e99 = P;+ param_26 = _e99;+ let _e100 = viewDirection_u0028_vf3_u003b((¶m_26));+ let _e101 = (*albedo_1);+ param_27 = _e101;+ let _e102 = (*N_2);+ param_28 = _e102;+ let _e103 = P;+ param_29 = _e103;+ param_30 = _e100;+ param_31 = 0f;+ param_32 = 1f;+ param_33 = 0f;+ let _e104 = (*ao_1);+ param_34 = _e104;+ let _e105 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_27), (¶m_28), (¶m_29), (¶m_30), (¶m_31), (¶m_32), (¶m_33), (¶m_34));+ return _e105;+}++fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo_2: ptr<function, vec3<f32>>, N_3: ptr<function, vec3<f32>>, worldPos_5: ptr<function, vec2<f32>>) -> vec3<f32> {+ var param_35: vec3<f32>;+ var param_36: vec3<f32>;+ var param_37: vec2<f32>;+ var param_38: f32;++ let _e88 = (*albedo_2);+ param_35 = _e88;+ let _e89 = (*N_3);+ param_36 = _e89;+ let _e90 = (*worldPos_5);+ param_37 = _e90;+ param_38 = 1f;+ let _e91 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_35), (¶m_36), (¶m_37), (¶m_38));+ return _e91;}fn sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(map_est: texture_2d<f32>, map_ess: sampler, uv: ptr<function, vec2<f32>>) -> vec3<f32> {- let _e53 = (*uv);- let _e54 = textureSample(map_est, map_ess, _e53);- return normalize(((_e54.xyz * 2f) - vec3(1f)));+ let _e84 = (*uv);+ let _e85 = textureSample(map_est, map_ess, _e84);+ return normalize(((_e85.xyz * 2f) - vec3(1f)));}fn main_1() {var base: vec4<f32>;- var N_1: vec3<f32>;- var param_9: vec2<f32>;+ var N_4: vec3<f32>;+ var param_39: vec2<f32>;var lit_1: vec3<f32>;- var param_10: vec3<f32>;- var param_11: vec3<f32>;- var param_12: vec2<f32>;+ var param_40: vec3<f32>;+ var param_41: vec3<f32>;+ var param_42: vec2<f32>;- let _e57 = v_texCoord_1;- let _e58 = textureSample(es_bt0_est, es_bt0_ess, _e57);- let _e59 = v_color_1;- base = (_e58 * _e59);- let _e61 = v_texCoord_1;- param_9 = _e61;- let _e62 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normal_est, u_normal_ess, (¶m_9));- N_1 = _e62;- let _e63 = base;- param_10 = _e63.xyz;- let _e65 = N_1;- param_11 = _e65;- let _e66 = v_worldPos_1;- param_12 = _e66;- let _e67 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_10), (¶m_11), (¶m_12));- lit_1 = _e67;- let _e68 = lit_1;- let _e70 = base[3u];- fragColor = vec4<f32>(_e68.x, _e68.y, _e68.z, _e70);+ let _e88 = v_texCoord_1;+ let _e89 = textureSample(es_bt0_est, es_bt0_ess, _e88);+ let _e90 = v_color_1;+ base = (_e89 * _e90);+ let _e92 = v_texCoord_1;+ param_39 = _e92;+ let _e93 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normal_est, u_normal_ess, (¶m_39));+ N_4 = _e93;+ let _e94 = base;+ param_40 = _e94.xyz;+ let _e96 = N_4;+ param_41 = _e96;+ let _e97 = v_worldPos_1;+ param_42 = _e97;+ let _e98 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_40), (¶m_41), (¶m_42));+ lit_1 = _e98;+ let _e99 = lit_1;+ let _e101 = base[3u];+ fragColor = vec4<f32>(_e99.x, _e99.y, _e99.z, _e101);return;}diff --git a/desktop/public/scenes/mat-lit-normal/lit-normal.esshader b/desktop/public/scenes/mat-lit-normal/lit-normal.esshaderindex 2e9b043ad..08cbc0b0a 100644--- a/desktop/public/scenes/mat-lit-normal/lit-normal.esshader+++ b/desktop/public/scenes/mat-lit-normal/lit-normal.esshader@@ -46,7 +46,7 @@ void main() {#pragma vertex wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: f57699ab81142289+// source-hash: 25277537fdff67e5struct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -54,6 +54,7 @@ struct gl_PerVertex {struct FrameConstants {u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,}struct TimeConstants {@@ -116,7 +117,12 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,#pragma fragment wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: f57699ab81142289+// source-hash: 25277537fdff67e5+struct FrameConstants {+ u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,+}+struct Light2D {posDir: vec4<f32>,color: vec4<f32>,@@ -129,6 +135,11 @@ struct LightConstants {u_lights: array<Light2D, 16>,u_occluderCount: vec4<f32>,u_occluders: array<vec4<f32>, 8>,+ u_shadowMatrix: mat4x4<f32>,+ u_shadowParams: vec4<f32>,+ u_envIrradiance: array<vec4<f32>, 9>,+ u_envParams: vec4<f32>,+ u_envTint: vec4<f32>,}struct TimeConstants {@@ -136,8 +147,10 @@ struct TimeConstants {u_viewport: vec4<f32>,}+@group(0) @binding(0)+var<uniform> unnamed: FrameConstants;@group(0) @binding(2)-var<uniform> unnamed: LightConstants;+var<uniform> unnamed_1: LightConstants;@group(1) @binding(0)var es_bt0_est: texture_2d<f32>;@group(1) @binding(8)@@ -151,7 +164,7 @@ var u_normal_ess: sampler;var<private> v_worldPos_1: vec2<f32>;var<private> fragColor: vec4<f32>;@group(0) @binding(3)-var<uniform> unnamed_1: TimeConstants;+var<uniform> unnamed_2: TimeConstants;@group(1) @binding(1)var es_bt1_est: texture_2d<f32>;@group(1) @binding(9)@@ -181,128 +194,236 @@ var es_bt7_est: texture_2d<f32>;@group(1) @binding(15)var es_bt7_ess: sampler;+fn envSampleMip_u0028_vf3_u003b_f1_u003b(R: ptr<function, vec3<f32>>, mip: ptr<function, f32>) -> vec3<f32> {+ return vec3<f32>(0f, 0f, 0f);+}++fn envRadiance_u0028_vf3_u003b_f1_u003b(R_1: ptr<function, vec3<f32>>, roughness: ptr<function, f32>) -> vec3<f32> {+ var lod: f32;+ var lo: f32;+ var a: vec3<f32>;+ var param: vec3<f32>;+ var param_1: f32;+ var b: vec3<f32>;+ var param_2: vec3<f32>;+ var param_3: f32;++ let _e93 = unnamed_1.u_envParams[0u];+ if (_e93 < 0.5f) {+ let _e96 = unnamed_1.u_ambient;+ return _e96.xyz;+ }+ let _e98 = (*roughness);+ let _e102 = unnamed_1.u_envParams[2u];+ lod = (clamp(_e98, 0f, 1f) * _e102);+ let _e104 = lod;+ lo = floor(_e104);+ let _e106 = (*R_1);+ param = _e106;+ let _e107 = lo;+ param_1 = _e107;+ let _e108 = envSampleMip_u0028_vf3_u003b_f1_u003b((¶m), (¶m_1));+ a = _e108;+ let _e109 = lo;+ let _e113 = unnamed_1.u_envParams[2u];+ let _e115 = (*R_1);+ param_2 = _e115;+ param_3 = min((_e109 + 1f), _e113);+ let _e116 = envSampleMip_u0028_vf3_u003b_f1_u003b((¶m_2), (¶m_3));+ b = _e116;+ let _e118 = unnamed_1.u_ambient;+ let _e120 = a;+ let _e121 = b;+ let _e122 = lod;+ let _e123 = lo;+ let _e128 = unnamed_1.u_envTint;+ return (_e118.xyz + (mix(_e120, _e121, vec3((_e122 - _e123))) * _e128.xyz));+}++fn envBRDFApprox_u0028_f1_u003b_f1_u003b(NdotV: ptr<function, f32>, roughness_1: ptr<function, f32>) -> vec2<f32> {+ var r: vec4<f32>;+ var a_1: f32;++ let _e85 = (*roughness_1);+ r = ((vec4<f32>(-1f, -0.0275f, -0.572f, 0.022f) * _e85) + vec4<f32>(1f, 0.0425f, 1.04f, -0.04f));+ let _e89 = r[0u];+ let _e91 = r[0u];+ let _e93 = (*NdotV);+ let _e98 = r[0u];+ let _e101 = r[1u];+ a_1 = ((min((_e89 * _e91), exp2((-9.28f * _e93))) * _e98) + _e101);+ let _e103 = a_1;+ let _e105 = r;+ return ((vec2<f32>(-1.04f, 1.04f) * _e103) + _e105.zw);+}++fn fresnelSchlick_u0028_f1_u003b_vf3_u003b(VdotH: ptr<function, f32>, F0_: ptr<function, vec3<f32>>) -> vec3<f32> {+ let _e83 = (*F0_);+ let _e84 = (*F0_);+ let _e86 = (*VdotH);+ return (_e83 + ((vec3<f32>(1f, 1f, 1f) - _e84) * pow((1f - _e86), 5f)));+}++fn geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b(NdotV_1: ptr<function, f32>, NdotL: ptr<function, f32>, roughness_2: ptr<function, f32>) -> f32 {+ var k: f32;++ let _e85 = (*roughness_2);+ let _e87 = (*roughness_2);+ k = (((_e85 + 1f) * (_e87 + 1f)) * 0.125f);+ let _e91 = (*NdotV_1);+ let _e92 = (*NdotV_1);+ let _e93 = k;+ let _e96 = k;+ let _e99 = (*NdotL);+ let _e100 = (*NdotL);+ let _e101 = k;+ let _e104 = k;+ return ((_e91 / ((_e92 * (1f - _e93)) + _e96)) * (_e99 / ((_e100 * (1f - _e101)) + _e104)));+}++fn distributionGGX_u0028_f1_u003b_f1_u003b(NdotH: ptr<function, f32>, a_2: ptr<function, f32>) -> f32 {+ var a2_: f32;+ var d: f32;++ let _e85 = (*a_2);+ let _e86 = (*a_2);+ a2_ = (_e85 * _e86);+ let _e88 = (*NdotH);+ let _e89 = (*NdotH);+ let _e91 = a2_;+ d = (((_e88 * _e89) * (_e91 - 1f)) + 1f);+ let _e95 = a2_;+ let _e96 = d;+ let _e98 = d;+ return (_e95 / max(((3.1415927f * _e96) * _e98), 0.0000001f));+}++fn shadowFactor3D_u0028_vf3_u003b(worldPos: ptr<function, vec3<f32>>) -> f32 {+ return 1f;+}+fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>, p1_: ptr<function, vec2<f32>>, box: ptr<function, vec4<f32>>) -> f32 {- var d: vec2<f32>;+ var d_1: vec2<f32>;var tmin: f32;var tmax: f32;- var a: i32;+ var a_3: i32;var da: f32;var local: f32;var p0a: f32;var local_1: f32;- var lo: f32;+ var lo_1: f32;var local_2: f32;var hi: f32;var local_3: f32;var t1_: f32;var t2_: f32;- var phi_73_: bool;- var phi_82_: bool;- var phi_91_: bool;-- let _e68 = (*p0_)[0u];- let _e70 = (*box)[0u];- let _e71 = (_e68 >= _e70);- phi_73_ = _e71;- if _e71 {- let _e73 = (*p0_)[1u];- let _e75 = (*box)[1u];- phi_73_ = (_e73 >= _e75);+ var phi_163_: bool;+ var phi_172_: bool;+ var phi_180_: bool;++ let _e99 = (*p0_)[0u];+ let _e101 = (*box)[0u];+ let _e102 = (_e99 >= _e101);+ phi_163_ = _e102;+ if _e102 {+ let _e104 = (*p0_)[1u];+ let _e106 = (*box)[1u];+ phi_163_ = (_e104 >= _e106);}- let _e78 = phi_73_;- phi_82_ = _e78;- if _e78 {- let _e80 = (*p0_)[0u];- let _e82 = (*box)[2u];- phi_82_ = (_e80 <= _e82);+ let _e109 = phi_163_;+ phi_172_ = _e109;+ if _e109 {+ let _e111 = (*p0_)[0u];+ let _e113 = (*box)[2u];+ phi_172_ = (_e111 <= _e113);}- let _e85 = phi_82_;- phi_91_ = _e85;- if _e85 {- let _e87 = (*p0_)[1u];- let _e89 = (*box)[3u];- phi_91_ = (_e87 <= _e89);+ let _e116 = phi_172_;+ phi_180_ = _e116;+ if _e116 {+ let _e118 = (*p0_)[1u];+ let _e120 = (*box)[3u];+ phi_180_ = (_e118 <= _e120);}- let _e92 = phi_91_;- if _e92 {+ let _e123 = phi_180_;+ if _e123 {return 0f;}- let _e93 = (*p1_);- let _e94 = (*p0_);- d = (_e93 - _e94);+ let _e124 = (*p1_);+ let _e125 = (*p0_);+ d_1 = (_e124 - _e125);tmin = 0f;tmax = 1f;- a = 0i;+ a_3 = 0i;loop {- let _e96 = a;- if (_e96 < 2i) {- let _e98 = a;- if (_e98 == 0i) {- let _e101 = d[0u];- local = _e101;+ let _e127 = a_3;+ if (_e127 < 2i) {+ let _e129 = a_3;+ if (_e129 == 0i) {+ let _e132 = d_1[0u];+ local = _e132;} else {- let _e103 = d[1u];- local = _e103;+ let _e134 = d_1[1u];+ local = _e134;}- let _e104 = local;- da = _e104;- let _e105 = a;- if (_e105 == 0i) {- let _e108 = (*p0_)[0u];- local_1 = _e108;+ let _e135 = local;+ da = _e135;+ let _e136 = a_3;+ if (_e136 == 0i) {+ let _e139 = (*p0_)[0u];+ local_1 = _e139;} else {- let _e110 = (*p0_)[1u];- local_1 = _e110;+ let _e141 = (*p0_)[1u];+ local_1 = _e141;}- let _e111 = local_1;- p0a = _e111;- let _e112 = a;- if (_e112 == 0i) {- let _e115 = (*box)[0u];- local_2 = _e115;+ let _e142 = local_1;+ p0a = _e142;+ let _e143 = a_3;+ if (_e143 == 0i) {+ let _e146 = (*box)[0u];+ local_2 = _e146;} else {- let _e117 = (*box)[1u];- local_2 = _e117;+ let _e148 = (*box)[1u];+ local_2 = _e148;}- let _e118 = local_2;- let _e119 = p0a;- lo = (_e118 - _e119);- let _e121 = a;- if (_e121 == 0i) {- let _e124 = (*box)[2u];- local_3 = _e124;+ let _e149 = local_2;+ let _e150 = p0a;+ lo_1 = (_e149 - _e150);+ let _e152 = a_3;+ if (_e152 == 0i) {+ let _e155 = (*box)[2u];+ local_3 = _e155;} else {- let _e126 = (*box)[3u];- local_3 = _e126;+ let _e157 = (*box)[3u];+ local_3 = _e157;}- let _e127 = local_3;- let _e128 = p0a;- hi = (_e127 - _e128);- let _e130 = da;- if (abs(_e130) < 0.00001f) {- let _e133 = lo;- let _e135 = hi;- if ((_e133 > 0f) || (_e135 < 0f)) {+ let _e158 = local_3;+ let _e159 = p0a;+ hi = (_e158 - _e159);+ let _e161 = da;+ if (abs(_e161) < 0.00001f) {+ let _e164 = lo_1;+ let _e166 = hi;+ if ((_e164 > 0f) || (_e166 < 0f)) {return 0f;}} else {- let _e138 = lo;- let _e139 = da;- t1_ = (_e138 / _e139);- let _e141 = hi;- let _e142 = da;- t2_ = (_e141 / _e142);- let _e144 = tmin;- let _e145 = t1_;- let _e146 = t2_;- tmin = max(_e144, min(_e145, _e146));- let _e149 = tmax;- let _e150 = t1_;- let _e151 = t2_;- tmax = min(_e149, max(_e150, _e151));- let _e154 = tmin;- let _e155 = tmax;- if (_e154 > _e155) {+ let _e169 = lo_1;+ let _e170 = da;+ t1_ = (_e169 / _e170);+ let _e172 = hi;+ let _e173 = da;+ t2_ = (_e172 / _e173);+ let _e175 = tmin;+ let _e176 = t1_;+ let _e177 = t2_;+ tmin = max(_e175, min(_e176, _e177));+ let _e180 = tmax;+ let _e181 = t1_;+ let _e182 = t2_;+ tmax = min(_e180, max(_e181, _e182));+ let _e185 = tmin;+ let _e186 = tmax;+ if (_e185 > _e186) {return 0f;}}@@ -311,19 +432,19 @@ fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>,break;}continuing {- let _e157 = a;- a = (_e157 + 1i);+ let _e188 = a_3;+ a_3 = (_e188 + 1i);}}return 1f;}-fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vec2<f32>>, target_: ptr<function, vec2<f32>>, softness: ptr<function, f32>) -> f32 {+fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos_1: ptr<function, vec2<f32>>, target_: ptr<function, vec2<f32>>, softness: ptr<function, f32>) -> f32 {var n: i32;var i: i32;- var param: vec2<f32>;- var param_1: vec2<f32>;- var param_2: vec4<f32>;+ var param_4: vec2<f32>;+ var param_5: vec2<f32>;+ var param_6: vec4<f32>;var dir: vec2<f32>;var dl: f32;var perp: vec2<f32>;@@ -333,36 +454,36 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecvar t: f32;var tp: vec2<f32>;var i_1: i32;- var param_3: vec2<f32>;- var param_4: vec2<f32>;- var param_5: vec4<f32>;+ var param_7: vec2<f32>;+ var param_8: vec2<f32>;+ var param_9: vec4<f32>;- let _e72 = unnamed.u_occluderCount[0u];- n = i32(_e72);- let _e74 = n;- if (_e74 <= 0i) {+ let _e103 = unnamed_1.u_occluderCount[0u];+ n = i32(_e103);+ let _e105 = n;+ if (_e105 <= 0i) {return 1f;}- let _e76 = (*softness);- if (_e76 < 0.0001f) {+ let _e107 = (*softness);+ if (_e107 < 0.0001f) {i = 0i;loop {- let _e78 = i;- if (_e78 < 8i) {- let _e80 = i;- let _e81 = n;- if (_e80 >= _e81) {+ let _e109 = i;+ if (_e109 < 8i) {+ let _e111 = i;+ let _e112 = n;+ if (_e111 >= _e112) {break;}- let _e83 = i;- let _e84 = (*worldPos);- param = _e84;- let _e85 = (*target_);- param_1 = _e85;- let _e88 = unnamed.u_occluders[_e83];- param_2 = _e88;- let _e89 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m), (¶m_1), (¶m_2));- if (_e89 > 0.5f) {+ let _e114 = i;+ let _e115 = (*worldPos_1);+ param_4 = _e115;+ let _e116 = (*target_);+ param_5 = _e116;+ let _e119 = unnamed_1.u_occluders[_e114];+ param_6 = _e119;+ let _e120 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m_4), (¶m_5), (¶m_6));+ if (_e120 > 0.5f) {return 0f;}continue;@@ -370,60 +491,60 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecbreak;}continuing {- let _e91 = i;- i = (_e91 + 1i);+ let _e122 = i;+ i = (_e122 + 1i);}}return 1f;}- let _e93 = (*target_);- let _e94 = (*worldPos);- dir = (_e93 - _e94);- let _e96 = dir;- dl = length(_e96);- let _e98 = dl;- if (_e98 > 0.0001f) {- let _e101 = dir[1u];- let _e104 = dir[0u];- let _e106 = dl;- local_4 = (vec2<f32>(-(_e101), _e104) / vec2(_e106));+ let _e124 = (*target_);+ let _e125 = (*worldPos_1);+ dir = (_e124 - _e125);+ let _e127 = dir;+ dl = length(_e127);+ let _e129 = dl;+ if (_e129 > 0.0001f) {+ let _e132 = dir[1u];+ let _e135 = dir[0u];+ let _e137 = dl;+ local_4 = (vec2<f32>(-(_e132), _e135) / vec2(_e137));} else {local_4 = vec2<f32>(1f, 0f);}- let _e109 = local_4;- perp = _e109;+ let _e140 = local_4;+ perp = _e140;blocked = 0f;s = 0i;loop {- let _e110 = s;- if (_e110 < 5i) {- let _e112 = s;- t = (((f32(_e112) / 4f) * 2f) - 1f);- let _e117 = (*target_);- let _e118 = perp;- let _e119 = t;- let _e120 = (*softness);- tp = (_e117 + (_e118 * (_e119 * _e120)));+ let _e141 = s;+ if (_e141 < 5i) {+ let _e143 = s;+ t = (((f32(_e143) / 4f) * 2f) - 1f);+ let _e148 = (*target_);+ let _e149 = perp;+ let _e150 = t;+ let _e151 = (*softness);+ tp = (_e148 + (_e149 * (_e150 * _e151)));i_1 = 0i;loop {- let _e124 = i_1;- if (_e124 < 8i) {- let _e126 = i_1;- let _e127 = n;- if (_e126 >= _e127) {+ let _e155 = i_1;+ if (_e155 < 8i) {+ let _e157 = i_1;+ let _e158 = n;+ if (_e157 >= _e158) {break;}- let _e129 = i_1;- let _e130 = (*worldPos);- param_3 = _e130;- let _e131 = tp;- param_4 = _e131;- let _e134 = unnamed.u_occluders[_e129];- param_5 = _e134;- let _e135 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m_3), (¶m_4), (¶m_5));- if (_e135 > 0.5f) {- let _e137 = blocked;- blocked = (_e137 + 1f);+ let _e160 = i_1;+ let _e161 = (*worldPos_1);+ param_7 = _e161;+ let _e162 = tp;+ param_8 = _e162;+ let _e165 = unnamed_1.u_occluders[_e160];+ param_9 = _e165;+ let _e166 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m_7), (¶m_8), (¶m_9));+ if (_e166 > 0.5f) {+ let _e168 = blocked;+ blocked = (_e168 + 1f);break;}continue;@@ -431,8 +552,8 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecbreak;}continuing {- let _e139 = i_1;- i_1 = (_e139 + 1i);+ let _e170 = i_1;+ i_1 = (_e170 + 1i);}}continue;@@ -440,212 +561,412 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecbreak;}continuing {- let _e141 = s;- s = (_e141 + 1i);+ let _e172 = s;+ s = (_e172 + 1i);}}- let _e143 = blocked;- return (1f - (_e143 / 5f));+ let _e174 = blocked;+ return (1f - (_e174 / 5f));+}++fn envIrradiance_u0028_vf3_u003b(N: ptr<function, vec3<f32>>) -> vec3<f32> {+ var sh: vec3<f32>;++ let _e85 = unnamed_1.u_envIrradiance[0i];+ let _e90 = unnamed_1.u_envIrradiance[1i];+ let _e93 = (*N)[1u];+ let _e99 = unnamed_1.u_envIrradiance[2i];+ let _e102 = (*N)[2u];+ let _e108 = unnamed_1.u_envIrradiance[3i];+ let _e111 = (*N)[0u];+ let _e117 = unnamed_1.u_envIrradiance[4i];+ let _e120 = (*N)[0u];+ let _e123 = (*N)[1u];+ let _e129 = unnamed_1.u_envIrradiance[5i];+ let _e132 = (*N)[1u];+ let _e135 = (*N)[2u];+ let _e141 = unnamed_1.u_envIrradiance[6i];+ let _e144 = (*N)[2u];+ let _e147 = (*N)[2u];+ let _e155 = unnamed_1.u_envIrradiance[7i];+ let _e158 = (*N)[0u];+ let _e161 = (*N)[2u];+ let _e167 = unnamed_1.u_envIrradiance[8i];+ let _e170 = (*N)[0u];+ let _e172 = (*N)[0u];+ let _e175 = (*N)[1u];+ let _e177 = (*N)[1u];+ sh = (((((((((_e85.xyz * 0.282095f) + (_e90.xyz * (0.488603f * _e93))) + (_e99.xyz * (0.488603f * _e102))) + (_e108.xyz * (0.488603f * _e111))) + (_e117.xyz * ((1.092548f * _e120) * _e123))) + (_e129.xyz * ((1.092548f * _e132) * _e135))) + (_e141.xyz * (0.315392f * (((3f * _e144) * _e147) - 1f)))) + (_e155.xyz * ((1.092548f * _e158) * _e161))) + (_e167.xyz * (0.546274f * ((_e170 * _e172) - (_e175 * _e177)))));+ let _e184 = unnamed_1.u_ambient;+ let _e186 = sh;+ let _e189 = unnamed_1.u_envTint;+ return (_e184.xyz + (max(_e186, vec3<f32>(0f, 0f, 0f)) * _e189.xyz));}-fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo: ptr<function, vec3<f32>>, N: ptr<function, vec3<f32>>, worldPos_1: ptr<function, vec2<f32>>) -> vec3<f32> {+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_1: ptr<function, vec3<f32>>, worldPos_2: 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 NdotV_2: f32;var lit: vec3<f32>;+ var param_10: vec3<f32>;+ var gloss: vec3<f32>;var i_2: i32;var pd: vec4<f32>;var col: vec4<f32>;- var sh: vec4<f32>;+ var sh_1: vec4<f32>;var target_1: vec2<f32>;var castShadow: bool;- var d_1: vec2<f32>;+ var d_2: vec2<f32>;var dist: f32;var atten: f32;var L: vec3<f32>;var toLight: vec2<f32>;var local_5: vec2<f32>;var sp: vec4<f32>;- var d_2: vec2<f32>;+ var d_3: vec2<f32>;var dist_1: f32;var toFrag: vec2<f32>;var local_6: vec2<f32>;- var param_6: vec2<f32>;- var param_7: vec2<f32>;- var param_8: f32;+ var param_11: vec2<f32>;+ var param_12: vec2<f32>;+ var param_13: f32;+ var param_14: vec3<f32>;var ndotl: f32;- var phi_458_: bool;- var phi_525_: bool;+ var radiance: vec3<f32>;+ var H: vec3<f32>;+ var brdf: f32;+ var param_15: f32;+ var param_16: f32;+ var param_17: f32;+ var param_18: f32;+ var param_19: f32;+ var param_20: f32;+ var param_21: vec3<f32>;+ var ab: vec2<f32>;+ var param_22: f32;+ var param_23: f32;+ var param_24: vec3<f32>;+ var param_25: f32;+ var phi_833_: bool;+ var phi_902_: bool;- let _e76 = unnamed.u_ambient;- lit = _e76.xyz;+ let _e132 = (*albedo);+ let _e133 = (*metallic);+ F0_1 = mix(vec3<f32>(0.04f, 0.04f, 0.04f), _e132, vec3(_e133));+ let _e136 = (*roughness_3);+ let _e137 = (*roughness_3);+ a_4 = max((_e136 * _e137), 0.001f);+ let _e140 = (*N_1);+ let _e141 = (*V);+ NdotV_2 = max(dot(_e140, _e141), 0.0001f);+ let _e144 = (*N_1);+ param_10 = _e144;+ let _e145 = envIrradiance_u0028_vf3_u003b((¶m_10));+ let _e146 = (*ao);+ lit = (_e145 * _e146);+ gloss = vec3<f32>(0f, 0f, 0f);i_2 = 0i;loop {- let _e78 = i_2;- if (_e78 < 16i) {- let _e80 = i_2;- let _e84 = unnamed.u_lights[_e80].posDir;- pd = _e84;- let _e85 = i_2;- let _e89 = unnamed.u_lights[_e85].color;- col = _e89;- let _e90 = i_2;- let _e94 = unnamed.u_lights[_e90].shadow;- sh = _e94;- let _e95 = pd;- target_1 = _e95.xy;+ let _e148 = i_2;+ if (_e148 < 16i) {+ let _e150 = i_2;+ let _e154 = unnamed_1.u_lights[_e150].posDir;+ pd = _e154;+ let _e155 = i_2;+ let _e159 = unnamed_1.u_lights[_e155].color;+ col = _e159;+ let _e160 = i_2;+ let _e164 = unnamed_1.u_lights[_e160].shadow;+ sh_1 = _e164;+ let _e165 = pd;+ target_1 = _e165.xy;castShadow = true;- let _e98 = pd[2u];- if (_e98 < 0.5f) {- let _e100 = pd;- let _e102 = (*worldPos_1);- d_1 = (_e100.xy - _e102);- let _e104 = d_1;- dist = length(_e104);- let _e106 = dist;- let _e108 = pd[3u];- atten = max(0f, (1f - (_e106 / max(_e108, 0.0001f))));- let _e113 = d_1;- let _e115 = pd[3u];- L = normalize(vec3<f32>(_e113.x, _e113.y, max(_e115, 1f)));+ let _e168 = pd[2u];+ if (_e168 < 0.5f) {+ let _e170 = pd;+ let _e172 = (*worldPos_2);+ d_2 = (_e170.xy - _e172.xy);+ let _e175 = d_2;+ dist = length(_e175);+ let _e177 = dist;+ let _e179 = pd[3u];+ atten = max(0f, (1f - (_e177 / max(_e179, 0.0001f))));+ let _e184 = d_2;+ let _e186 = pd[3u];+ L = normalize(vec3<f32>(_e184.x, _e184.y, max(_e186, 1f)));} else {- let _e122 = pd[2u];- if (_e122 < 1.5f) {+ let _e193 = pd[2u];+ if (_e193 < 1.5f) {atten = 1f;- let _e124 = pd;- let _e126 = -(_e124.xy);- L = normalize(vec3<f32>(_e126.x, _e126.y, 1f));- let _e131 = pd;- let _e133 = pd;- if (dot(_e131.xy, _e133.xy) > 0.00000001f) {- let _e137 = pd;- local_5 = normalize(-(_e137.xy));+ let _e195 = pd;+ let _e197 = -(_e195.xy);+ L = normalize(vec3<f32>(_e197.x, _e197.y, 1f));+ let _e202 = pd;+ let _e204 = pd;+ if (dot(_e202.xy, _e204.xy) > 0.00000001f) {+ let _e208 = pd;+ local_5 = normalize(-(_e208.xy));} else {local_5 = vec2<f32>(0f, 0f);}- let _e141 = local_5;- toLight = _e141;- let _e143 = sh[1u];- let _e144 = (_e143 > 0f);- phi_458_ = _e144;- if _e144 {- let _e145 = toLight;- let _e146 = toLight;- phi_458_ = (dot(_e145, _e146) > 0.5f);+ let _e212 = local_5;+ toLight = _e212;+ let _e214 = sh_1[1u];+ let _e215 = (_e214 > 0f);+ phi_833_ = _e215;+ if _e215 {+ let _e216 = toLight;+ let _e217 = toLight;+ phi_833_ = (dot(_e216, _e217) > 0.5f);}- let _e150 = phi_458_;- castShadow = _e150;- let _e151 = (*worldPos_1);- let _e152 = toLight;- let _e154 = sh[1u];- target_1 = (_e151 + (_e152 * _e154));+ let _e221 = phi_833_;+ castShadow = _e221;+ let _e222 = (*worldPos_2);+ let _e224 = toLight;+ let _e226 = sh_1[1u];+ target_1 = (_e222.xy + (_e224 * _e226));} else {- let _e157 = i_2;- let _e161 = unnamed.u_lights[_e157].spot;- sp = _e161;- let _e162 = pd;- let _e164 = (*worldPos_1);- d_2 = (_e162.xy - _e164);- let _e166 = d_2;- dist_1 = length(_e166);- let _e168 = dist_1;- let _e170 = pd[3u];- atten = max(0f, (1f - (_e168 / max(_e170, 0.0001f))));- let _e175 = d_2;- let _e177 = pd[3u];- L = normalize(vec3<f32>(_e175.x, _e175.y, max(_e177, 1f)));- let _e183 = dist_1;- if (_e183 > 0.0001f) {- let _e185 = d_2;- let _e187 = dist_1;- local_6 = (-(_e185) / vec2(_e187));+ let _e229 = i_2;+ let _e233 = unnamed_1.u_lights[_e229].spot;+ sp = _e233;+ let _e234 = pd;+ let _e236 = (*worldPos_2);+ d_3 = (_e234.xy - _e236.xy);+ let _e239 = d_3;+ dist_1 = length(_e239);+ let _e241 = dist_1;+ let _e243 = pd[3u];+ atten = max(0f, (1f - (_e241 / max(_e243, 0.0001f))));+ let _e248 = d_3;+ let _e250 = pd[3u];+ L = normalize(vec3<f32>(_e248.x, _e248.y, max(_e250, 1f)));+ let _e256 = dist_1;+ if (_e256 > 0.0001f) {+ let _e258 = d_3;+ let _e260 = dist_1;+ local_6 = (-(_e258) / vec2(_e260));} else {- let _e190 = sp;- local_6 = _e190.xy;+ let _e263 = sp;+ local_6 = _e263.xy;}- let _e192 = local_6;- toFrag = _e192;- let _e194 = sp[3u];- let _e196 = sp[2u];- let _e197 = sp;- let _e199 = toFrag;- let _e202 = atten;- atten = (_e202 * smoothstep(_e194, _e196, dot(_e197.xy, _e199)));+ let _e265 = local_6;+ toFrag = _e265;+ let _e267 = sp[3u];+ let _e269 = sp[2u];+ let _e270 = sp;+ let _e272 = toFrag;+ let _e275 = atten;+ atten = (_e275 * smoothstep(_e267, _e269, dot(_e270.xy, _e272)));}}- let _e204 = castShadow;- phi_525_ = _e204;- if _e204 {- let _e206 = col[3u];- phi_525_ = (_e206 > 0f);+ let _e277 = castShadow;+ phi_902_ = _e277;+ if _e277 {+ let _e279 = col[3u];+ phi_902_ = (_e279 > 0f);+ }+ let _e282 = phi_902_;+ let _e283 = atten;+ if (_e282 && (_e283 > 0f)) {+ let _e286 = (*worldPos_2);+ param_11 = _e286.xy;+ let _e288 = target_1;+ param_12 = _e288;+ let _e290 = sh_1[0u];+ param_13 = _e290;+ let _e291 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_11), (¶m_12), (¶m_13));+ let _e292 = atten;+ atten = (_e292 * _e291);}- let _e209 = phi_525_;- let _e210 = atten;- if (_e209 && (_e210 > 0f)) {- let _e213 = (*worldPos_1);- param_6 = _e213;- let _e214 = target_1;- param_7 = _e214;- let _e216 = sh[0u];- param_8 = _e216;- let _e217 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_6), (¶m_7), (¶m_8));- let _e218 = atten;- atten = (_e218 * _e217);+ let _e294 = i_2;+ let _e298 = unnamed_1.u_shadowParams[3u];+ let _e300 = atten;+ if ((f32(_e294) == _e298) && (_e300 > 0f)) {+ let _e303 = (*worldPos_2);+ param_14 = _e303;+ let _e304 = shadowFactor3D_u0028_vf3_u003b((¶m_14));+ let _e305 = atten;+ atten = (_e305 * _e304);+ }+ let _e307 = (*N_1);+ let _e308 = L;+ ndotl = max(dot(_e307, _e308), 0f);+ let _e311 = col;+ let _e314 = col[3u];+ let _e315 = ndotl;+ let _e317 = atten;+ radiance = (_e311.xyz * ((_e314 * _e315) * _e317));+ let _e320 = radiance;+ let _e321 = lit;+ lit = (_e321 + _e320);+ let _e323 = (*specular);+ if (_e323 > 0f) {+ let _e325 = L;+ let _e326 = (*V);+ H = normalize((_e325 + _e326));+ let _e329 = (*N_1);+ let _e330 = H;+ param_15 = max(dot(_e329, _e330), 0f);+ let _e333 = a_4;+ param_16 = _e333;+ let _e334 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_15), (¶m_16));+ let _e335 = NdotV_2;+ param_17 = _e335;+ let _e336 = ndotl;+ param_18 = _e336;+ let _e337 = (*roughness_3);+ param_19 = _e337;+ let _e338 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_17), (¶m_18), (¶m_19));+ let _e340 = NdotV_2;+ let _e342 = ndotl;+ brdf = ((_e334 * _e338) / max(((4f * _e340) * _e342), 0.0001f));+ let _e346 = radiance;+ let _e347 = (*V);+ let _e348 = H;+ param_20 = max(dot(_e347, _e348), 0f);+ let _e351 = F0_1;+ param_21 = _e351;+ let _e352 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_20), (¶m_21));+ let _e354 = brdf;+ let _e356 = (*specular);+ let _e359 = gloss;+ gloss = (_e359 + ((_e346 * _e352) * ((_e354 * 3.1415927f) * _e356)));}- let _e220 = (*N);- let _e221 = L;- ndotl = max(dot(_e220, _e221), 0f);- let _e224 = col;- let _e227 = col[3u];- let _e228 = ndotl;- let _e230 = atten;- let _e233 = lit;- lit = (_e233 + (_e224.xyz * ((_e227 * _e228) * _e230)));continue;} else {break;}continuing {- let _e235 = i_2;- i_2 = (_e235 + 1i);+ let _e361 = i_2;+ i_2 = (_e361 + 1i);}}- let _e237 = (*albedo);- let _e238 = lit;- return (_e237 * _e238);+ let _e363 = NdotV_2;+ param_22 = _e363;+ let _e364 = (*roughness_3);+ param_23 = _e364;+ let _e365 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_22), (¶m_23));+ ab = _e365;+ let _e366 = (*V);+ let _e368 = (*N_1);+ param_24 = reflect(-(_e366), _e368);+ let _e370 = (*roughness_3);+ param_25 = _e370;+ let _e371 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_24), (¶m_25));+ let _e372 = (*ao);+ let _e373 = (*specular);+ let _e376 = F0_1;+ let _e378 = ab[0u];+ let _e381 = ab[1u];+ let _e385 = gloss;+ gloss = (_e385 + ((_e371 * (_e372 * _e373)) * ((_e376 * _e378) + vec3(_e381))));+ let _e387 = (*albedo);+ let _e388 = (*metallic);+ let _e391 = lit;+ let _e393 = gloss;+ return (((_e387 * (1f - _e388)) * _e391) + _e393);+}++fn viewDirection_u0028_vf3_u003b(worldPos_3: ptr<function, vec3<f32>>) -> vec3<f32> {+ var local_7: vec3<f32>;++ let _e85 = unnamed.u_camera[3u];+ if (_e85 > 0.5f) {+ let _e88 = unnamed.u_camera;+ let _e90 = (*worldPos_3);+ local_7 = normalize((_e88.xyz - _e90));+ } else {+ let _e94 = unnamed.u_camera;+ local_7 = _e94.xyz;+ }+ let _e96 = local_7;+ return _e96;+}++fn applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b(albedo_1: ptr<function, vec3<f32>>, N_2: ptr<function, vec3<f32>>, worldPos_4: ptr<function, vec2<f32>>, ao_1: ptr<function, f32>) -> vec3<f32> {+ var P: vec3<f32>;+ var param_26: vec3<f32>;+ var param_27: vec3<f32>;+ var param_28: vec3<f32>;+ var param_29: vec3<f32>;+ var param_30: vec3<f32>;+ var param_31: f32;+ var param_32: f32;+ var param_33: f32;+ var param_34: f32;++ let _e95 = (*worldPos_4);+ P = vec3<f32>(_e95.x, _e95.y, 0f);+ let _e99 = P;+ param_26 = _e99;+ let _e100 = viewDirection_u0028_vf3_u003b((¶m_26));+ let _e101 = (*albedo_1);+ param_27 = _e101;+ let _e102 = (*N_2);+ param_28 = _e102;+ let _e103 = P;+ param_29 = _e103;+ param_30 = _e100;+ param_31 = 0f;+ param_32 = 1f;+ param_33 = 0f;+ let _e104 = (*ao_1);+ param_34 = _e104;+ let _e105 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_27), (¶m_28), (¶m_29), (¶m_30), (¶m_31), (¶m_32), (¶m_33), (¶m_34));+ return _e105;+}++fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo_2: ptr<function, vec3<f32>>, N_3: ptr<function, vec3<f32>>, worldPos_5: ptr<function, vec2<f32>>) -> vec3<f32> {+ var param_35: vec3<f32>;+ var param_36: vec3<f32>;+ var param_37: vec2<f32>;+ var param_38: f32;++ let _e88 = (*albedo_2);+ param_35 = _e88;+ let _e89 = (*N_3);+ param_36 = _e89;+ let _e90 = (*worldPos_5);+ param_37 = _e90;+ param_38 = 1f;+ let _e91 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_35), (¶m_36), (¶m_37), (¶m_38));+ return _e91;}fn sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(map_est: texture_2d<f32>, map_ess: sampler, uv: ptr<function, vec2<f32>>) -> vec3<f32> {- let _e53 = (*uv);- let _e54 = textureSample(map_est, map_ess, _e53);- return normalize(((_e54.xyz * 2f) - vec3(1f)));+ let _e84 = (*uv);+ let _e85 = textureSample(map_est, map_ess, _e84);+ return normalize(((_e85.xyz * 2f) - vec3(1f)));}fn main_1() {var base: vec4<f32>;- var N_1: vec3<f32>;- var param_9: vec2<f32>;+ var N_4: vec3<f32>;+ var param_39: vec2<f32>;var lit_1: vec3<f32>;- var param_10: vec3<f32>;- var param_11: vec3<f32>;- var param_12: vec2<f32>;+ var param_40: vec3<f32>;+ var param_41: vec3<f32>;+ var param_42: vec2<f32>;- let _e57 = v_texCoord_1;- let _e58 = textureSample(es_bt0_est, es_bt0_ess, _e57);- let _e59 = v_color_1;- base = (_e58 * _e59);- let _e61 = v_texCoord_1;- param_9 = _e61;- let _e62 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normal_est, u_normal_ess, (¶m_9));- N_1 = _e62;- let _e63 = base;- param_10 = _e63.xyz;- let _e65 = N_1;- param_11 = _e65;- let _e66 = v_worldPos_1;- param_12 = _e66;- let _e67 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_10), (¶m_11), (¶m_12));- lit_1 = _e67;- let _e68 = lit_1;- let _e70 = base[3u];- fragColor = vec4<f32>(_e68.x, _e68.y, _e68.z, _e70);+ let _e88 = v_texCoord_1;+ let _e89 = textureSample(es_bt0_est, es_bt0_ess, _e88);+ let _e90 = v_color_1;+ base = (_e89 * _e90);+ let _e92 = v_texCoord_1;+ param_39 = _e92;+ let _e93 = sampleNormal_u0028_t21_u003b_p1_u003b_vf2_u003b(u_normal_est, u_normal_ess, (¶m_39));+ N_4 = _e93;+ let _e94 = base;+ param_40 = _e94.xyz;+ let _e96 = N_4;+ param_41 = _e96;+ let _e97 = v_worldPos_1;+ param_42 = _e97;+ let _e98 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_40), (¶m_41), (¶m_42));+ lit_1 = _e98;+ let _e99 = lit_1;+ let _e101 = base[3u];+ fragColor = vec4<f32>(_e99.x, _e99.y, _e99.z, _e101);return;}diff --git a/desktop/public/scenes/mat-lit/lit.esshader b/desktop/public/scenes/mat-lit/lit.esshaderindex 2aa32dc2b..b41f548ec 100644--- a/desktop/public/scenes/mat-lit/lit.esshader+++ b/desktop/public/scenes/mat-lit/lit.esshader@@ -52,7 +52,7 @@ void main() {#pragma vertex wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 1c49641c24468584+// source-hash: c578fc449c0e606estruct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -60,6 +60,7 @@ struct gl_PerVertex {struct FrameConstants {u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,}struct TimeConstants {@@ -118,7 +119,12 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,#pragma fragment wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 1c49641c24468584+// source-hash: c578fc449c0e606e+struct FrameConstants {+ u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,+}+struct Light2D {posDir: vec4<f32>,color: vec4<f32>,@@ -131,6 +137,11 @@ struct LightConstants {u_lights: array<Light2D, 16>,u_occluderCount: vec4<f32>,u_occluders: array<vec4<f32>, 8>,+ u_shadowMatrix: mat4x4<f32>,+ u_shadowParams: vec4<f32>,+ u_envIrradiance: array<vec4<f32>, 9>,+ u_envParams: vec4<f32>,+ u_envTint: vec4<f32>,}struct TimeConstants {@@ -138,8 +149,10 @@ struct TimeConstants {u_viewport: vec4<f32>,}+@group(0) @binding(0)+var<uniform> unnamed: FrameConstants;@group(0) @binding(2)-var<uniform> unnamed: LightConstants;+var<uniform> unnamed_1: LightConstants;@group(1) @binding(0)var es_bt0_est: texture_2d<f32>;@group(1) @binding(8)@@ -149,7 +162,7 @@ var<private> v_color_1: vec4<f32>;var<private> v_worldPos_1: vec2<f32>;var<private> fragColor: vec4<f32>;@group(0) @binding(3)-var<uniform> unnamed_1: TimeConstants;+var<uniform> unnamed_2: TimeConstants;@group(1) @binding(1)var es_bt1_est: texture_2d<f32>;@group(1) @binding(9)@@ -179,128 +192,236 @@ var es_bt7_est: texture_2d<f32>;@group(1) @binding(15)var es_bt7_ess: sampler;+fn envSampleMip_u0028_vf3_u003b_f1_u003b(R: ptr<function, vec3<f32>>, mip: ptr<function, f32>) -> vec3<f32> {+ return vec3<f32>(0f, 0f, 0f);+}++fn envRadiance_u0028_vf3_u003b_f1_u003b(R_1: ptr<function, vec3<f32>>, roughness: ptr<function, f32>) -> vec3<f32> {+ var lod: f32;+ var lo: f32;+ var a: vec3<f32>;+ var param: vec3<f32>;+ var param_1: f32;+ var b: vec3<f32>;+ var param_2: vec3<f32>;+ var param_3: f32;++ let _e92 = unnamed_1.u_envParams[0u];+ if (_e92 < 0.5f) {+ let _e95 = unnamed_1.u_ambient;+ return _e95.xyz;+ }+ let _e97 = (*roughness);+ let _e101 = unnamed_1.u_envParams[2u];+ lod = (clamp(_e97, 0f, 1f) * _e101);+ let _e103 = lod;+ lo = floor(_e103);+ let _e105 = (*R_1);+ param = _e105;+ let _e106 = lo;+ param_1 = _e106;+ let _e107 = envSampleMip_u0028_vf3_u003b_f1_u003b((¶m), (¶m_1));+ a = _e107;+ let _e108 = lo;+ let _e112 = unnamed_1.u_envParams[2u];+ let _e114 = (*R_1);+ param_2 = _e114;+ param_3 = min((_e108 + 1f), _e112);+ let _e115 = envSampleMip_u0028_vf3_u003b_f1_u003b((¶m_2), (¶m_3));+ b = _e115;+ let _e117 = unnamed_1.u_ambient;+ let _e119 = a;+ let _e120 = b;+ let _e121 = lod;+ let _e122 = lo;+ let _e127 = unnamed_1.u_envTint;+ return (_e117.xyz + (mix(_e119, _e120, vec3((_e121 - _e122))) * _e127.xyz));+}++fn envBRDFApprox_u0028_f1_u003b_f1_u003b(NdotV: ptr<function, f32>, roughness_1: ptr<function, f32>) -> vec2<f32> {+ var r: vec4<f32>;+ var a_1: f32;++ let _e84 = (*roughness_1);+ r = ((vec4<f32>(-1f, -0.0275f, -0.572f, 0.022f) * _e84) + vec4<f32>(1f, 0.0425f, 1.04f, -0.04f));+ let _e88 = r[0u];+ let _e90 = r[0u];+ let _e92 = (*NdotV);+ let _e97 = r[0u];+ let _e100 = r[1u];+ a_1 = ((min((_e88 * _e90), exp2((-9.28f * _e92))) * _e97) + _e100);+ let _e102 = a_1;+ let _e104 = r;+ return ((vec2<f32>(-1.04f, 1.04f) * _e102) + _e104.zw);+}++fn fresnelSchlick_u0028_f1_u003b_vf3_u003b(VdotH: ptr<function, f32>, F0_: ptr<function, vec3<f32>>) -> vec3<f32> {+ let _e82 = (*F0_);+ let _e83 = (*F0_);+ let _e85 = (*VdotH);+ return (_e82 + ((vec3<f32>(1f, 1f, 1f) - _e83) * pow((1f - _e85), 5f)));+}++fn geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b(NdotV_1: ptr<function, f32>, NdotL: ptr<function, f32>, roughness_2: ptr<function, f32>) -> f32 {+ var k: f32;++ let _e84 = (*roughness_2);+ let _e86 = (*roughness_2);+ k = (((_e84 + 1f) * (_e86 + 1f)) * 0.125f);+ let _e90 = (*NdotV_1);+ let _e91 = (*NdotV_1);+ let _e92 = k;+ let _e95 = k;+ let _e98 = (*NdotL);+ let _e99 = (*NdotL);+ let _e100 = k;+ let _e103 = k;+ return ((_e90 / ((_e91 * (1f - _e92)) + _e95)) * (_e98 / ((_e99 * (1f - _e100)) + _e103)));+}++fn distributionGGX_u0028_f1_u003b_f1_u003b(NdotH: ptr<function, f32>, a_2: ptr<function, f32>) -> f32 {+ var a2_: f32;+ var d: f32;++ let _e84 = (*a_2);+ let _e85 = (*a_2);+ a2_ = (_e84 * _e85);+ let _e87 = (*NdotH);+ let _e88 = (*NdotH);+ let _e90 = a2_;+ d = (((_e87 * _e88) * (_e90 - 1f)) + 1f);+ let _e94 = a2_;+ let _e95 = d;+ let _e97 = d;+ return (_e94 / max(((3.1415927f * _e95) * _e97), 0.0000001f));+}++fn shadowFactor3D_u0028_vf3_u003b(worldPos: ptr<function, vec3<f32>>) -> f32 {+ return 1f;+}+fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>, p1_: ptr<function, vec2<f32>>, box: ptr<function, vec4<f32>>) -> f32 {- var d: vec2<f32>;+ var d_1: vec2<f32>;var tmin: f32;var tmax: f32;- var a: i32;+ var a_3: i32;var da: f32;var local: f32;var p0a: f32;var local_1: f32;- var lo: f32;+ var lo_1: f32;var local_2: f32;var hi: f32;var local_3: f32;var t1_: f32;var t2_: f32;- var phi_48_: bool;- var phi_57_: bool;- var phi_66_: bool;-- let _e67 = (*p0_)[0u];- let _e69 = (*box)[0u];- let _e70 = (_e67 >= _e69);- phi_48_ = _e70;- if _e70 {- let _e72 = (*p0_)[1u];- let _e74 = (*box)[1u];- phi_48_ = (_e72 >= _e74);+ var phi_139_: bool;+ var phi_148_: bool;+ var phi_156_: bool;++ let _e98 = (*p0_)[0u];+ let _e100 = (*box)[0u];+ let _e101 = (_e98 >= _e100);+ phi_139_ = _e101;+ if _e101 {+ let _e103 = (*p0_)[1u];+ let _e105 = (*box)[1u];+ phi_139_ = (_e103 >= _e105);}- let _e77 = phi_48_;- phi_57_ = _e77;- if _e77 {- let _e79 = (*p0_)[0u];- let _e81 = (*box)[2u];- phi_57_ = (_e79 <= _e81);+ let _e108 = phi_139_;+ phi_148_ = _e108;+ if _e108 {+ let _e110 = (*p0_)[0u];+ let _e112 = (*box)[2u];+ phi_148_ = (_e110 <= _e112);}- let _e84 = phi_57_;- phi_66_ = _e84;- if _e84 {- let _e86 = (*p0_)[1u];- let _e88 = (*box)[3u];- phi_66_ = (_e86 <= _e88);+ let _e115 = phi_148_;+ phi_156_ = _e115;+ if _e115 {+ let _e117 = (*p0_)[1u];+ let _e119 = (*box)[3u];+ phi_156_ = (_e117 <= _e119);}- let _e91 = phi_66_;- if _e91 {+ let _e122 = phi_156_;+ if _e122 {return 0f;}- let _e92 = (*p1_);- let _e93 = (*p0_);- d = (_e92 - _e93);+ let _e123 = (*p1_);+ let _e124 = (*p0_);+ d_1 = (_e123 - _e124);tmin = 0f;tmax = 1f;- a = 0i;+ a_3 = 0i;loop {- let _e95 = a;- if (_e95 < 2i) {- let _e97 = a;- if (_e97 == 0i) {- let _e100 = d[0u];- local = _e100;+ let _e126 = a_3;+ if (_e126 < 2i) {+ let _e128 = a_3;+ if (_e128 == 0i) {+ let _e131 = d_1[0u];+ local = _e131;} else {- let _e102 = d[1u];- local = _e102;+ let _e133 = d_1[1u];+ local = _e133;}- let _e103 = local;- da = _e103;- let _e104 = a;- if (_e104 == 0i) {- let _e107 = (*p0_)[0u];- local_1 = _e107;+ let _e134 = local;+ da = _e134;+ let _e135 = a_3;+ if (_e135 == 0i) {+ let _e138 = (*p0_)[0u];+ local_1 = _e138;} else {- let _e109 = (*p0_)[1u];- local_1 = _e109;+ let _e140 = (*p0_)[1u];+ local_1 = _e140;}- let _e110 = local_1;- p0a = _e110;- let _e111 = a;- if (_e111 == 0i) {- let _e114 = (*box)[0u];- local_2 = _e114;+ let _e141 = local_1;+ p0a = _e141;+ let _e142 = a_3;+ if (_e142 == 0i) {+ let _e145 = (*box)[0u];+ local_2 = _e145;} else {- let _e116 = (*box)[1u];- local_2 = _e116;+ let _e147 = (*box)[1u];+ local_2 = _e147;}- let _e117 = local_2;- let _e118 = p0a;- lo = (_e117 - _e118);- let _e120 = a;- if (_e120 == 0i) {- let _e123 = (*box)[2u];- local_3 = _e123;+ let _e148 = local_2;+ let _e149 = p0a;+ lo_1 = (_e148 - _e149);+ let _e151 = a_3;+ if (_e151 == 0i) {+ let _e154 = (*box)[2u];+ local_3 = _e154;} else {- let _e125 = (*box)[3u];- local_3 = _e125;+ let _e156 = (*box)[3u];+ local_3 = _e156;}- let _e126 = local_3;- let _e127 = p0a;- hi = (_e126 - _e127);- let _e129 = da;- if (abs(_e129) < 0.00001f) {- let _e132 = lo;- let _e134 = hi;- if ((_e132 > 0f) || (_e134 < 0f)) {+ let _e157 = local_3;+ let _e158 = p0a;+ hi = (_e157 - _e158);+ let _e160 = da;+ if (abs(_e160) < 0.00001f) {+ let _e163 = lo_1;+ let _e165 = hi;+ if ((_e163 > 0f) || (_e165 < 0f)) {return 0f;}} else {- let _e137 = lo;- let _e138 = da;- t1_ = (_e137 / _e138);- let _e140 = hi;- let _e141 = da;- t2_ = (_e140 / _e141);- let _e143 = tmin;- let _e144 = t1_;- let _e145 = t2_;- tmin = max(_e143, min(_e144, _e145));- let _e148 = tmax;- let _e149 = t1_;- let _e150 = t2_;- tmax = min(_e148, max(_e149, _e150));- let _e153 = tmin;- let _e154 = tmax;- if (_e153 > _e154) {+ let _e168 = lo_1;+ let _e169 = da;+ t1_ = (_e168 / _e169);+ let _e171 = hi;+ let _e172 = da;+ t2_ = (_e171 / _e172);+ let _e174 = tmin;+ let _e175 = t1_;+ let _e176 = t2_;+ tmin = max(_e174, min(_e175, _e176));+ let _e179 = tmax;+ let _e180 = t1_;+ let _e181 = t2_;+ tmax = min(_e179, max(_e180, _e181));+ let _e184 = tmin;+ let _e185 = tmax;+ if (_e184 > _e185) {return 0f;}}@@ -309,19 +430,19 @@ fn segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b(p0_: ptr<function, vec2<f32>>,break;}continuing {- let _e156 = a;- a = (_e156 + 1i);+ let _e187 = a_3;+ a_3 = (_e187 + 1i);}}return 1f;}-fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vec2<f32>>, target_: ptr<function, vec2<f32>>, softness: ptr<function, f32>) -> f32 {+fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos_1: ptr<function, vec2<f32>>, target_: ptr<function, vec2<f32>>, softness: ptr<function, f32>) -> f32 {var n: i32;var i: i32;- var param: vec2<f32>;- var param_1: vec2<f32>;- var param_2: vec4<f32>;+ var param_4: vec2<f32>;+ var param_5: vec2<f32>;+ var param_6: vec4<f32>;var dir: vec2<f32>;var dl: f32;var perp: vec2<f32>;@@ -331,36 +452,36 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecvar t: f32;var tp: vec2<f32>;var i_1: i32;- var param_3: vec2<f32>;- var param_4: vec2<f32>;- var param_5: vec4<f32>;+ var param_7: vec2<f32>;+ var param_8: vec2<f32>;+ var param_9: vec4<f32>;- let _e71 = unnamed.u_occluderCount[0u];- n = i32(_e71);- let _e73 = n;- if (_e73 <= 0i) {+ let _e102 = unnamed_1.u_occluderCount[0u];+ n = i32(_e102);+ let _e104 = n;+ if (_e104 <= 0i) {return 1f;}- let _e75 = (*softness);- if (_e75 < 0.0001f) {+ let _e106 = (*softness);+ if (_e106 < 0.0001f) {i = 0i;loop {- let _e77 = i;- if (_e77 < 8i) {- let _e79 = i;- let _e80 = n;- if (_e79 >= _e80) {+ let _e108 = i;+ if (_e108 < 8i) {+ let _e110 = i;+ let _e111 = n;+ if (_e110 >= _e111) {break;}- let _e82 = i;- let _e83 = (*worldPos);- param = _e83;- let _e84 = (*target_);- param_1 = _e84;- let _e87 = unnamed.u_occluders[_e82];- param_2 = _e87;- let _e88 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m), (¶m_1), (¶m_2));- if (_e88 > 0.5f) {+ let _e113 = i;+ let _e114 = (*worldPos_1);+ param_4 = _e114;+ let _e115 = (*target_);+ param_5 = _e115;+ let _e118 = unnamed_1.u_occluders[_e113];+ param_6 = _e118;+ let _e119 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m_4), (¶m_5), (¶m_6));+ if (_e119 > 0.5f) {return 0f;}continue;@@ -368,60 +489,60 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecbreak;}continuing {- let _e90 = i;- i = (_e90 + 1i);+ let _e121 = i;+ i = (_e121 + 1i);}}return 1f;}- let _e92 = (*target_);- let _e93 = (*worldPos);- dir = (_e92 - _e93);- let _e95 = dir;- dl = length(_e95);- let _e97 = dl;- if (_e97 > 0.0001f) {- let _e100 = dir[1u];- let _e103 = dir[0u];- let _e105 = dl;- local_4 = (vec2<f32>(-(_e100), _e103) / vec2(_e105));+ let _e123 = (*target_);+ let _e124 = (*worldPos_1);+ dir = (_e123 - _e124);+ let _e126 = dir;+ dl = length(_e126);+ let _e128 = dl;+ if (_e128 > 0.0001f) {+ let _e131 = dir[1u];+ let _e134 = dir[0u];+ let _e136 = dl;+ local_4 = (vec2<f32>(-(_e131), _e134) / vec2(_e136));} else {local_4 = vec2<f32>(1f, 0f);}- let _e108 = local_4;- perp = _e108;+ let _e139 = local_4;+ perp = _e139;blocked = 0f;s = 0i;loop {- let _e109 = s;- if (_e109 < 5i) {- let _e111 = s;- t = (((f32(_e111) / 4f) * 2f) - 1f);- let _e116 = (*target_);- let _e117 = perp;- let _e118 = t;- let _e119 = (*softness);- tp = (_e116 + (_e117 * (_e118 * _e119)));+ let _e140 = s;+ if (_e140 < 5i) {+ let _e142 = s;+ t = (((f32(_e142) / 4f) * 2f) - 1f);+ let _e147 = (*target_);+ let _e148 = perp;+ let _e149 = t;+ let _e150 = (*softness);+ tp = (_e147 + (_e148 * (_e149 * _e150)));i_1 = 0i;loop {- let _e123 = i_1;- if (_e123 < 8i) {- let _e125 = i_1;- let _e126 = n;- if (_e125 >= _e126) {+ let _e154 = i_1;+ if (_e154 < 8i) {+ let _e156 = i_1;+ let _e157 = n;+ if (_e156 >= _e157) {break;}- let _e128 = i_1;- let _e129 = (*worldPos);- param_3 = _e129;- let _e130 = tp;- param_4 = _e130;- let _e133 = unnamed.u_occluders[_e128];- param_5 = _e133;- let _e134 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m_3), (¶m_4), (¶m_5));- if (_e134 > 0.5f) {- let _e136 = blocked;- blocked = (_e136 + 1f);+ let _e159 = i_1;+ let _e160 = (*worldPos_1);+ param_7 = _e160;+ let _e161 = tp;+ param_8 = _e161;+ let _e164 = unnamed_1.u_occluders[_e159];+ param_9 = _e164;+ let _e165 = segHitsBox_u0028_vf2_u003b_vf2_u003b_vf4_u003b((¶m_7), (¶m_8), (¶m_9));+ if (_e165 > 0.5f) {+ let _e167 = blocked;+ blocked = (_e167 + 1f);break;}continue;@@ -429,8 +550,8 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecbreak;}continuing {- let _e138 = i_1;- i_1 = (_e138 + 1i);+ let _e169 = i_1;+ i_1 = (_e169 + 1i);}}continue;@@ -438,202 +559,402 @@ fn shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b(worldPos: ptr<function, vecbreak;}continuing {- let _e140 = s;- s = (_e140 + 1i);+ let _e171 = s;+ s = (_e171 + 1i);}}- let _e142 = blocked;- return (1f - (_e142 / 5f));+ let _e173 = blocked;+ return (1f - (_e173 / 5f));+}++fn envIrradiance_u0028_vf3_u003b(N: ptr<function, vec3<f32>>) -> vec3<f32> {+ var sh: vec3<f32>;++ let _e84 = unnamed_1.u_envIrradiance[0i];+ let _e89 = unnamed_1.u_envIrradiance[1i];+ let _e92 = (*N)[1u];+ let _e98 = unnamed_1.u_envIrradiance[2i];+ let _e101 = (*N)[2u];+ let _e107 = unnamed_1.u_envIrradiance[3i];+ let _e110 = (*N)[0u];+ let _e116 = unnamed_1.u_envIrradiance[4i];+ let _e119 = (*N)[0u];+ let _e122 = (*N)[1u];+ let _e128 = unnamed_1.u_envIrradiance[5i];+ let _e131 = (*N)[1u];+ let _e134 = (*N)[2u];+ let _e140 = unnamed_1.u_envIrradiance[6i];+ let _e143 = (*N)[2u];+ let _e146 = (*N)[2u];+ let _e154 = unnamed_1.u_envIrradiance[7i];+ let _e157 = (*N)[0u];+ let _e160 = (*N)[2u];+ let _e166 = unnamed_1.u_envIrradiance[8i];+ let _e169 = (*N)[0u];+ let _e171 = (*N)[0u];+ let _e174 = (*N)[1u];+ let _e176 = (*N)[1u];+ sh = (((((((((_e84.xyz * 0.282095f) + (_e89.xyz * (0.488603f * _e92))) + (_e98.xyz * (0.488603f * _e101))) + (_e107.xyz * (0.488603f * _e110))) + (_e116.xyz * ((1.092548f * _e119) * _e122))) + (_e128.xyz * ((1.092548f * _e131) * _e134))) + (_e140.xyz * (0.315392f * (((3f * _e143) * _e146) - 1f)))) + (_e154.xyz * ((1.092548f * _e157) * _e160))) + (_e166.xyz * (0.546274f * ((_e169 * _e171) - (_e174 * _e176)))));+ let _e183 = unnamed_1.u_ambient;+ let _e185 = sh;+ let _e188 = unnamed_1.u_envTint;+ return (_e183.xyz + (max(_e185, vec3<f32>(0f, 0f, 0f)) * _e188.xyz));}-fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo: ptr<function, vec3<f32>>, N: ptr<function, vec3<f32>>, worldPos_1: ptr<function, vec2<f32>>) -> vec3<f32> {+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_1: ptr<function, vec3<f32>>, worldPos_2: 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 NdotV_2: f32;var lit: vec3<f32>;+ var param_10: vec3<f32>;+ var gloss: vec3<f32>;var i_2: i32;var pd: vec4<f32>;var col: vec4<f32>;- var sh: vec4<f32>;+ var sh_1: vec4<f32>;var target_1: vec2<f32>;var castShadow: bool;- var d_1: vec2<f32>;+ var d_2: vec2<f32>;var dist: f32;var atten: f32;var L: vec3<f32>;var toLight: vec2<f32>;var local_5: vec2<f32>;var sp: vec4<f32>;- var d_2: vec2<f32>;+ var d_3: vec2<f32>;var dist_1: f32;var toFrag: vec2<f32>;var local_6: vec2<f32>;- var param_6: vec2<f32>;- var param_7: vec2<f32>;- var param_8: f32;+ var param_11: vec2<f32>;+ var param_12: vec2<f32>;+ var param_13: f32;+ var param_14: vec3<f32>;var ndotl: f32;- var phi_435_: bool;- var phi_502_: bool;+ var radiance: vec3<f32>;+ var H: vec3<f32>;+ var brdf: f32;+ var param_15: f32;+ var param_16: f32;+ var param_17: f32;+ var param_18: f32;+ var param_19: f32;+ var param_20: f32;+ var param_21: vec3<f32>;+ var ab: vec2<f32>;+ var param_22: f32;+ var param_23: f32;+ var param_24: vec3<f32>;+ var param_25: f32;+ var phi_810_: bool;+ var phi_879_: bool;- let _e75 = unnamed.u_ambient;- lit = _e75.xyz;+ let _e131 = (*albedo);+ let _e132 = (*metallic);+ F0_1 = mix(vec3<f32>(0.04f, 0.04f, 0.04f), _e131, vec3(_e132));+ let _e135 = (*roughness_3);+ let _e136 = (*roughness_3);+ a_4 = max((_e135 * _e136), 0.001f);+ let _e139 = (*N_1);+ let _e140 = (*V);+ NdotV_2 = max(dot(_e139, _e140), 0.0001f);+ let _e143 = (*N_1);+ param_10 = _e143;+ let _e144 = envIrradiance_u0028_vf3_u003b((¶m_10));+ let _e145 = (*ao);+ lit = (_e144 * _e145);+ gloss = vec3<f32>(0f, 0f, 0f);i_2 = 0i;loop {- let _e77 = i_2;- if (_e77 < 16i) {- let _e79 = i_2;- let _e83 = unnamed.u_lights[_e79].posDir;- pd = _e83;- let _e84 = i_2;- let _e88 = unnamed.u_lights[_e84].color;- col = _e88;- let _e89 = i_2;- let _e93 = unnamed.u_lights[_e89].shadow;- sh = _e93;- let _e94 = pd;- target_1 = _e94.xy;+ let _e147 = i_2;+ if (_e147 < 16i) {+ let _e149 = i_2;+ let _e153 = unnamed_1.u_lights[_e149].posDir;+ pd = _e153;+ let _e154 = i_2;+ let _e158 = unnamed_1.u_lights[_e154].color;+ col = _e158;+ let _e159 = i_2;+ let _e163 = unnamed_1.u_lights[_e159].shadow;+ sh_1 = _e163;+ let _e164 = pd;+ target_1 = _e164.xy;castShadow = true;- let _e97 = pd[2u];- if (_e97 < 0.5f) {- let _e99 = pd;- let _e101 = (*worldPos_1);- d_1 = (_e99.xy - _e101);- let _e103 = d_1;- dist = length(_e103);- let _e105 = dist;- let _e107 = pd[3u];- atten = max(0f, (1f - (_e105 / max(_e107, 0.0001f))));- let _e112 = d_1;- let _e114 = pd[3u];- L = normalize(vec3<f32>(_e112.x, _e112.y, max(_e114, 1f)));+ let _e167 = pd[2u];+ if (_e167 < 0.5f) {+ let _e169 = pd;+ let _e171 = (*worldPos_2);+ d_2 = (_e169.xy - _e171.xy);+ let _e174 = d_2;+ dist = length(_e174);+ let _e176 = dist;+ let _e178 = pd[3u];+ atten = max(0f, (1f - (_e176 / max(_e178, 0.0001f))));+ let _e183 = d_2;+ let _e185 = pd[3u];+ L = normalize(vec3<f32>(_e183.x, _e183.y, max(_e185, 1f)));} else {- let _e121 = pd[2u];- if (_e121 < 1.5f) {+ let _e192 = pd[2u];+ if (_e192 < 1.5f) {atten = 1f;- let _e123 = pd;- let _e125 = -(_e123.xy);- L = normalize(vec3<f32>(_e125.x, _e125.y, 1f));- let _e130 = pd;- let _e132 = pd;- if (dot(_e130.xy, _e132.xy) > 0.00000001f) {- let _e136 = pd;- local_5 = normalize(-(_e136.xy));+ let _e194 = pd;+ let _e196 = -(_e194.xy);+ L = normalize(vec3<f32>(_e196.x, _e196.y, 1f));+ let _e201 = pd;+ let _e203 = pd;+ if (dot(_e201.xy, _e203.xy) > 0.00000001f) {+ let _e207 = pd;+ local_5 = normalize(-(_e207.xy));} else {local_5 = vec2<f32>(0f, 0f);}- let _e140 = local_5;- toLight = _e140;- let _e142 = sh[1u];- let _e143 = (_e142 > 0f);- phi_435_ = _e143;- if _e143 {- let _e144 = toLight;- let _e145 = toLight;- phi_435_ = (dot(_e144, _e145) > 0.5f);+ let _e211 = local_5;+ toLight = _e211;+ let _e213 = sh_1[1u];+ let _e214 = (_e213 > 0f);+ phi_810_ = _e214;+ if _e214 {+ let _e215 = toLight;+ let _e216 = toLight;+ phi_810_ = (dot(_e215, _e216) > 0.5f);}- let _e149 = phi_435_;- castShadow = _e149;- let _e150 = (*worldPos_1);- let _e151 = toLight;- let _e153 = sh[1u];- target_1 = (_e150 + (_e151 * _e153));+ let _e220 = phi_810_;+ castShadow = _e220;+ let _e221 = (*worldPos_2);+ let _e223 = toLight;+ let _e225 = sh_1[1u];+ target_1 = (_e221.xy + (_e223 * _e225));} else {- let _e156 = i_2;- let _e160 = unnamed.u_lights[_e156].spot;- sp = _e160;- let _e161 = pd;- let _e163 = (*worldPos_1);- d_2 = (_e161.xy - _e163);- let _e165 = d_2;- dist_1 = length(_e165);- let _e167 = dist_1;- let _e169 = pd[3u];- atten = max(0f, (1f - (_e167 / max(_e169, 0.0001f))));- let _e174 = d_2;- let _e176 = pd[3u];- L = normalize(vec3<f32>(_e174.x, _e174.y, max(_e176, 1f)));- let _e182 = dist_1;- if (_e182 > 0.0001f) {- let _e184 = d_2;- let _e186 = dist_1;- local_6 = (-(_e184) / vec2(_e186));+ let _e228 = i_2;+ let _e232 = unnamed_1.u_lights[_e228].spot;+ sp = _e232;+ let _e233 = pd;+ let _e235 = (*worldPos_2);+ d_3 = (_e233.xy - _e235.xy);+ let _e238 = d_3;+ dist_1 = length(_e238);+ let _e240 = dist_1;+ let _e242 = pd[3u];+ atten = max(0f, (1f - (_e240 / max(_e242, 0.0001f))));+ let _e247 = d_3;+ let _e249 = pd[3u];+ L = normalize(vec3<f32>(_e247.x, _e247.y, max(_e249, 1f)));+ let _e255 = dist_1;+ if (_e255 > 0.0001f) {+ let _e257 = d_3;+ let _e259 = dist_1;+ local_6 = (-(_e257) / vec2(_e259));} else {- let _e189 = sp;- local_6 = _e189.xy;+ let _e262 = sp;+ local_6 = _e262.xy;}- let _e191 = local_6;- toFrag = _e191;- let _e193 = sp[3u];- let _e195 = sp[2u];- let _e196 = sp;- let _e198 = toFrag;- let _e201 = atten;- atten = (_e201 * smoothstep(_e193, _e195, dot(_e196.xy, _e198)));+ let _e264 = local_6;+ toFrag = _e264;+ let _e266 = sp[3u];+ let _e268 = sp[2u];+ let _e269 = sp;+ let _e271 = toFrag;+ let _e274 = atten;+ atten = (_e274 * smoothstep(_e266, _e268, dot(_e269.xy, _e271)));}}- let _e203 = castShadow;- phi_502_ = _e203;- if _e203 {- let _e205 = col[3u];- phi_502_ = (_e205 > 0f);+ let _e276 = castShadow;+ phi_879_ = _e276;+ if _e276 {+ let _e278 = col[3u];+ phi_879_ = (_e278 > 0f);+ }+ let _e281 = phi_879_;+ let _e282 = atten;+ if (_e281 && (_e282 > 0f)) {+ let _e285 = (*worldPos_2);+ param_11 = _e285.xy;+ let _e287 = target_1;+ param_12 = _e287;+ let _e289 = sh_1[0u];+ param_13 = _e289;+ let _e290 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_11), (¶m_12), (¶m_13));+ let _e291 = atten;+ atten = (_e291 * _e290);}- let _e208 = phi_502_;- let _e209 = atten;- if (_e208 && (_e209 > 0f)) {- let _e212 = (*worldPos_1);- param_6 = _e212;- let _e213 = target_1;- param_7 = _e213;- let _e215 = sh[0u];- param_8 = _e215;- let _e216 = shadowFactor2D_u0028_vf2_u003b_vf2_u003b_f1_u003b((¶m_6), (¶m_7), (¶m_8));- let _e217 = atten;- atten = (_e217 * _e216);+ let _e293 = i_2;+ let _e297 = unnamed_1.u_shadowParams[3u];+ let _e299 = atten;+ if ((f32(_e293) == _e297) && (_e299 > 0f)) {+ let _e302 = (*worldPos_2);+ param_14 = _e302;+ let _e303 = shadowFactor3D_u0028_vf3_u003b((¶m_14));+ let _e304 = atten;+ atten = (_e304 * _e303);+ }+ let _e306 = (*N_1);+ let _e307 = L;+ ndotl = max(dot(_e306, _e307), 0f);+ let _e310 = col;+ let _e313 = col[3u];+ let _e314 = ndotl;+ let _e316 = atten;+ radiance = (_e310.xyz * ((_e313 * _e314) * _e316));+ let _e319 = radiance;+ let _e320 = lit;+ lit = (_e320 + _e319);+ let _e322 = (*specular);+ if (_e322 > 0f) {+ let _e324 = L;+ let _e325 = (*V);+ H = normalize((_e324 + _e325));+ let _e328 = (*N_1);+ let _e329 = H;+ param_15 = max(dot(_e328, _e329), 0f);+ let _e332 = a_4;+ param_16 = _e332;+ let _e333 = distributionGGX_u0028_f1_u003b_f1_u003b((¶m_15), (¶m_16));+ let _e334 = NdotV_2;+ param_17 = _e334;+ let _e335 = ndotl;+ param_18 = _e335;+ let _e336 = (*roughness_3);+ param_19 = _e336;+ let _e337 = geometrySmith_u0028_f1_u003b_f1_u003b_f1_u003b((¶m_17), (¶m_18), (¶m_19));+ let _e339 = NdotV_2;+ let _e341 = ndotl;+ brdf = ((_e333 * _e337) / max(((4f * _e339) * _e341), 0.0001f));+ let _e345 = radiance;+ let _e346 = (*V);+ let _e347 = H;+ param_20 = max(dot(_e346, _e347), 0f);+ let _e350 = F0_1;+ param_21 = _e350;+ let _e351 = fresnelSchlick_u0028_f1_u003b_vf3_u003b((¶m_20), (¶m_21));+ let _e353 = brdf;+ let _e355 = (*specular);+ let _e358 = gloss;+ gloss = (_e358 + ((_e345 * _e351) * ((_e353 * 3.1415927f) * _e355)));}- let _e219 = (*N);- let _e220 = L;- ndotl = max(dot(_e219, _e220), 0f);- let _e223 = col;- let _e226 = col[3u];- let _e227 = ndotl;- let _e229 = atten;- let _e232 = lit;- lit = (_e232 + (_e223.xyz * ((_e226 * _e227) * _e229)));continue;} else {break;}continuing {- let _e234 = i_2;- i_2 = (_e234 + 1i);+ let _e360 = i_2;+ i_2 = (_e360 + 1i);}}- let _e236 = (*albedo);- let _e237 = lit;- return (_e236 * _e237);+ let _e362 = NdotV_2;+ param_22 = _e362;+ let _e363 = (*roughness_3);+ param_23 = _e363;+ let _e364 = envBRDFApprox_u0028_f1_u003b_f1_u003b((¶m_22), (¶m_23));+ ab = _e364;+ let _e365 = (*V);+ let _e367 = (*N_1);+ param_24 = reflect(-(_e365), _e367);+ let _e369 = (*roughness_3);+ param_25 = _e369;+ let _e370 = envRadiance_u0028_vf3_u003b_f1_u003b((¶m_24), (¶m_25));+ let _e371 = (*ao);+ let _e372 = (*specular);+ let _e375 = F0_1;+ let _e377 = ab[0u];+ let _e380 = ab[1u];+ let _e384 = gloss;+ gloss = (_e384 + ((_e370 * (_e371 * _e372)) * ((_e375 * _e377) + vec3(_e380))));+ let _e386 = (*albedo);+ let _e387 = (*metallic);+ let _e390 = lit;+ let _e392 = gloss;+ return (((_e386 * (1f - _e387)) * _e390) + _e392);+}++fn viewDirection_u0028_vf3_u003b(worldPos_3: ptr<function, vec3<f32>>) -> vec3<f32> {+ var local_7: vec3<f32>;++ let _e84 = unnamed.u_camera[3u];+ if (_e84 > 0.5f) {+ let _e87 = unnamed.u_camera;+ let _e89 = (*worldPos_3);+ local_7 = normalize((_e87.xyz - _e89));+ } else {+ let _e93 = unnamed.u_camera;+ local_7 = _e93.xyz;+ }+ let _e95 = local_7;+ return _e95;+}++fn applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b(albedo_1: ptr<function, vec3<f32>>, N_2: ptr<function, vec3<f32>>, worldPos_4: ptr<function, vec2<f32>>, ao_1: ptr<function, f32>) -> vec3<f32> {+ var P: vec3<f32>;+ var param_26: vec3<f32>;+ var param_27: vec3<f32>;+ var param_28: vec3<f32>;+ var param_29: vec3<f32>;+ var param_30: vec3<f32>;+ var param_31: f32;+ var param_32: f32;+ var param_33: f32;+ var param_34: f32;++ let _e94 = (*worldPos_4);+ P = vec3<f32>(_e94.x, _e94.y, 0f);+ let _e98 = P;+ param_26 = _e98;+ let _e99 = viewDirection_u0028_vf3_u003b((¶m_26));+ let _e100 = (*albedo_1);+ param_27 = _e100;+ let _e101 = (*N_2);+ param_28 = _e101;+ let _e102 = P;+ param_29 = _e102;+ param_30 = _e99;+ param_31 = 0f;+ param_32 = 1f;+ param_33 = 0f;+ let _e103 = (*ao_1);+ param_34 = _e103;+ let _e104 = applyLightingPBR_u0028_vf3_u003b_vf3_u003b_vf3_u003b_vf3_u003b_f1_u003b_f1_u003b_f1_u003b_f1_u003b((¶m_27), (¶m_28), (¶m_29), (¶m_30), (¶m_31), (¶m_32), (¶m_33), (¶m_34));+ return _e104;+}++fn applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b(albedo_2: ptr<function, vec3<f32>>, N_3: ptr<function, vec3<f32>>, worldPos_5: ptr<function, vec2<f32>>) -> vec3<f32> {+ var param_35: vec3<f32>;+ var param_36: vec3<f32>;+ var param_37: vec2<f32>;+ var param_38: f32;++ let _e87 = (*albedo_2);+ param_35 = _e87;+ let _e88 = (*N_3);+ param_36 = _e88;+ let _e89 = (*worldPos_5);+ param_37 = _e89;+ param_38 = 1f;+ let _e90 = applyLighting2DAO_u0028_vf3_u003b_vf3_u003b_vf2_u003b_f1_u003b((¶m_35), (¶m_36), (¶m_37), (¶m_38));+ return _e90;}fn main_1() {var base: vec4<f32>;- var N_1: vec3<f32>;+ var N_4: vec3<f32>;var lit_1: vec3<f32>;- var param_9: vec3<f32>;- var param_10: vec3<f32>;- var param_11: vec2<f32>;+ var param_39: vec3<f32>;+ var param_40: vec3<f32>;+ var param_41: vec2<f32>;- let _e55 = v_texCoord_1;- let _e56 = textureSample(es_bt0_est, es_bt0_ess, _e55);- let _e57 = v_color_1;- base = (_e56 * _e57);- N_1 = vec3<f32>(0f, 0f, 1f);- let _e59 = base;- param_9 = _e59.xyz;- let _e61 = N_1;- param_10 = _e61;- let _e62 = v_worldPos_1;- param_11 = _e62;- let _e63 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_9), (¶m_10), (¶m_11));- lit_1 = _e63;- let _e64 = lit_1;- let _e66 = base[3u];- fragColor = vec4<f32>(_e64.x, _e64.y, _e64.z, _e66);+ let _e86 = v_texCoord_1;+ let _e87 = textureSample(es_bt0_est, es_bt0_ess, _e86);+ let _e88 = v_color_1;+ base = (_e87 * _e88);+ N_4 = vec3<f32>(0f, 0f, 1f);+ let _e90 = base;+ param_39 = _e90.xyz;+ let _e92 = N_4;+ param_40 = _e92;+ let _e93 = v_worldPos_1;+ param_41 = _e93;+ let _e94 = applyLighting2D_u0028_vf3_u003b_vf3_u003b_vf2_u003b((¶m_39), (¶m_40), (¶m_41));+ lit_1 = _e94;+ let _e95 = lit_1;+ let _e97 = base[3u];+ fragColor = vec4<f32>(_e95.x, _e95.y, _e95.z, _e97);return;}diff --git a/desktop/public/scenes/mat-sw/switched.esshader b/desktop/public/scenes/mat-sw/switched.esshaderindex c665ed7ba..bee1d6b76 100644--- a/desktop/public/scenes/mat-sw/switched.esshader+++ b/desktop/public/scenes/mat-sw/switched.esshader@@ -37,7 +37,7 @@ void main() {#pragma vertex wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 707645015287f4ca+// source-hash: 49d2d4a5e4a04d72#ifdef USE_GREENstruct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,@@ -46,6 +46,7 @@ struct gl_PerVertex {struct FrameConstants {u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,}struct TimeConstants {@@ -97,6 +98,7 @@ struct gl_PerVertex {struct FrameConstants {u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,}struct TimeConstants {@@ -146,8 +148,13 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,#pragma fragment wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 707645015287f4ca+// source-hash: 49d2d4a5e4a04d72#ifdef USE_GREEN+struct FrameConstants {+ u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,+}+struct TimeConstants {u_time: vec4<f32>,u_viewport: vec4<f32>,@@ -155,12 +162,14 @@ struct TimeConstants {var<private> fragColor: vec4<f32>;var<private> v_color_1: vec4<f32>;+@group(0) @binding(0)+var<uniform> unnamed: FrameConstants;@group(0) @binding(3)-var<uniform> unnamed: TimeConstants;+var<uniform> unnamed_1: TimeConstants;fn main_1() {- let _e6 = v_color_1;- fragColor = (vec4<f32>(0f, 1f, 0f, 1f) * _e6);+ let _e7 = v_color_1;+ fragColor = (vec4<f32>(0f, 1f, 0f, 1f) * _e7);return;}@@ -172,6 +181,11 @@ fn fs_main(@location(0) v_color: vec4<f32>) -> @location(0) vec4<f32> {return _e3;}#else+struct FrameConstants {+ u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,+}+struct TimeConstants {u_time: vec4<f32>,u_viewport: vec4<f32>,@@ -179,12 +193,14 @@ struct TimeConstants {var<private> fragColor: vec4<f32>;var<private> v_color_1: vec4<f32>;+@group(0) @binding(0)+var<uniform> unnamed: FrameConstants;@group(0) @binding(3)-var<uniform> unnamed: TimeConstants;+var<uniform> unnamed_1: TimeConstants;fn main_1() {- let _e6 = v_color_1;- fragColor = (vec4<f32>(1f, 0f, 0f, 1f) * _e6);+ let _e7 = v_color_1;+ fragColor = (vec4<f32>(1f, 0f, 0f, 1f) * _e7);return;}diff --git a/desktop/public/scenes/mat-tex/masked.esshader b/desktop/public/scenes/mat-tex/masked.esshaderindex 1b78dc9b4..22295a55f 100644--- a/desktop/public/scenes/mat-tex/masked.esshader+++ b/desktop/public/scenes/mat-tex/masked.esshader@@ -37,7 +37,7 @@ void main() {#pragma vertex wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: c6e15c575aa314cc+// source-hash: adaf30016421f0d6struct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -45,6 +45,7 @@ struct gl_PerVertex {struct FrameConstants {u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,}struct TimeConstants {@@ -102,7 +103,12 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,#pragma fragment wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: c6e15c575aa314cc+// source-hash: adaf30016421f0d6+struct FrameConstants {+ u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,+}+struct TimeConstants {u_time: vec4<f32>,u_viewport: vec4<f32>,@@ -115,14 +121,16 @@ var u_mask_est: texture_2d<f32>;var u_mask_ess: sampler;var<private> v_texCoord_1: vec2<f32>;var<private> v_color_1: vec4<f32>;+@group(0) @binding(0)+var<uniform> unnamed: FrameConstants;@group(0) @binding(3)-var<uniform> unnamed: TimeConstants;+var<uniform> unnamed_1: TimeConstants;fn main_1() {- let _e6 = v_texCoord_1;- let _e7 = textureSample(u_mask_est, u_mask_ess, _e6);- let _e8 = v_color_1;- fragColor = (_e7 * _e8);+ let _e7 = v_texCoord_1;+ let _e8 = textureSample(u_mask_est, u_mask_ess, _e7);+ let _e9 = v_color_1;+ fragColor = (_e8 * _e9);return;}diff --git a/desktop/public/scenes/mat-tint/tint.esshader b/desktop/public/scenes/mat-tint/tint.esshaderindex a26150205..8613c37e1 100644--- a/desktop/public/scenes/mat-tint/tint.esshader+++ b/desktop/public/scenes/mat-tint/tint.esshader@@ -77,7 +77,7 @@ struct VSOut {#pragma vertex wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 3d59104832a24e44+// source-hash: e7a1c1ef8d0e282fstruct gl_PerVertex {@builtin(position) gl_Position: vec4<f32>,gl_PointSize: f32,@@ -85,6 +85,7 @@ struct gl_PerVertex {struct FrameConstants {u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,}struct TimeConstants {@@ -144,11 +145,16 @@ fn vs_main(@location(0) a_position: vec3<f32>, @location(1) a_color: vec4<f32>,#pragma fragment wgsl full// GENERATED by tools/gen-shader-twins.mjs (glslang + naga) - do not edit.// Regenerate after changing the GLSL stages above.-// source-hash: 3d59104832a24e44+// source-hash: e7a1c1ef8d0e282fstruct MaterialConstants {u_tint: vec4<f32>,}+struct FrameConstants {+ u_projection: mat4x4<f32>,+ u_camera: vec4<f32>,+}+struct TimeConstants {u_time: vec4<f32>,u_viewport: vec4<f32>,@@ -163,8 +169,10 @@ var<private> fragColor: vec4<f32>;var<private> v_color_1: vec4<f32>;@group(0) @binding(1)var<uniform> unnamed: MaterialConstants;+@group(0) @binding(0)+var<uniform> unnamed_1: FrameConstants;@group(0) @binding(3)-var<uniform> unnamed_1: TimeConstants;+var<uniform> unnamed_2: TimeConstants;@group(1) @binding(1)var es_bt1_est: texture_2d<f32>;@group(1) @binding(9)@@ -197,13 +205,13 @@ var es_bt7_ess: sampler;fn main_1() {var texColor: vec4<f32>;- let _e23 = v_texCoord_1;- let _e24 = textureSample(es_bt0_est, es_bt0_ess, _e23);- texColor = _e24;- let _e25 = texColor;- let _e26 = v_color_1;- let _e29 = unnamed.u_tint;- fragColor = ((_e25 * _e26) * _e29);+ let _e24 = v_texCoord_1;+ let _e25 = textureSample(es_bt0_est, es_bt0_ess, _e24);+ texColor = _e25;+ let _e26 = texColor;+ let _e27 = v_color_1;+ let _e30 = unnamed.u_tint;+ fragColor = ((_e26 * _e27) * _e30);return;}diff --git a/tools/gen-shader-twins.mjs b/tools/gen-shader-twins.mjsindex afe299a55..14345cc79 100644--- a/tools/gen-shader-twins.mjs+++ b/tools/gen-shader-twins.mjs@@ -57,6 +57,13 @@ const BLOCK_BINDINGS = {TimeConstants: 3,};+// The samplers the Lit-2D header declares, on the units it pins them to — the+// same two mesh.esshader's hand-written twin names.+const ENGINE_SAMPLERS = [+ { name: 'u_shadowMap', unit: 2 },+ { name: 'u_envMap', unit: 3 },+];+// Group-1 unit map — mirrors WebGPUMappings textureBindingForUnit/samplerBindingForUnit.const textureBindingForUnit = (u) => (u < 8 ? u : u + 8);const samplerBindingForUnit = (u) => (u < 8 ? u + 8 : u + 16);@@ -127,8 +134,8 @@ function adaptGlsl(glsl, textures) {}// Reflected texture params (assembled as `uniform highp sampler2D <name>;`)- // at their reflected material units.- for (const { name, unit } of textures) {+ // at their reflected material units, then the ones the injected header brings.+ for (const { name, unit } of [...textures, ...ENGINE_SAMPLERS]) {const declRe = new RegExp(`uniform\\s+(?:highp\\s+)?sampler2D\\s+${name}\\s*;`);if (!declRe.test(out)) continue;out = out.replace(declRe, splitUniformDecl(name, unit));