@woosh/meep-engine 3.11.1 → 3.11.3

package/src/shade/renderer/atmosphere/shader_sky_irradiance_lut.js

@@ -1,205 +1,216 @@
-import { u32 } from "../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
-import { WebGPUArray } from "../shader/type/WebGPUArray.js";
-import { WebGPUStruct } from "../shader/type/WebGPUStruct.js";
-import { CAMERA_UNIFORM_STRUCT } from "../camera/CAMERA_UNIFORM_STRUCT.js";
-import { ATMOSPHERE_HEIGHT_DECLARATION } from "../shader/chunk/atmosphere/ATMOSPHERE_HEIGHT_DECLARATION.js";
-import {
-    C_MIE_ABSORPTION_DECLARATION,
-    C_MIE_SCATTERING_DECLARATION
-} from "../shader/chunk/atmosphere/C_MIE_SCATTERING_DECLARATION.js";
-import { C_OZONE_DECLARATION } from "../shader/chunk/atmosphere/C_OZONE_DECLARATION.js";
-import { C_RAYLEIGH_DECLARATION } from "../shader/chunk/atmosphere/C_RAYLEIGH_DECLARATION.js";
-import { chunk_atmosphere_density } from "../shader/chunk/atmosphere/chunk_atmosphere_density.js";
-import { chunk_atmosphere_height } from "../shader/chunk/atmosphere/chunk_atmosphere_height.js";
-import {
-    chunk_position_relative_to_planet_center
-} from "../shader/chunk/atmosphere/chunk_position_relative_to_planet_center.js";
-
-import { chunk_sphere_intersection_nearest } from "../shader/chunk/atmosphere/chunk_sphere_intersection_nearest.js";
-import {
-    chunk_phase_mie_cornette_shanks
-} from "../shader/chunk/atmosphere/phase/chunk_phase_mie_cornette_shanks.js";
-import { chunk_phase_rayleigh } from "../shader/chunk/atmosphere/phase/chunk_phase_rayleigh.js";
-import { PLANET_CENTER_DECLARATION } from "../shader/chunk/atmosphere/PLANET_CENTER_DECLARATION.js";
-import { PLANET_RADIUS_DECLARATION } from "../shader/chunk/atmosphere/PLANET_RADIUS_DECLARATION.js";
-import { chunk_mat4_extract_position } from "../shader/chunk/geometry/mat4/chunk_mat4_extract_position.js";
-import {
-    chunk_uv_octahedral_unit_decode
-} from "../shader/chunk/geometry/octahedron/chunk_uv_octahedral_unit_decode.js";
-import { chunk_light_get_sun } from "../shader/chunk/light/sky/chunk_sample_sky_color.js";
-import { chunk_safe_acos } from "../shader/chunk/math/chunk_safe_acos.js";
-import { chunk_safe_sqrt } from "../shader/chunk/math/chunk_safe_sqrt.js";
-import { PI_DECLARATION } from "../shader/chunk/math/PI_DECLARATION.js";
-import { CodeChunk } from "../shader/compiler/CodeChunk.js";
-import { ImageShader } from "../shader/ImageShader.js";
-import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
-import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
-import { ATMOSPHERE_ALTITUDE_CUTOFF } from "./ATMOSPHERE_ALTITUDE_CUTOFF.js";
-
-import { chunk_sample_multiscatter_lut } from "./chunk_sample_multiscatter_lut.js";
-import { chunk_sample_transmittance_lut } from "./chunk_sample_transmittance_lut.js";
-import { MIE_G } from "./MIE_G.js";
-
-const SETTINGS_STRUCT = WebGPUStruct.from({
-    steps: u32,
-});
-
-const resources = new ShaderResourceSetDescriptor();
-
-resources.createGroup()
-    .addUniform("settings", SETTINGS_STRUCT)
-    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
-    .addTexture("tSkyLutTransmittance")
-    .addTexture("tSkyLutMultiscatter")
-;
-
-resources.createGroup()
-    .addStorageBuffer("light_data", WebGPUArray.u32)
-
-const chunk_raymarch_scattering = CodeChunk.from(
-    //language=WGSL
-    `
-fn raymarch_scattering(
-    origin: vec3<f32>, 
-    ray_dir: vec3<f32>, 
-    sun_dir: vec3<f32>,
-    tMax: f32,
-    numSteps: f32
-) -> vec3<f32> {
-    let cosTheta = dot(ray_dir, sun_dir);
-    
-    let miePhaseValue = phase_mie(cosTheta, ${MIE_G});
-    let rayleighPhaseValue = phase_rayleigh(-cosTheta);
-    
-    var lum = vec3(0.0);
-    var transmittance = vec3(1.0);
-    
-    var t = 0.0;
-    for (var i = 0.0; i < numSteps; i += 1.0) {
-        
-        let newT = ((i + 0.3)/numSteps)*tMax;
-        let dt = newT - t;
-        t = newT;
-        
-        let position = origin + t * ray_dir;
-        
-        let local_height = atmosphere_height(position);
-        let local_density = atmosphere_density(local_height);
-        
-        let ozone_density = local_density.z;
-        let ozone_absorption =  ozone_density * C_OZONE;
-        
-        let mie_density = local_density.y;
-        let mie_absorption = mie_density * C_MIE_ABSORPTION;
-        let mie_scattering = mie_density * C_MIE_SCATTERING;
-        
-        // note - taken from the Hillaire's atmosphere code: https://github.com/sebh/UnrealEngineSkyAtmosphere/blob/183ead5bdacc701b3b626347a680a2f3cd3d4fbd/Resources/RenderSkyCommon.hlsl#L248
-        let rayleigh_absorption = 0.0;
-        let rayleigh_scattering = local_density.x * C_RAYLEIGH;
-        
-        let extinction = rayleigh_scattering + rayleigh_absorption + mie_scattering + mie_absorption + ozone_absorption;
-
-        
-        let sample_transmittance = exp( -dt * extinction );
-
-        let sun_transmittance = sample_transmittance_lut(position, sun_dir);
-        let psiMS = sample_multiscatter_lut(position, sun_dir);
-        
-        let rayleigh_in_scattering = rayleigh_scattering * ( rayleighPhaseValue * sun_transmittance + psiMS );
-        let mie_in_scattering = mie_scattering * ( miePhaseValue * sun_transmittance + psiMS );
-        let in_scattering = ( rayleigh_in_scattering + mie_in_scattering );
-
-        // Integrated scattering within path segment.
-        let scattering_integral = ( in_scattering - in_scattering * sample_transmittance ) / extinction;
-
-        lum += scattering_integral * transmittance;
-        
-        transmittance *= sample_transmittance;
-    }
-    
-    return lum;
-}
-    `, [
-        chunk_atmosphere_height,
-        chunk_atmosphere_density,
-        chunk_phase_mie_cornette_shanks,
-        chunk_phase_rayleigh,
-        chunk_sample_transmittance_lut,
-        chunk_sample_multiscatter_lut,
-        C_MIE_ABSORPTION_DECLARATION,
-        C_MIE_SCATTERING_DECLARATION,
-        C_OZONE_DECLARATION,
-        C_RAYLEIGH_DECLARATION,
-    ]
-);
-
-const body = CodeChunk.from(
-    //language=WGSL
-    `
-@fragment
-fn main(
-    @builtin(position) coord: vec4<f32>,
-    @location(0) uv: vec2<f32>,
-) -> @location(0) vec4<f32> {
-    
-	var actual_view_position = mat4_extract_position(camera.transform);
-	
-    let relative_position = position_relative_to_planet_center(actual_view_position);
-    
-    let up = normalize(relative_position);
-    
-    let height = length(relative_position);
-    
-    // force view into valid range
-    let clamped_height = clamp(height , PLANET_RADIUS + ${ATMOSPHERE_ALTITUDE_CUTOFF}, PLANET_RADIUS + ATMOSPHERE_HEIGHT - ${ATMOSPHERE_ALTITUDE_CUTOFF});
-    
-    let view_position = up * clamped_height + PLANET_CENTER;
-   
-    let rayDir = uv_octahedral_unit_decode(uv);
-    
-    let sun = light_get_sun();
-    
-    let sunAltitude = ( 0.5 * PI ) - safe_acos( dot(-sun.direction, up) );
-    let sunDir = vec3(0.0, sin(sunAltitude), -cos(sunAltitude));
-    
-    let atmoDist = sphere_intersection_nearest(view_position, rayDir, PLANET_CENTER, PLANET_RADIUS + ATMOSPHERE_HEIGHT);
-    let groundDist = sphere_intersection_nearest(view_position, rayDir, PLANET_CENTER, PLANET_RADIUS);
-    
-    let tMax = select(atmoDist, groundDist,  groundDist > 0.0);
-    
-    let lum = raymarch_scattering(view_position, rayDir, sunDir, tMax, f32(settings.steps));
-    
-    // TODO validate this, it "feels" wrong to me
-    let irradiance = lum * sun.color;
-    
-    return vec4(irradiance, 1.0);
-
-}
-    `, [
-        chunk_safe_acos,
-        chunk_safe_sqrt,
-        chunk_light_get_sun,
-        chunk_position_relative_to_planet_center,
-        chunk_mat4_extract_position,
-        PLANET_RADIUS_DECLARATION,
-        PLANET_CENTER_DECLARATION,
-        ATMOSPHERE_HEIGHT_DECLARATION,
-        PI_DECLARATION,
-        chunk_sphere_intersection_nearest,
-        chunk_uv_octahedral_unit_decode,
-        chunk_raymarch_scattering,
-    ]
-);
-
-export const shader_sky_irradiance_lut = new ImageShader({
-    descriptor: ShaderDescriptor.from({
-        label: "Sky / sky irradiance LUT",
-        body,
-        resources
-    }),
-    targets: [
-        {
-            format: "rgba16float"
-        }
-    ]
+import { WebGPUArray } from "../shader/type/WebGPUArray.js";
+import { CAMERA_UNIFORM_STRUCT } from "../camera/CAMERA_UNIFORM_STRUCT.js";
+import { ATMOSPHERE_HEIGHT_DECLARATION } from "../shader/chunk/atmosphere/ATMOSPHERE_HEIGHT_DECLARATION.js";
+import {
+    C_MIE_ABSORPTION_DECLARATION,
+    C_MIE_SCATTERING_DECLARATION
+} from "../shader/chunk/atmosphere/C_MIE_SCATTERING_DECLARATION.js";
+import { C_OZONE_DECLARATION } from "../shader/chunk/atmosphere/C_OZONE_DECLARATION.js";
+import { C_RAYLEIGH_DECLARATION } from "../shader/chunk/atmosphere/C_RAYLEIGH_DECLARATION.js";
+import { ATMOSPHERE_RADII_DECLARATION } from "../shader/chunk/atmosphere/ATMOSPHERE_RADII_DECLARATION.js";
+import { chunk_atmosphere_density } from "../shader/chunk/atmosphere/chunk_atmosphere_density.js";
+import { chunk_atmosphere_ray_bounds } from "../shader/chunk/atmosphere/chunk_atmosphere_ray_bounds.js";
+import {
+    chunk_position_relative_to_planet_center
+} from "../shader/chunk/atmosphere/chunk_position_relative_to_planet_center.js";
+
+import {
+    chunk_phase_mie_cornette_shanks
+} from "../shader/chunk/atmosphere/phase/chunk_phase_mie_cornette_shanks.js";
+import { chunk_phase_rayleigh } from "../shader/chunk/atmosphere/phase/chunk_phase_rayleigh.js";
+import { PLANET_RADIUS_DECLARATION } from "../shader/chunk/atmosphere/PLANET_RADIUS_DECLARATION.js";
+import { chunk_mat4_extract_position } from "../shader/chunk/geometry/mat4/chunk_mat4_extract_position.js";
+import {
+    chunk_uv_octahedral_unit_decode
+} from "../shader/chunk/geometry/octahedron/chunk_uv_octahedral_unit_decode.js";
+import { chunk_light_get_sun } from "../shader/chunk/light/sky/chunk_sample_sky_color.js";
+import { chunk_safe_acos } from "../shader/chunk/math/chunk_safe_acos.js";
+import { PI_DECLARATION } from "../shader/chunk/math/PI_DECLARATION.js";
+import { CodeChunk } from "../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+import { ATMOSPHERE_ALTITUDE_CUTOFF } from "./ATMOSPHERE_ALTITUDE_CUTOFF.js";
+
+import { chunk_sample_multiscatter_lut_params } from "./chunk_sample_multiscatter_lut.js";
+import { chunk_sample_transmittance_lut_params } from "./chunk_sample_transmittance_lut.js";
+import { MIE_G } from "./MIE_G.js";
+import { SAMPLER_SKY_LUT } from "./SAMPLER_SKY_LUT.js";
+
+/**
+ * Ray-march steps per texel. Compile-time on purpose: as a uniform the march could not be
+ * unrolled and its trip count had to be re-tested against an f32 every iteration.
+ * @type {number}
+ */
+const SKY_IRRADIANCE_LUT_STEPS = 32;
+
+const resources = new ShaderResourceSetDescriptor();
+
+resources.createGroup()
+    .addUniform("camera", CAMERA_UNIFORM_STRUCT)
+    // "float" rather than the default "unfilterable-float": both LUTs are rgba16float,
+    // which is filterable in core WebGPU, so they go through the texture unit rather than a
+    // 4-tap manual bilinear -- see chunk_sample_transmittance_lut.
+    .addTexture("tSkyLutTransmittance", "float")
+    .addTexture("tSkyLutMultiscatter", "float")
+    .addSampler("sSkyLut", "filtering", SAMPLER_SKY_LUT)
+;
+
+resources.createGroup()
+    .addStorageBuffer("light_data", WebGPUArray.u32)
+
+const chunk_raymarch_scattering = CodeChunk.from(
+    //language=WGSL
+    `
+const SKY_IRRADIANCE_STEPS = ${SKY_IRRADIANCE_LUT_STEPS}u;
+const SKY_IRRADIANCE_STEPS_F = f32(SKY_IRRADIANCE_STEPS);
+
+fn raymarch_scattering(
+    origin_rel: vec3<f32>,
+    ray_dir: vec3<f32>,
+    sun_dir: vec3<f32>,
+    tMax: f32
+) -> vec3<f32> {
+    let cosTheta = dot(ray_dir, sun_dir);
+    
+    let miePhaseValue = phase_mie(cosTheta, ${MIE_G});
+    let rayleighPhaseValue = phase_rayleigh(-cosTheta);
+    
+    var lum = vec3(0.0);
+    var transmittance = vec3(1.0);
+    
+    var t = 0.0;
+    for (var step_i = 0u; step_i < SKY_IRRADIANCE_STEPS; step_i++) {
+
+        let newT = ((f32(step_i) + 0.3)/SKY_IRRADIANCE_STEPS_F)*tMax;
+        let dt = newT - t;
+        t = newT;
+
+        // One square root for the whole step. Marching the planet-relative position yields
+        // the altitude and the up vector from the same length, and both LUT lookups take
+        // that pair directly -- each used to recover it from a world position of its own,
+        // which was three lengths and two normalizes per step for one step's worth of work.
+        let step_rel = origin_rel + t * ray_dir;
+        let step_radius = length(step_rel);
+        let up = step_rel / step_radius;
+
+        let local_height = step_radius - ATMOSPHERE_GROUND_RADIUS;
+        let sun_cos_zenith_angle = dot(sun_dir, up);
+
+        let local_density = atmosphere_density(local_height);
+        
+        let ozone_density = local_density.z;
+        let ozone_absorption =  ozone_density * C_OZONE;
+        
+        let mie_density = local_density.y;
+        let mie_absorption = mie_density * C_MIE_ABSORPTION;
+        let mie_scattering = mie_density * C_MIE_SCATTERING;
+        
+        // note - taken from the Hillaire's atmosphere code: https://github.com/sebh/UnrealEngineSkyAtmosphere/blob/183ead5bdacc701b3b626347a680a2f3cd3d4fbd/Resources/RenderSkyCommon.hlsl#L248
+        let rayleigh_absorption = 0.0;
+        let rayleigh_scattering = local_density.x * C_RAYLEIGH;
+        
+        let extinction = rayleigh_scattering + rayleigh_absorption + mie_scattering + mie_absorption + ozone_absorption;
+
+        
+        let sample_transmittance = exp( -dt * extinction );
+
+        let sun_transmittance = sample_transmittance_lut_params(local_height, sun_cos_zenith_angle);
+        let psiMS = sample_multiscatter_lut_params(local_height, sun_cos_zenith_angle);
+        
+        let rayleigh_in_scattering = rayleigh_scattering * ( rayleighPhaseValue * sun_transmittance + psiMS );
+        let mie_in_scattering = mie_scattering * ( miePhaseValue * sun_transmittance + psiMS );
+        let in_scattering = ( rayleigh_in_scattering + mie_in_scattering );
+
+        // Integrated scattering within path segment.
+        let scattering_integral = ( in_scattering - in_scattering * sample_transmittance ) / extinction;
+
+        lum += scattering_integral * transmittance;
+        
+        transmittance *= sample_transmittance;
+    }
+    
+    return lum;
+}
+    `, [
+        ATMOSPHERE_RADII_DECLARATION,
+        chunk_atmosphere_density,
+        chunk_phase_mie_cornette_shanks,
+        chunk_phase_rayleigh,
+        chunk_sample_transmittance_lut_params,
+        chunk_sample_multiscatter_lut_params,
+        C_MIE_ABSORPTION_DECLARATION,
+        C_MIE_SCATTERING_DECLARATION,
+        C_OZONE_DECLARATION,
+        C_RAYLEIGH_DECLARATION,
+    ]
+);
+
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+@fragment
+fn main(
+    @builtin(position) coord: vec4<f32>,
+    @location(0) uv: vec2<f32>,
+) -> @location(0) vec4<f32> {
+    
+	var actual_view_position = mat4_extract_position(camera.transform);
+	
+    let relative_position = position_relative_to_planet_center(actual_view_position);
+    
+    let up = normalize(relative_position);
+    
+    let height = length(relative_position);
+    
+    // force view into valid range
+    let clamped_height = clamp(height , PLANET_RADIUS + ${ATMOSPHERE_ALTITUDE_CUTOFF}, PLANET_RADIUS + ATMOSPHERE_HEIGHT - ${ATMOSPHERE_ALTITUDE_CUTOFF});
+    
+    // planet-relative, which is what both the bounds and the march want
+    let view_rel = up * clamped_height;
+
+    let rayDir = uv_octahedral_unit_decode(uv);
+    
+    let sun = light_get_sun();
+    
+    let sunAltitude = ( 0.5 * PI ) - safe_acos( dot(-sun.direction, up) );
+    let sunDir = vec3(0.0, sin(sunAltitude), -cos(sunAltitude));
+    
+    // one quadratic setup for both spheres, rather than two calls sharing an origin and a
+    // centre that differ only in radius
+    let bounds = atmosphere_ray_bounds(view_rel, rayDir);
+
+    let lum = raymarch_scattering(view_rel, rayDir, sunDir, bounds.t_max);
+    
+    // TODO validate this, it "feels" wrong to me
+    let irradiance = lum * sun.color;
+    
+    return vec4(irradiance, 1.0);
+
+}
+    `, [
+        chunk_safe_acos,
+        chunk_light_get_sun,
+        chunk_position_relative_to_planet_center,
+        chunk_mat4_extract_position,
+        PLANET_RADIUS_DECLARATION,
+        ATMOSPHERE_HEIGHT_DECLARATION,
+        PI_DECLARATION,
+        chunk_atmosphere_ray_bounds,
+        chunk_uv_octahedral_unit_decode,
+        chunk_raymarch_scattering,
+    ]
+);
+
+export const shader_sky_irradiance_lut = new ImageShader({
+    descriptor: ShaderDescriptor.from({
+        label: "Sky / sky irradiance LUT",
+        body,
+        resources
+    }),
+    targets: [
+        {
+            format: "rgba16float"
+        }
+    ]
 });

package/src/shade/renderer/atmosphere/shader_transmittance_lut.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_transmittance_lut.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/atmosphere/shader_transmittance_lut.js"],"names":[],"mappings":"AAoDA;;;GAGG;AACH,uCAFU,WAAW,CAWlB;4BA3DyB,0BAA0B"}
+{"version":3,"file":"shader_transmittance_lut.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/atmosphere/shader_transmittance_lut.js"],"names":[],"mappings":"AAgEA;;;GAGG;AACH,uCAFU,WAAW,CAWlB;4BAtEyB,0BAA0B"}

package/src/shade/renderer/atmosphere/shader_transmittance_lut.js

@@ -1,67 +1,79 @@
-import { u32 } from "../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
-import { WebGPUStruct } from "../shader/type/WebGPUStruct.js";
-import { ATMOSPHERE_HEIGHT_DECLARATION } from "../shader/chunk/atmosphere/ATMOSPHERE_HEIGHT_DECLARATION.js";
-import { chunk_get_sun_transmittance } from "../shader/chunk/atmosphere/chunk_get_sun_transmittance.js";
-import { chunk_safe_acos } from "../shader/chunk/math/chunk_safe_acos.js";
-import { CodeChunk } from "../shader/compiler/CodeChunk.js";
-import { ImageShader } from "../shader/ImageShader.js";
-import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
-import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
-
-const TRANSMITTANCE_LUT_SETTINGS_STRUCT = WebGPUStruct.from({
-    // how many ray-marching steps to take per pixel of LUT, more steps = higher accuracy but lower performance
-    steps: u32,
-});
-
-const resources = new ShaderResourceSetDescriptor();
-resources.createGroup()
-    .addUniform("settings", TRANSMITTANCE_LUT_SETTINGS_STRUCT)
-;
-
-/**
- * @see https://www.shadertoy.com/view/slSXRW
- * @type {CodeChunk}
- */
-const body = CodeChunk.from(
-    //language=WGSL
-    `
-
-@fragment
-fn main(
-    @builtin(position) coord: vec4<f32>,
-    @location(0) uv: vec2<f32>,
-) -> @location(0) vec4<f32> {
-            
-    let sunCosTheta = 2.0*uv.x - 1.0;
-    let sunTheta = safe_acos(sunCosTheta);
-    
-    let height = ATMOSPHERE_HEIGHT*uv.y;
-    
-    let pos = vec3(0.0, height, 0.0); 
-    let sunDir = normalize(vec3(0.0, sunCosTheta, -sin(sunTheta)));
-    
-    return vec4(get_sun_transmittance(pos, sunDir, f32(settings.steps)), 1.0);
-
-}
-    `, [
-        chunk_get_sun_transmittance,
-        chunk_safe_acos,
-        ATMOSPHERE_HEIGHT_DECLARATION,
-    ]
-);
-
-/**
- * @see https://www.shadertoy.com/view/slSXRW
- * @type {ImageShader}
- */
-export const shader_transmittance_lut = new ImageShader({
-    descriptor: ShaderDescriptor.from({
-        label: "Sky / transmittance LUT",
-        resources,
-        body
-    }),
-    targets: [{
-        format: "rgba16float",
-    }]
-});
-
+import { u32, vec2u } from "../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
+import { WebGPUStruct } from "../shader/type/WebGPUStruct.js";
+import { ATMOSPHERE_HEIGHT_DECLARATION } from "../shader/chunk/atmosphere/ATMOSPHERE_HEIGHT_DECLARATION.js";
+import { chunk_get_sun_transmittance } from "../shader/chunk/atmosphere/chunk_get_sun_transmittance.js";
+import { chunk_safe_acos } from "../shader/chunk/math/chunk_safe_acos.js";
+import { chunk_sky_lut_texel_to_unit } from "./chunk_sky_lut_texel_to_unit.js";
+import { CodeChunk } from "../shader/compiler/CodeChunk.js";
+import { ImageShader } from "../shader/ImageShader.js";
+import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
+import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
+
+const TRANSMITTANCE_LUT_SETTINGS_STRUCT = WebGPUStruct.from({
+    // how many ray-marching steps to take per pixel of LUT, more steps = higher accuracy but lower performance
+    steps: u32,
+    // size of the target being written, which a fragment shader cannot ask for. Needed to
+    // know which point of the parameter range each texel stands for -- see
+    // chunk_sky_lut_texel_to_unit. Pass the dimensions of the texture actually being drawn
+    // into: a mismatch silently skews the whole LUT.
+    resolution: vec2u,
+});
+
+const resources = new ShaderResourceSetDescriptor();
+resources.createGroup()
+    .addUniform("settings", TRANSMITTANCE_LUT_SETTINGS_STRUCT)
+;
+
+/**
+ * @see https://www.shadertoy.com/view/slSXRW
+ * @type {CodeChunk}
+ */
+const body = CodeChunk.from(
+    //language=WGSL
+    `
+
+@fragment
+fn main(
+    @builtin(position) coord: vec4<f32>,
+) -> @location(0) vec4<f32> {
+
+    // coord.xy is the fragment centre, so flooring it gives this texel's index. The point of
+    // each range the texel stands for then comes from sky_lut_texel_to_unit, whose inverse
+    // sky_lut_uv every lookup goes through -- a generator that skipped it would write a LUT
+    // addressed half a texel off at both ends.
+    let unit = sky_lut_texel_to_unit(floor(coord.xy), vec2<f32>(settings.resolution));
+
+    let sunCosTheta = 2.0*unit.x - 1.0;
+    let sunTheta = safe_acos(sunCosTheta);
+
+    let height = ATMOSPHERE_HEIGHT*unit.y;
+    
+    let pos = vec3(0.0, height, 0.0); 
+    let sunDir = normalize(vec3(0.0, sunCosTheta, -sin(sunTheta)));
+    
+    return vec4(get_sun_transmittance(pos, sunDir, f32(settings.steps)), 1.0);
+
+}
+    `, [
+        chunk_get_sun_transmittance,
+        chunk_safe_acos,
+        chunk_sky_lut_texel_to_unit,
+        ATMOSPHERE_HEIGHT_DECLARATION,
+    ]
+);
+
+/**
+ * @see https://www.shadertoy.com/view/slSXRW
+ * @type {ImageShader}
+ */
+export const shader_transmittance_lut = new ImageShader({
+    descriptor: ShaderDescriptor.from({
+        label: "Sky / transmittance LUT",
+        resources,
+        body
+    }),
+    targets: [{
+        format: "rgba16float",
+    }]
+});
+

package/src/shade/renderer/light/cluster/graph_assign_clsuters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph_assign_clsuters.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/cluster/graph_assign_clsuters.js"],"names":[],"mappings":"AA4CA;;;;;;;;GAQG;AACH,iGAFY;IAAC,cAAc,EAAC,MAAM,CAAC;IAAC,YAAY,EAAC,MAAM,CAAC;IAAC,kBAAkB,EAAC,MAAM,CAAA;CAAC,CAqHlF"}
+{"version":3,"file":"graph_assign_clsuters.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/light/cluster/graph_assign_clsuters.js"],"names":[],"mappings":"AA4CA;;;;;;;;GAQG;AACH,iGAFY;IAAC,cAAc,EAAC,MAAM,CAAC;IAAC,YAAY,EAAC,MAAM,CAAC;IAAC,kBAAkB,EAAC,MAAM,CAAA;CAAC,CAyHlF"}

package/src/shade/renderer/light/cluster/graph_assign_clsuters.js

@@ -1,9 +1,9 @@
 import { assert } from "../../../../core/assert.js";
-import { slice_flat_array } from "../../util/slice_flat_array.js";
 import { BufferResourceDescriptor } from "../../../device/graph/BufferResourceDescriptor.js";
-import { u32 } from "../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
 import { graph_import_typed_buffer } from "../../shader/graph/graph_import_typed_buffer.js";
+import { u32 } from "../../shader/type/WEBGPU_WGSL_PRIMITIVE_TYPES.js";
 import { update_frustum_far_plane } from "../../shadow/map/update_frustum_far_plane.js";
+import { slice_flat_array } from "../../util/slice_flat_array.js";
 import { build_light_cluster_parameters } from "./build_light_cluster_parameters.js";
 import { LIGHT_CLUSTER_LOCAL_LIGHT_LIMIT } from "./LIGHT_CLUSTER_LOCAL_LIGHT_LIMIT.js";
 import { LIGHT_CLUSTER_METADATA } from "./LIGHT_CLUSTER_METADATA.js";
@@ -62,6 +62,8 @@ export function graph_assign_clsuters({
     assert.defined(resolution, 'resolution');
     assert.isArrayLike(resolution, 'resolution');
 
+    graph.push_scope("assign clusters");
+
     const cluster_params = build_light_cluster_parameters(
         [], 0,
         LIGHT_CLUSTER_RESOLUTION_Z,
@@ -161,6 +163,8 @@ export function graph_assign_clsuters({
         0, 16, // clear offset
     ));
 
+    graph.pop_scope();
+
     return {
         cluster_lookup: data.cluster_lookup,
         cluster_data: data.cluster_data,

package/src/shade/renderer/postprocess/gtao/GTAO.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GTAO.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/postprocess/gtao/GTAO.js"],"names":[],"mappings":"AAQA;IAQI;;;OAGG;IACH,uCAUC;IAED;;;;OAIG;IACH,UAHW,MAAM,KACN,MAAM,QAKhB;IAED;;;;;;;;;;;;;;OAcG;IACH,8JAFa;QAAC,SAAS,EAAC,MAAM,CAAC;QAAC,YAAY,EAAC,MAAM,CAAC;QAAC,gBAAgB,EAAC,MAAM,CAAA;KAAC,CAyF5E;;CACJ"}
+{"version":3,"file":"GTAO.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/postprocess/gtao/GTAO.js"],"names":[],"mappings":"AAQA;IAQI;;;OAGG;IACH,uCAUC;IAED;;;;OAIG;IACH,UAHW,MAAM,KACN,MAAM,QAKhB;IAED;;;;;;;;;;;;;;OAcG;IACH,8JAFa;QAAC,SAAS,EAAC,MAAM,CAAC;QAAC,YAAY,EAAC,MAAM,CAAC;QAAC,gBAAgB,EAAC,MAAM,CAAA;KAAC,CA6F5E;;CACJ"}

package/src/shade/renderer/postprocess/gtao/GTAO.js

@@ -68,6 +68,8 @@ export class GTAO {
                    resolution
                }) {
 
+        graph.push_scope("GTAO");
+
         this.resize(...resolution);
 
         const h0 = this.#history[frame_index % 2];
@@ -137,6 +139,8 @@ export class GTAO {
             load_op: "load", // necessary to make sure we blend with existing AO
         })[0];
 
+        graph.pop_scope();
+
         return {
             visibility: moments_output,
             occlusion: filtered_occlusion,