@woosh/meep-engine 3.50.0 → 3.52.0

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

@@ -1,216 +1,228 @@
-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"
-        }
-    ]
+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 {
+    chunk_texture_octahedral_skirt_texel_uv
+} from "../shader/chunk/texture/octahedral/chunk_texture_octahedral_skirt_texel_uv.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;
+
+/**
+ * Side of the sky irradiance map, skirt included: it is an environment map like any other, so its
+ * level 0 carries the one-texel octahedral skirt (see `texture_octahedral_skirt_uv`).
+ * @type {number}
+ */
+export const SKY_IRRADIANCE_LUT_RESOLUTION = 1024;
+
+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;
+
+    // skirt texels compute their interior twin's direction, so the skirt is a copy of it
+    let rayDir = uv_octahedral_unit_decode(texture_octahedral_skirt_texel_uv(vec2<u32>(coord.xy), ${SKY_IRRADIANCE_LUT_RESOLUTION}u));
+    
+    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_texture_octahedral_skirt_texel_uv,
+        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/deferred/SHADING_LIGHT_RESOURCE_GROUP.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SHADING_LIGHT_RESOURCE_GROUP.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/SHADING_LIGHT_RESOURCE_GROUP.js"],"names":[],"mappings":"AAUA,yEAAgF;8CAHlC,qDAAqD"}
+{"version":3,"file":"SHADING_LIGHT_RESOURCE_GROUP.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/SHADING_LIGHT_RESOURCE_GROUP.js"],"names":[],"mappings":"AAWA,yEAAgF;8CAJlC,qDAAqD"}

package/src/shade/renderer/deferred/SHADING_LIGHT_RESOURCE_GROUP.js

@@ -7,12 +7,14 @@ import { ENVIRONMENT_MAP_RESOURCE } from "../light/environment/ENVIRONMENT_MAP_R
 import { LIGHT_DATA_RESOURCE } from "../light/LIGHT_DATA_RESOURCE.js";
 import { ShaderResourceGroupDescriptor } from "../shader/resource/ShaderResourceGroupDescriptor.js";
 import { SHADOWMAP_ATLAS_RESOURCE, SHADOWMAP_COMPARE_SAMPLER_RESOURCE } from "../shadow/map/SHADOWMAP_RESOURCES.js";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 export const SHADING_LIGHT_RESOURCE_GROUP = new ShaderResourceGroupDescriptor();
 
 SHADING_LIGHT_RESOURCE_GROUP
     .add(LIGHT_DATA_RESOURCE)
     .add(ENVIRONMENT_MAP_RESOURCE)
+    .add(ENVIRONMENT_MAP_SAMPLER_RESOURCE)
     // clusters
     .add(LIGHT_CLUSTER_PARAMETERS_RESOURCE)
     .add(LIGHT_CLUSTER_LOOKUP_RESOURCE)

package/src/shade/renderer/deferred/indirect/chunk_get_ibl_irradiance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_get_ibl_irradiance.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_get_ibl_irradiance.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH,uCAFU,SAAS,CAYjB;0BAjBwB,oCAAoC"}
+{"version":3,"file":"chunk_get_ibl_irradiance.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_get_ibl_irradiance.js"],"names":[],"mappings":"AAMA;;;GAGG;AACH,uCAFU,SAAS,CAYjB;0BAlBwB,oCAAoC"}

package/src/shade/renderer/deferred/indirect/chunk_get_ibl_irradiance.js

