@woosh/meep-engine 3.9.0 → 3.10.0

package/src/shade/renderer/scene/serialization/write_image_source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write_image_source.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/scene/serialization/write_image_source.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,iEAJW,MAAM,UACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CAIhC;AAED;;;;GAIG;AACH,iDAJW,WAAW,eAAW,WAAW,GAAC,WAAW,YAC7C,MAAM,GACJ,QAAQ,WAAW,CAAC,CAiBhC"}
+{"version":3,"file":"write_image_source.d.ts","sourceRoot":"","sources":["../../../../../../src/shade/renderer/scene/serialization/write_image_source.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,iEAJW,MAAM,UACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CAIhC;AAED;;;;GAIG;AACH,iDAJW,WAAW,eAAW,WAAW,GAAC,WAAW,YAC7C,MAAM,GACJ,QAAQ,WAAW,CAAC,CAmBhC"}

package/src/shade/renderer/scene/serialization/write_image_source.js

@@ -21,13 +21,15 @@ export async function write_image_source(
 ) {
     const encoder = get_threaded_image_encoder();
 
-    if (image_source instanceof ImageBitmap) {
-        return encoder.encode_bitmap(image_source, quality);
-    }
-
+    // sampler first, and `ImageBitmap` only where there is one: the encoder is portable now, and a
+    // reference to a browser global would be the only thing keeping this path out of node
     if (image_source.isSampler2D === true) {
         return encoder.encode_sampler2d(image_source, quality);
     }
 
+    if (typeof ImageBitmap !== "undefined" && image_source instanceof ImageBitmap) {
+        return encoder.encode_bitmap(image_source, quality);
+    }
+
     throw new Error("Unsupported image source type");
 }

package/src/shade/renderer/shader/chunk/color/chunk_rgb_to_luminance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_rgb_to_luminance.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/shader/chunk/color/chunk_rgb_to_luminance.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,qCAFU,SAAS,CAehB;0BA9BuB,6BAA6B"}
+{"version":3,"file":"chunk_rgb_to_luminance.d.ts","sourceRoot":"","sources":["../../../../../../../src/shade/renderer/shader/chunk/color/chunk_rgb_to_luminance.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,qCAFU,SAAS,CAiBhB;0BAhCuB,6BAA6B"}

package/src/shade/renderer/shader/chunk/color/chunk_rgb_to_luminance.js

@@ -1,32 +1,34 @@
-import { CodeChunk } from "../../compiler/CodeChunk.js";
-
-/**
- * Input color must be in linear space to get correct results
- * Valid for Rec709 color space input.
- * Matches sRGB primaries as well.
- *
- * Values are slightly different ( ~ 0.0001) from those in the "IEC 61966-2-1" spec. They are derived from the following chroma coordinates:
- *  xr, yr, zr = 0.6400, 0.3300, 0.0300
- *  xg, yg, zg = 0.3000, 0.6000, 0.1000
- *  xb, yb, zb = 0.1500, 0.0600, 0.7900
- *  xw, yw, zw = 0.3127, 0.3290, 0.3583
- *
- * @see https://en.wikipedia.org/wiki/Luminance
- * @see https://stackoverflow.com/a/56678483/3973586
- * @type {CodeChunk}
- */
-export const chunk_rgb_to_luminance = CodeChunk.from(
-    //language=WGSL
-    `
-fn rgb_to_luminance(rgb_rec709: vec3f) -> f32 {
-    
-    const luminance_weights = vec3f(0.212639005871510, 0.715168678767756, 0.072192315360734);
-    
-    return dot(
-        rgb_rec709,
-        luminance_weights
-    );
-    
-}
-`);
-
+import { CodeChunk } from "../../compiler/CodeChunk.js";
+
+/**
+ * Input color must be in linear space to get correct results
+ * Valid for Rec709 color space input.
+ * Matches sRGB primaries as well.
+ *
+ * Values are slightly different ( ~ 0.0001) from those in the "IEC 61966-2-1" spec. They are derived from the following chroma coordinates:
+ *  xr, yr, zr = 0.6400, 0.3300, 0.0300
+ *  xg, yg, zg = 0.3000, 0.6000, 0.1000
+ *  xb, yb, zb = 0.1500, 0.0600, 0.7900
+ *  xw, yw, zw = 0.3127, 0.3290, 0.3583
+ *
+ * @see https://en.wikipedia.org/wiki/Luminance
+ * @see https://stackoverflow.com/a/56678483/3973586
+ * @type {CodeChunk}
+ */
+export const chunk_rgb_to_luminance = CodeChunk.from(
+    //language=WGSL
+    `
+fn rgb_to_luminance(rgb_rec709: vec3f) -> f32 {
+    
+    // REC709_LUMINANCE_R/G/B from core/color/REC709_PRIMARIES.js, digit for digit. f32 rounds them, but
+    // keeping the spelling identical is what lets a reader see that these are the same numbers.
+    const luminance_weights = vec3f(0.21263900587151035754, 0.71516867876775592746, 0.07219231536073371500);
+    
+    return dot(
+        rgb_rec709,
+        luminance_weights
+    );
+    
+}
+`);
+

package/src/shade/renderer/shader/chunk/color/iCtCp/chunk_eotf_st2084.d.ts

@@ -1,3 +1,34 @@
+/**
+ * SMPTE ST 2084 EOTF, decoding a PQ signal to linear light in GT7 units.
+ *
+ * ## About that 100
+ *
+ * `REFERENCE_LUMINANCE` is **not** an SDR white point competing with the 203 nits of BT.2408. It is the
+ * "Standard 1.0 unit" from the GT7 tone mapping paper, and it is the same 100 that `chunk_tonemap_gt7`
+ * uses to normalise its `paper_white_nits` and `peak_nits` uniforms. The two have to stay equal: GT7
+ * round-trips through this function and its inverse, so changing one alone shifts the whole curve.
+ *
+ * Three different quantities in this engine are all called a reference white, and they are worth keeping
+ * apart:
+ *
+ * | Where | Value | What it means |
+ * |---|---|---|
+ * | here, and `chunk_tonemap_gt7` | 100 nits | GT7's internal unit for a GPU linear `1.0` |
+ * | `core/color/PQ/PQ_constants.js` | 203 nits | BT.2408 graphics white, a *renderer* convention |
+ * | `avif/native/color/transfer_to_linear.js` | 100 nits | the reference display the SDR curves in H.273 are defined against |
+ *
+ * The CPU's `linear_to_PQ` / `PQ_to_linear` fold in none of these — they are pure ST 2084 in PQ's own
+ * normalisation, which is what makes them an exact inverse pair — so the 203 is applied by their callers.
+ * This chunk does fold its 100 in, on both sides, so it is an exact inverse pair too, just of a different
+ * function.
+ *
+ * The place the two conventions actually meet is `linear_reference_nits`, which `sampler2d_to_avif` and
+ * `avif_to_sampler2d` each name explicitly.
+ *
+ * @see chunk_inverseEotfSt2084
+ * @see chunk_tonemap_gt7 the consumer whose REF_LUMINANCE must match
+ * @type {CodeChunk}
+ */
 export const chunk_eotfSt2084: CodeChunk;
 import { CodeChunk } from "../../../compiler/CodeChunk.js";
 //# sourceMappingURL=chunk_eotf_st2084.d.ts.map

package/src/shade/renderer/shader/chunk/color/iCtCp/chunk_eotf_st2084.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_eotf_st2084.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/color/iCtCp/chunk_eotf_st2084.js"],"names":[],"mappings":"AAEA,yCA6BC;0BA/ByB,gCAAgC"}
+{"version":3,"file":"chunk_eotf_st2084.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/color/iCtCp/chunk_eotf_st2084.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,+BAFU,SAAS,CA+BlB;0BA9DyB,gCAAgC"}

package/src/shade/renderer/shader/chunk/color/iCtCp/chunk_eotf_st2084.js

@@ -1,32 +1,63 @@
-import { CodeChunk } from "../../../compiler/CodeChunk.js";
-
-export const chunk_eotfSt2084 = CodeChunk.from(
-    //language=WGSL
-    `
-fn eotfSt2084(n_in: f32) -> f32 {
-    var n = n_in;
-    if (n < 0.0) { n = 0.0; }
-    if (n > 1.0) { n = 1.0; }
-
-    let m1 = 0.1593017578125; 
-    let m2 = 78.84375;      // Scale 1.0 
-    let c1 = 0.8359375; 
-    let c2 = 18.8515625; 
-    let c3 = 18.6875; 
-    let pqC = 10000.0; 
-
-    let np = pow(n, 1.0 / m2);
-    var l = np - c1;
-    if (l < 0.0) { l = 0.0; }
-    
-    l = l / (c2 - c3 * np);
-    l = pow(l, 1.0 / m1);
-
-    let physical = l * pqC;
-
-    const REFERENCE_LUMINANCE = 100.0;
-
-    return physical / REFERENCE_LUMINANCE;
-}
-    `
+import { CodeChunk } from "../../../compiler/CodeChunk.js";
+
+/**
+ * SMPTE ST 2084 EOTF, decoding a PQ signal to linear light in GT7 units.
+ *
+ * ## About that 100
+ *
+ * `REFERENCE_LUMINANCE` is **not** an SDR white point competing with the 203 nits of BT.2408. It is the
+ * "Standard 1.0 unit" from the GT7 tone mapping paper, and it is the same 100 that `chunk_tonemap_gt7`
+ * uses to normalise its `paper_white_nits` and `peak_nits` uniforms. The two have to stay equal: GT7
+ * round-trips through this function and its inverse, so changing one alone shifts the whole curve.
+ *
+ * Three different quantities in this engine are all called a reference white, and they are worth keeping
+ * apart:
+ *
+ * | Where | Value | What it means |
+ * |---|---|---|
+ * | here, and `chunk_tonemap_gt7` | 100 nits | GT7's internal unit for a GPU linear `1.0` |
+ * | `core/color/PQ/PQ_constants.js` | 203 nits | BT.2408 graphics white, a *renderer* convention |
+ * | `avif/native/color/transfer_to_linear.js` | 100 nits | the reference display the SDR curves in H.273 are defined against |
+ *
+ * The CPU's `linear_to_PQ` / `PQ_to_linear` fold in none of these — they are pure ST 2084 in PQ's own
+ * normalisation, which is what makes them an exact inverse pair — so the 203 is applied by their callers.
+ * This chunk does fold its 100 in, on both sides, so it is an exact inverse pair too, just of a different
+ * function.
+ *
+ * The place the two conventions actually meet is `linear_reference_nits`, which `sampler2d_to_avif` and
+ * `avif_to_sampler2d` each name explicitly.
+ *
+ * @see chunk_inverseEotfSt2084
+ * @see chunk_tonemap_gt7 the consumer whose REF_LUMINANCE must match
+ * @type {CodeChunk}
+ */
+export const chunk_eotfSt2084 = CodeChunk.from(
+    //language=WGSL
+    `
+fn eotfSt2084(n_in: f32) -> f32 {
+    var n = n_in;
+    if (n < 0.0) { n = 0.0; }
+    if (n > 1.0) { n = 1.0; }
+
+    let m1 = 0.1593017578125; 
+    let m2 = 78.84375;      // Scale 1.0 
+    let c1 = 0.8359375; 
+    let c2 = 18.8515625; 
+    let c3 = 18.6875; 
+    let pqC = 10000.0; 
+
+    let np = pow(n, 1.0 / m2);
+    var l = np - c1;
+    if (l < 0.0) { l = 0.0; }
+    
+    l = l / (c2 - c3 * np);
+    l = pow(l, 1.0 / m1);
+
+    let physical = l * pqC;
+
+    const REFERENCE_LUMINANCE = 100.0;
+
+    return physical / REFERENCE_LUMINANCE;
+}
+    `
 )

package/src/shade/renderer/shader/chunk/color/iCtCp/chunk_inverse_eotf_st2084.d.ts

@@ -1,3 +1,13 @@
+/**
+ * SMPTE ST 2084 inverse EOTF, encoding linear light in GT7 units as a PQ signal.
+ *
+ * `REFERENCE_LUMINANCE` here must equal the one in {@link chunk_eotfSt2084}, and both must equal
+ * `chunk_tonemap_gt7`'s `REF_LUMINANCE` — see the note there for what the 100 is and how it relates to the
+ * 203 nits on the CPU side.
+ *
+ * @see chunk_eotfSt2084
+ * @type {CodeChunk}
+ */
 export const chunk_inverseEotfSt2084: CodeChunk;
 import { CodeChunk } from "../../../compiler/CodeChunk.js";
 //# sourceMappingURL=chunk_inverse_eotf_st2084.d.ts.map

package/src/shade/renderer/shader/chunk/color/iCtCp/chunk_inverse_eotf_st2084.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_inverse_eotf_st2084.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/color/iCtCp/chunk_inverse_eotf_st2084.js"],"names":[],"mappings":"AAEA,gDAoBC;0BAtByB,gCAAgC"}
+{"version":3,"file":"chunk_inverse_eotf_st2084.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/color/iCtCp/chunk_inverse_eotf_st2084.js"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,sCAFU,SAAS,CAsBlB;0BAhCyB,gCAAgC"}

package/src/shade/renderer/shader/chunk/color/iCtCp/chunk_inverse_eotf_st2084.js

@@ -1,23 +1,33 @@
-import { CodeChunk } from "../../../compiler/CodeChunk.js";
-
-export const chunk_inverseEotfSt2084 = CodeChunk.from(
-    //language=WGSL
-    `
-fn inverseEotfSt2084(v: f32) -> f32 {
-    let m1 = 0.1593017578125;
-    let m2 = 78.84375;      // Scale 1.0
-    let c1 = 0.8359375;
-    let c2 = 18.8515625;
-    let c3 = 18.6875;
-    let pqC = 10000.0;
-
-    const REFERENCE_LUMINANCE = 100.0;
-
-    let physical = v * REFERENCE_LUMINANCE;
-    let y = physical / pqC; 
-    let ym = pow(y, m1);
-
-    return exp2(m2 * (log2(c1 + c2 * ym) - log2(1.0 + c3 * ym)));
-}
-    `
+import { CodeChunk } from "../../../compiler/CodeChunk.js";
+
+/**
+ * SMPTE ST 2084 inverse EOTF, encoding linear light in GT7 units as a PQ signal.
+ *
+ * `REFERENCE_LUMINANCE` here must equal the one in {@link chunk_eotfSt2084}, and both must equal
+ * `chunk_tonemap_gt7`'s `REF_LUMINANCE` — see the note there for what the 100 is and how it relates to the
+ * 203 nits on the CPU side.
+ *
+ * @see chunk_eotfSt2084
+ * @type {CodeChunk}
+ */
+export const chunk_inverseEotfSt2084 = CodeChunk.from(
+    //language=WGSL
+    `
+fn inverseEotfSt2084(v: f32) -> f32 {
+    let m1 = 0.1593017578125;
+    let m2 = 78.84375;      // Scale 1.0
+    let c1 = 0.8359375;
+    let c2 = 18.8515625;
+    let c3 = 18.6875;
+    let pqC = 10000.0;
+
+    const REFERENCE_LUMINANCE = 100.0;
+
+    let physical = v * REFERENCE_LUMINANCE;
+    let y = physical / pqC; 
+    let ym = pow(y, m1);
+
+    return exp2(m2 * (log2(c1 + c2 * ym) - log2(1.0 + c3 * ym)));
+}
+    `
 )

package/src/shade/renderer/shader/chunk/color/sRGB/chunk_sRGBTransferOETF.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_sRGBTransferOETF.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,+CASG;0BAnBuB,gCAAgC"}
+{"version":3,"file":"chunk_sRGBTransferOETF.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,+CAUG;0BApBuB,gCAAgC"}

package/src/shade/renderer/shader/chunk/color/sRGB/chunk_sRGBTransferOETF.js

@@ -1,21 +1,22 @@
-import { CodeChunk } from "../../../compiler/CodeChunk.js";
-
-
-/**
- * Most monitors use this.
- * Optical-electro transfer function (OETF)
- *
- * sRGB-linear to sRGB
- * @see https://github.com/mrdoob/three.js/blob/aedb9c75bedff3a5f8476dbb8b41dd40c4b09603/src/renderers/shaders/ShaderChunk/colorspace_pars_fragment.glsl.js#L41
- */
-export const chunk_sRGBTransferOETF = CodeChunk.from(
-//language=WGSL
-    `
-fn sRGBTransferOETF( value:vec3<f32> ) -> vec3<f32> {
-    let high = pow( value, vec3( 0.41666666666 ) ) * 1.055 - vec3( 0.055 );
-    let low = value * 12.92;
-
-	return  select( low, high, value > vec3( 0.0031308 ) );
-}
-`);
-
+import { CodeChunk } from "../../../compiler/CodeChunk.js";
+
+
+/**
+ * Most monitors use this.
+ * Optical-electro transfer function (OETF)
+ *
+ * sRGB-linear to sRGB
+ * @see https://github.com/mrdoob/three.js/blob/aedb9c75bedff3a5f8476dbb8b41dd40c4b09603/src/renderers/shaders/ShaderChunk/colorspace_pars_fragment.glsl.js#L41
+ */
+export const chunk_sRGBTransferOETF = CodeChunk.from(
+//language=WGSL
+    `
+fn sRGBTransferOETF( value:vec3<f32> ) -> vec3<f32> {
+    // 1 / 2.4, spelled exactly as SRGB_OETF_EXPONENT in core/color/REC709_PRIMARIES.js
+    let high = pow( value, vec3( 0.4166666666666667 ) ) * 1.055 - vec3( 0.055 );
+    let low = value * 12.92;
+
+	return  select( low, high, value > vec3( 0.0031308 ) );
+}
+`);
+

package/src/shade/renderer/shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.d.ts

@@ -1,5 +1,11 @@
 /**
+ * `REF_LUMINANCE` is the paper's "Standard 1.0 unit" and must stay equal to the `REFERENCE_LUMINANCE` in
+ * {@link chunk_eotfSt2084} / {@link chunk_inverseEotfSt2084}, which this function round-trips through. It is
+ * not the BT.2408 SDR white of 203 nits used on the CPU side; see the note on `chunk_eotfSt2084` for how the
+ * three reference whites in this engine relate.
+ *
  * @see "Driving Toward Reality: Physically Based Tone Mapping and Perceptual Fidelity in Gran Turismo 7"
+ * @see chunk_eotfSt2084
  * @type {CodeChunk}
  */
 export const chunk_tonemap_gt7: CodeChunk;

package/src/shade/renderer/shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_tonemap_gt7.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/shade/renderer/shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.js"],"names":[],"mappings":"AAUA;;;GAGG;AACH,gCAFU,SAAS,CA4FlB;0BAxGyB,mCAAmC"}
+{"version":3,"file":"chunk_tonemap_gt7.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/shade/renderer/shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.js"],"names":[],"mappings":"AAUA;;;;;;;;;GASG;AACH,gCAFU,SAAS,CA4FlB;0BA9GyB,mCAAmC"}

package/src/shade/renderer/shader/chunk/color/tonemap/gt7/chunk_tonemap_gt7.js

@@ -1,105 +1,111 @@
-import { CodeChunk } from "../../../../compiler/CodeChunk.js";
-import { chunk_CRM_FROM_REC2020_TO_REC709 } from "../../conversion/chunk_CRM_FROM_REC2020_TO_REC709.js";
-import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../../conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
-import { chunk_eotfSt2084 } from "../../iCtCp/chunk_eotf_st2084.js";
-import { chunk_iCtCp_to_rgb } from "../../iCtCp/chunk_iCtCp_to_rgb.js";
-import { chunk_inverseEotfSt2084 } from "../../iCtCp/chunk_inverse_eotf_st2084.js";
-import { chunk_rgb_to_iCtCp } from "../../iCtCp/chunk_rgb_to_iCtCp.js";
-import { chunk_gt_evaluate_curve } from "./chunk_gt_evaluate_curve.js";
-import { GT7_TONE_MAPPING_CURVE_STRUCT } from "./GT7_TONE_MAPPING_CURVE_STRUCT.js";
-
-/**
- * @see "Driving Toward Reality: Physically Based Tone Mapping and Perceptual Fidelity in Gran Turismo 7"
- * @type {CodeChunk}
- */
-export const chunk_tonemap_gt7 = CodeChunk.from(
-    //language=WGSL
-    `
-fn tonemap_gt7(
-    rgb_rec709:vec3<f32>,
-    peak_nits: f32,
-    paper_white_nits: f32,
-) -> vec3<f32>{
-
-    // Constants for the GT7 "Standard" 1.0 unit
-    const REF_LUMINANCE: f32 = 100.0;
-    
-    // input is in rec.709, the tonemapper is in rec.2020
-    var color_linear = CRM_FROM_REC709_TO_REC2020 * rgb_rec709;
-    
-    // normalize to paper white
-    let paper_white = paper_white_nits / REF_LUMINANCE;
-    color_linear *= paper_white;
-    
-    var curve: ${GT7_TONE_MAPPING_CURVE_STRUCT.wgsl_ref};
-    // initialize curve
-    const alpha = 0.25;
-    const gray_point = 0.538;
-    const linear_section = 0.444;
-    const toe_strength = 1.280;
-    
-    let peak_intensity = peak_nits / REF_LUMINANCE;
-    
-    //
-    curve.peakIntensity = peak_intensity;
-    curve.midPoint = gray_point;
-    curve.linearSection = linear_section;
-    curve.toeStrength = toe_strength;
-    
-    // Pre-compute constants for the shoulder region.
-    let k = (linear_section - 1.0) / (alpha - 1.0);
-    curve.kA = peak_intensity * linear_section + peak_intensity * k;
-    curve.kB = -peak_intensity * k * exp(linear_section / k);
-    curve.kC = -1.0 / (k * peak_intensity);
-    
-    //
-    // PATH A: Create "Twisted" RGB (Per-channel Mapping)
-    // This creates the "film/camera-like" look where highlights shift to CMY/White
-    var rgb_twisted: vec3<f32>;
-    rgb_twisted.r = gt_evaluate_curve(&curve, color_linear.r);
-    rgb_twisted.g = gt_evaluate_curve(&curve, color_linear.g);
-    rgb_twisted.b = gt_evaluate_curve(&curve, color_linear.b);
-    
-   // PATH B: Create "Untwisted" RGB (Luminance from Twisted, Chroma from Original)
-    // 1. Get ICtCp for both Original and Twisted
-    let ictcp_original = rgb_to_iCtCp(color_linear);
-    let ictcp_twisted  = rgb_to_iCtCp(rgb_twisted);
-
-    const CHROMA_START_PQ = 0.7; 
-    const CHROMA_END_PQ = 1.0;
-
-    // 2. Calculate Whitening Scale based on Original Luminance (PQ encoded)
-    // As luminance increases, we reduce chroma to avoid artifacts and simulate saturation limit
-    let luminance_pq = ictcp_original.x; // rgb_to_iCtCp returns PQ encoding in X
-    let shoulder_saturation_scale = 1.0 - smoothstep(CHROMA_START_PQ, CHROMA_END_PQ, luminance_pq);
-
-    // Blend Ratio: 0.0 = Fully Untwisted (Preserves hue/sat), 1.0 = Fully Twisted (Camera-like shift)
-    const BLEND_RATIO = 0.7;
-        
-    // Mix between the Twisted (Per-channel) and Untwisted (ICtCp reconstructed) versions
-    let ictcp_final = vec3<f32>(
-        ictcp_twisted.x,
-        mix(ictcp_original.yz * shoulder_saturation_scale, ictcp_twisted.yz, BLEND_RATIO)
-    );
-    
-    var final_color = iCtCp_to_rgb(ictcp_final);
-        
-    // renormalize
-    final_color /= paper_white;
-    
-    // go back to rec.709
-    final_color = CRM_FROM_REC2020_TO_REC709 * final_color;
-    
-    return final_color;
-}
-    `, [
-        chunk_CRM_FROM_REC709_TO_REC2020,
-        chunk_CRM_FROM_REC2020_TO_REC709,
-        GT7_TONE_MAPPING_CURVE_STRUCT.declaration_chunk,
-        chunk_gt_evaluate_curve,
-        chunk_iCtCp_to_rgb,
-        chunk_rgb_to_iCtCp,
-            chunk_eotfSt2084,
-            chunk_inverseEotfSt2084,
-    ]
+import { CodeChunk } from "../../../../compiler/CodeChunk.js";
+import { chunk_CRM_FROM_REC2020_TO_REC709 } from "../../conversion/chunk_CRM_FROM_REC2020_TO_REC709.js";
+import { chunk_CRM_FROM_REC709_TO_REC2020 } from "../../conversion/chunk_CRM_FROM_REC709_TO_REC2020.js";
+import { chunk_eotfSt2084 } from "../../iCtCp/chunk_eotf_st2084.js";
+import { chunk_iCtCp_to_rgb } from "../../iCtCp/chunk_iCtCp_to_rgb.js";
+import { chunk_inverseEotfSt2084 } from "../../iCtCp/chunk_inverse_eotf_st2084.js";
+import { chunk_rgb_to_iCtCp } from "../../iCtCp/chunk_rgb_to_iCtCp.js";
+import { chunk_gt_evaluate_curve } from "./chunk_gt_evaluate_curve.js";
+import { GT7_TONE_MAPPING_CURVE_STRUCT } from "./GT7_TONE_MAPPING_CURVE_STRUCT.js";
+
+/**
+ * `REF_LUMINANCE` is the paper's "Standard 1.0 unit" and must stay equal to the `REFERENCE_LUMINANCE` in
+ * {@link chunk_eotfSt2084} / {@link chunk_inverseEotfSt2084}, which this function round-trips through. It is
+ * not the BT.2408 SDR white of 203 nits used on the CPU side; see the note on `chunk_eotfSt2084` for how the
+ * three reference whites in this engine relate.
+ *
+ * @see "Driving Toward Reality: Physically Based Tone Mapping and Perceptual Fidelity in Gran Turismo 7"
+ * @see chunk_eotfSt2084
+ * @type {CodeChunk}
+ */
+export const chunk_tonemap_gt7 = CodeChunk.from(
+    //language=WGSL
+    `
+fn tonemap_gt7(
+    rgb_rec709:vec3<f32>,
+    peak_nits: f32,
+    paper_white_nits: f32,
+) -> vec3<f32>{
+
+    // Constants for the GT7 "Standard" 1.0 unit
+    const REF_LUMINANCE: f32 = 100.0;
+    
+    // input is in rec.709, the tonemapper is in rec.2020
+    var color_linear = CRM_FROM_REC709_TO_REC2020 * rgb_rec709;
+    
+    // normalize to paper white
+    let paper_white = paper_white_nits / REF_LUMINANCE;
+    color_linear *= paper_white;
+    
+    var curve: ${GT7_TONE_MAPPING_CURVE_STRUCT.wgsl_ref};
+    // initialize curve
+    const alpha = 0.25;
+    const gray_point = 0.538;
+    const linear_section = 0.444;
+    const toe_strength = 1.280;
+    
+    let peak_intensity = peak_nits / REF_LUMINANCE;
+    
+    //
+    curve.peakIntensity = peak_intensity;
+    curve.midPoint = gray_point;
+    curve.linearSection = linear_section;
+    curve.toeStrength = toe_strength;
+    
+    // Pre-compute constants for the shoulder region.
+    let k = (linear_section - 1.0) / (alpha - 1.0);
+    curve.kA = peak_intensity * linear_section + peak_intensity * k;
+    curve.kB = -peak_intensity * k * exp(linear_section / k);
+    curve.kC = -1.0 / (k * peak_intensity);
+    
+    //
+    // PATH A: Create "Twisted" RGB (Per-channel Mapping)
+    // This creates the "film/camera-like" look where highlights shift to CMY/White
+    var rgb_twisted: vec3<f32>;
+    rgb_twisted.r = gt_evaluate_curve(&curve, color_linear.r);
+    rgb_twisted.g = gt_evaluate_curve(&curve, color_linear.g);
+    rgb_twisted.b = gt_evaluate_curve(&curve, color_linear.b);
+    
+   // PATH B: Create "Untwisted" RGB (Luminance from Twisted, Chroma from Original)
+    // 1. Get ICtCp for both Original and Twisted
+    let ictcp_original = rgb_to_iCtCp(color_linear);
+    let ictcp_twisted  = rgb_to_iCtCp(rgb_twisted);
+
+    const CHROMA_START_PQ = 0.7; 
+    const CHROMA_END_PQ = 1.0;
+
+    // 2. Calculate Whitening Scale based on Original Luminance (PQ encoded)
+    // As luminance increases, we reduce chroma to avoid artifacts and simulate saturation limit
+    let luminance_pq = ictcp_original.x; // rgb_to_iCtCp returns PQ encoding in X
+    let shoulder_saturation_scale = 1.0 - smoothstep(CHROMA_START_PQ, CHROMA_END_PQ, luminance_pq);
+
+    // Blend Ratio: 0.0 = Fully Untwisted (Preserves hue/sat), 1.0 = Fully Twisted (Camera-like shift)
+    const BLEND_RATIO = 0.7;
+        
+    // Mix between the Twisted (Per-channel) and Untwisted (ICtCp reconstructed) versions
+    let ictcp_final = vec3<f32>(
+        ictcp_twisted.x,
+        mix(ictcp_original.yz * shoulder_saturation_scale, ictcp_twisted.yz, BLEND_RATIO)
+    );
+    
+    var final_color = iCtCp_to_rgb(ictcp_final);
+        
+    // renormalize
+    final_color /= paper_white;
+    
+    // go back to rec.709
+    final_color = CRM_FROM_REC2020_TO_REC709 * final_color;
+    
+    return final_color;
+}
+    `, [
+        chunk_CRM_FROM_REC709_TO_REC2020,
+        chunk_CRM_FROM_REC2020_TO_REC709,
+        GT7_TONE_MAPPING_CURVE_STRUCT.declaration_chunk,
+        chunk_gt_evaluate_curve,
+        chunk_iCtCp_to_rgb,
+        chunk_rgb_to_iCtCp,
+            chunk_eotfSt2084,
+            chunk_inverseEotfSt2084,
+    ]
 )

package/src/shade/renderer/shader/chunk/color/xyz/chunk_rgb_to_xyz.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk_rgb_to_xyz.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/color/xyz/chunk_rgb_to_xyz.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,+BAFU,SAAS,CAejB;0BAnBwB,gCAAgC"}
+{"version":3,"file":"chunk_rgb_to_xyz.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shade/renderer/shader/chunk/color/xyz/chunk_rgb_to_xyz.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,+BAFU,SAAS,CAiBjB;0BArBwB,gCAAgC"}