@@ -2,6 +2,7 @@ import { PI_DECLARATION } from "../../shader/chunk/math/PI_DECLARATION.js";
 import { chunk_sample_environment_map } from "../../shader/chunk/texture/sample/chunk_sample_environment_map.js";
 import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
 import { ENVIRONMENT_MAP_RESOURCE } from "../../light/environment/ENVIRONMENT_MAP_RESOURCE.js";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../../light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 /**
  * see https://github.com/mrdoob/three.js/blob/089e36db16a6fbaf8cd12fbc8b6abfa3beaa4801/src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl.js#L4
@@ -11,7 +12,7 @@ export const chunk_get_ibl_irradiance = CodeChunk.from(
     //language=WGSL
     `
 fn get_ibl_irradiance(normal: vec3<f32>) -> vec3<f32> {
-    return sample_environment_map(tEnvironment, normal, 1.0) * PI;
+    return sample_environment_map(tEnvironment, sEnvironment, normal, 1.0) * PI;
 }
     `, [
         chunk_sample_environment_map,
@@ -19,4 +20,5 @@ fn get_ibl_irradiance(normal: vec3<f32>) -> vec3<f32> {
     ]
 );
 
-chunk_get_ibl_irradiance.requireResource(ENVIRONMENT_MAP_RESOURCE);
+chunk_get_ibl_irradiance.requireResource(ENVIRONMENT_MAP_RESOURCE);
+chunk_get_ibl_irradiance.requireResource(ENVIRONMENT_MAP_SAMPLER_RESOURCE);

package/src/shade/renderer/deferred/indirect/chunk_get_ibl_radiance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_get_ibl_radiance.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_get_ibl_radiance.js"],"names":[],"mappings":"AAKA;;;GAGG;AACH,qCAFU,SAAS,CAqBZ;0BA1BmB,oCAAoC"}
+{"version":3,"file":"chunk_get_ibl_radiance.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/indirect/chunk_get_ibl_radiance.js"],"names":[],"mappings":"AAMA;;;GAGG;AACH,qCAFU,SAAS,CAqBZ;0BA3BmB,oCAAoC"}

package/src/shade/renderer/deferred/indirect/chunk_get_ibl_radiance.js

@@ -2,6 +2,7 @@ import { PI_DECLARATION } from "../../shader/chunk/math/PI_DECLARATION.js";
 import { chunk_sample_environment_map } from "../../shader/chunk/texture/sample/chunk_sample_environment_map.js";
 import { CodeChunk } from "../../shader/compiler/CodeChunk.js";
 import { ENVIRONMENT_MAP_RESOURCE } from "../../light/environment/ENVIRONMENT_MAP_RESOURCE.js";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../../light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 /**
  * @see https://github.com/mrdoob/three.js/blob/ac8d338cc4de9c9529cbdb0d256eb0fc50a86a93/src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl.js#L22
@@ -21,11 +22,12 @@ fn get_ibl_radiance(
     // Mixing the reflection with the normal is more accurate and keeps rough objects from gathering light from behind their tangent plane.
     let sample_vector = normalize( mix(  reflection_direction, normal_ws, roughness * roughness) );
     
-    return sample_environment_map(tEnvironment, sample_vector, roughness );
+    return sample_environment_map(tEnvironment, sEnvironment, sample_vector, roughness );
 }
 `, [
         chunk_sample_environment_map,
         PI_DECLARATION,
     ]);
 
-chunk_get_ibl_radiance.requireResource(ENVIRONMENT_MAP_RESOURCE);
+chunk_get_ibl_radiance.requireResource(ENVIRONMENT_MAP_RESOURCE);
+chunk_get_ibl_radiance.requireResource(ENVIRONMENT_MAP_SAMPLER_RESOURCE);

package/src/shade/renderer/deferred/shader_background.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader_background.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_background.js"],"names":[],"mappings":"AA8CA,4CAiBE;4BA1D0B,0BAA0B"}
+{"version":3,"file":"shader_background.d.ts","sourceRoot":"","sources":["../../../../../src/shade/renderer/deferred/shader_background.js"],"names":[],"mappings":"AAgDA,4CAiBE;4BA5D0B,0BAA0B"}

package/src/shade/renderer/deferred/shader_background.js

@@ -7,12 +7,14 @@ import { ImageShader } from "../shader/ImageShader.js";
 import { ShaderResourceSetDescriptor } from "../shader/resource/ShaderResourceSetDescriptor.js";
 import { ShaderDescriptor } from "../shader/ShaderDescriptor.js";
 import { VIEW_UNIFORM_STRUCT } from "../view/VIEW_UNIFORM_STRUCT.js";
+import { ENVIRONMENT_MAP_SAMPLER_RESOURCE } from "../light/environment/ENVIRONMENT_MAP_SAMPLER_RESOURCE.js";
 
 const resources = new ShaderResourceSetDescriptor();
 resources.createGroup()
     .addUniform("camera", CAMERA_UNIFORM_STRUCT)
     .addUniform("view", VIEW_UNIFORM_STRUCT)
-    .addTexture("tEnvironment")
+    .addTexture("tEnvironment", "float")
+    .add(ENVIRONMENT_MAP_SAMPLER_RESOURCE)
     .addSampler("sLinear", "filtering", SamplerDescriptor.from({
         magFilter: "linear",
     }))
@@ -35,7 +37,7 @@ fn main(
     // The direction is the unprojected vector itself (ignoring translation implicitly)
     let view_direction = normalize(world_dir_h.xyz);
     
-    result = sample_environment_color(tEnvironment, view_direction);
+    result = sample_environment_color(tEnvironment, sEnvironment, view_direction);
     
     return vec4(result, 1.0);
 }

package/src/shade/renderer/deferred/tonemap/TonemapAces2Tables.d.ts

@@ -0,0 +1,38 @@
+/**
+ * What {@link shader_tonemap_HDR_aces} binds as `aces2_tables`: two ACES 2.0 output transforms, each its parameters and
+ * gamut tables, both limited to Rec.709, the gamut of the SDR picture they expand.
+ *
+ * 1. An SDR display, 100 cd/m². The pass runs it backwards, from the SDR picture to the scene.
+ * 2. This display: the peak over the paper white, times 100 cd/m². A display at or under the paper white gets
+ *    100 cd/m², which the pass does not read.
+ *
+ * Both take SDR white for 100 cd/m², ACES 2.0's reference, so an SDR picture expanded for a display keeps SDR white
+ * where the paper white puts it.
+ *
+ * Building one transform takes 7 to 13 ms, so the tables are built on the first {@link update} rather than with the
+ * renderer, and again only when the display's peak changes.
+ */
+export class TonemapAces2Tables {
+    /**
+     * Both blocks, the SDR one first. Zero until the first {@link update}.
+     * @type {Float32Array}
+     */
+    data: Float32Array;
+    /**
+     * Build the tables for a display, if they are not built for it already.
+     *
+     * @param {number} peak_nits the display's peak, cd/m²
+     * @returns {boolean} whether {@link data} changed
+     */
+    update(peak_nits: number): boolean;
+    /**
+     * The tables on the device, written if they changed since the last call.
+     *
+     * @param {GPUDevice} device
+     * @returns {GPUBuffer}
+     */
+    gpu_buffer(device: GPUDevice): GPUBuffer;
+    destroy(): void;
+    #private;
+}
+//# sourceMappingURL=TonemapAces2Tables.d.ts.map

package/src/shade/renderer/deferred/tonemap/TonemapAces2Tables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TonemapAces2Tables.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/deferred/tonemap/TonemapAces2Tables.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AACH;IACI;;;OAGG;IACH,MAFU,YAAY,CAE0B;IAWhD;;;;;OAKG;IACH,kBAHW,MAAM,GACJ,OAAO,CAsBnB;IAED;;;;;OAKG;IACH,yCAgBC;IAED,gBAKC;;CACJ"}