@tinypoly/gpu-renderer 0.1.1 → 0.2.0

package/src/wgsl/pathTrace.wgsl.ts

@@ -42,7 +42,9 @@ fn backgroundRadiance(direction: vec3<f32>) -> vec3<f32> {
     return frame.background.rgb;
   }
 
-  // A procedural sky paints the background without the strength it lights with, and its foreground over it.
+  // A procedural sky paints the background with the strength it lights with, and its foreground over it. The CPU
+  // renderer leaves that strength out of what the camera sees, which a renderer exposing for the light cannot: the sky
+  // that lights a wall five times brighter than itself would show as a dark band behind it.
   if (frame.skyProgram != NO_PROGRAM || frame.skyIntensity > 0.0) {
     if (frame.skyBackground == 0u) {
       return vec3<f32>(0.0);
@@ -54,10 +56,10 @@ fn backgroundRadiance(direction: vec3<f32>) -> vec3<f32> {
       input.direction = direction;
       input.diffuseColor = vec4<f32>(1.0);
 
-      return runProgram(frame.skyProgram, input).color.rgb;
+      return runProgram(frame.skyProgram, input).color.rgb * frame.skyIntensity;
     }
 
-    return environmentRadiance(direction) / frame.skyIntensity;
+    return environmentRadiance(direction);
   }
 
   return environmentRadiance(direction);
@@ -67,7 +69,7 @@ fn backgroundRadiance(direction: vec3<f32>) -> vec3<f32> {
  * How much of the sky a bounce ray that escaped keeps. Direct sampling aims at the bright parts of an image too, so the
  * two share it; when direct sampling took all of it, as it does from a toon surface, the bounce keeps none.
  */
-fn escapeWeight(direction: vec3<f32>, bsdfPdf: f32, lightsOwnDirect: bool) -> f32 {
+fn escapeWeight(direction: vec3<f32>, bsdfPdf: f32, lightsOwnDirect: bool, scatteredAt: vec3<f32>) -> f32 {
   if (frame.environmentPick <= 0.0) {
     return 1.0;
   }
@@ -80,7 +82,8 @@ fn escapeWeight(direction: vec3<f32>, bsdfPdf: f32, lightsOwnDirect: bool) -> f3
     return 1.0;
   }
 
-  return misWeight(bsdfPdf, frame.environmentPick * environmentPdf(direction));
+  // The sky was aimed at from the vertex the bounce left, through its windows as well when that vertex is inside.
+  return misWeight(bsdfPdf, frame.environmentPick * skyPdf(scatteredAt, direction, portalChance(scatteredAt)));
 }
 
 /** Scales a contribution down to the luminance ceiling, which trades a little bias for the fireflies it removes. */
@@ -548,7 +551,7 @@ fn traceRadiance(
         if (escapeMap != NO_TEXTURE) {
           sky = sky + sampleEquirect(escapeMap, direction).rgb * escapeIntensity;
         } else {
-          sky = sky + environmentRadiance(direction) * escapeWeight(direction, bsdfPdf, lightsOwnDirect);
+          sky = sky + environmentRadiance(direction) * escapeWeight(direction, bsdfPdf, lightsOwnDirect, lastPosition);
         }
 
         let contribution = throughput * sky;
@@ -703,8 +706,14 @@ fn traceRadiance(
       depth = length(point - rayOrigin);
     }
 
+    // A window the camera ray goes straight through is not what the camera sees: what lies behind it is, so the
+    // denoiser takes its guides there, and the air its distance. Glass has next to no diffuse colour and one flat
+    // normal, which would leave everything seen through it unfiltered. The window's own guides stand until then, for
+    // the paths that reflect off it instead.
+    let window = surface.transmission > 0.0 && surface.thickness <= 0.0;
+
     if (straight && !guided) {
-      guided = true;
+      guided = !window;
       diffuseAlbedo = diffuseGuide(surface);
       specularAlbedoGuide = select(specularAlbedo(surface, -direction), vec3<f32>(1.0), (surface.flags & MATERIAL_LIT) == 0u);
       guideNormal = surface.normal;
@@ -745,7 +754,7 @@ fn traceRadiance(
         }
       }
 
-      if (!hazed && frame.atmosphereColor.w > 0.0) {
+      if (!hazed && !window && frame.atmosphereColor.w > 0.0) {
         hazed = true;
         // From the eye, where the camera ray only starts on the near plane; an orthographic view has no eye.
         hazeDistance = length(point - select(frame.cameraToWorld[3].xyz, rayOrigin, frame.cameraKind == 1u));
@@ -765,7 +774,11 @@ fn traceRadiance(
     }
 
     // Three does not light a basic, points, line or sprite material, so nothing carries on from one.
-    if ((surface.flags & MATERIAL_LIT) == 0u || bounce >= frame.bounces) {
+    // Past the last bounce a path still crosses a window straight on, which scatters nothing, to find the sky behind
+    // it: cut there, the daylight a room gets through its glazing would go missing from every last bounce.
+    let spent = bounce >= frame.bounces;
+
+    if ((surface.flags & MATERIAL_LIT) == 0u || (spent && !window)) {
       break;
     }
 
@@ -788,8 +801,105 @@ fn traceRadiance(
     var nextOrigin = point + direction * RAY_EPSILON;
 
     // Transmission replaces part of the diffuse layer, so that share of the time the surface is a dielectric instead.
-    // Choosing it in proportion to its weight leaves both halves unweighted, and only the opaque half aims at a light.
-    if (surface.transmission > 0.0 && lobe.y < surface.transmission) {
+    // Choosing it in proportion to its weight leaves both halves unweighted. The opaque half aims at a light; on a
+    // window that lets only part of the light through, it does so on every path, weighed by its share, rather than on
+    // the paths that chose it: a sunlit pane seen against a dim room would otherwise be lit on one path in five and
+    // dark on the rest, which is the grain glass shows.
+    let dielectric = surface.transmission > 0.0 && lobe.y < surface.transmission;
+    let windowLight = window && !spent && surface.transmission < 1.0 && surface.subsurface <= 0.0;
+
+    if (!dielectric || windowLight) {
+      var chance = 0.0;
+
+      if (!dielectric) {
+        // Light that enters the material: a random walk inside it from here, in place of the share of the diffuse
+        // layer that scatters inside. Chosen by chance, so neither branch is weighted against the other.
+        // The window's opaque share is a surface like any other, which a spent path stops at.
+        if (spent) {
+          break;
+        }
+
+        if (SUBSURFACE_WALK) {
+          chance = subsurfaceChance(surface, view);
+        }
+
+        if (SUBSURFACE_WALK && lobe.x < chance) {
+          let medium = materials[surface.material].subsurface;
+
+          throughput = throughput
+            * ((1.0 - surface.metalness) * surface.subsurface * coatTransmittance(surface, view) / chance);
+          sigma = vec3<f32>(1.0) / max(medium.rgb, vec3<f32>(1e-6));
+          walkAlbedo = subsurfaceAlbedo(surface.albedo);
+          walkG = materials[surface.material].subsurfaceAnisotropy;
+          walkSteps = 0u;
+
+          // Light that scattered inside is diffuse light, which is the signal it feeds.
+          if (!split) {
+            split = true;
+            splitBase = radiance;
+            splitDiffuse = true;
+          }
+
+          inMedium = true;
+          primary = false;
+          straight = false;
+          bsdfPdf = 0.0;
+          lightsOwnDirect = false;
+          escapeMap = NO_TEXTURE;
+          bounce = bounce + 1u;
+          direction = cosineDirection(-surface.facing, bounceSample);
+          origin = point - surface.facing * RAY_EPSILON;
+          limit = walkDistance(throughput, sigma, pick, &walkOdds);
+          continue;
+        }
+
+        throughput = throughput / (1.0 - chance);
+      }
+
+      let position = point + surface.normal * RAY_EPSILON;
+      var directDiffuse: vec3<f32>;
+      let lit = select(throughput, throughput * (1.0 - surface.transmission), windowLight);
+      let direct = lit * directLight(surface, position, view, pick.x, lightSample, rng, &directDiffuse,
+        select(0.0, volumeDensity, inVolume));
+      let added = select(direct, clampIndirect(direct), bounce > 0u);
+      let before = radiance;
+
+      radiance = radiance + added;
+
+      if (!dielectric) {
+        let scattered = sampleBsdf(surface, view, (lobe.x - chance) / (1.0 - chance), bounceSample);
+
+        // The first scatter splits the path: its direct light by lobe, and everything after it by the lobe it chose.
+        if (!split) {
+          split = true;
+          splitBase = before;
+          splitDirect = added;
+          splitDirectDiffuse = lit * directDiffuse * select(1.0, luminanceOf(added) / max(luminanceOf(direct), 1e-20),
+            bounce > 0u);
+          splitDiffuse = !scattered.valid || scattered.diffuse;
+          waitingForSpecular = scattered.valid && !scattered.diffuse;
+        }
+
+        if (!scattered.valid) {
+          break;
+        }
+
+        throughput = throughput * scattered.weight;
+        bsdfPdf = scattered.pdf;
+        lastPosition = position;
+        lastNormal = treeNormal(surface);
+        lightsOwnDirect = surface.kind == KIND_TOON;
+        escapeMap = surface.envMap;
+        escapeIntensity = surface.envMapIntensity;
+        next = scattered.direction;
+        nextOrigin = position;
+        primary = false;
+        straight = false;
+        bounce = bounce + 1u;
+      }
+    }
+
+    if (dielectric) {
       var ior = surface.ior;
 
       // Three's dispersion: each colour refracts with its own index, spread around the material's. The path picks one
@@ -809,7 +919,8 @@ fn traceRadiance(
 
       let crossing = sampleDielectric(surface, view, ior, lobe.y / surface.transmission, bounceSample);
 
-      if (!crossing.valid) {
+      // A reflection off the glass is a scattering, which a spent path no longer has.
+      if (!crossing.valid || (spent && !crossing.straight)) {
         break;
       }
 
@@ -844,85 +955,6 @@ fn traceRadiance(
       if (!primary) {
         bounce = bounce + 1u;
       }
-    } else {
-      // Light that enters the material: a random walk inside it from here, in place of the share of the diffuse
-      // layer that scatters inside. Chosen by chance, so neither branch is weighted against the other.
-      var chance = 0.0;
-
-      if (SUBSURFACE_WALK) {
-        chance = subsurfaceChance(surface, view);
-      }
-
-      if (SUBSURFACE_WALK && lobe.x < chance) {
-        let medium = materials[surface.material].subsurface;
-
-        throughput = throughput
-          * ((1.0 - surface.metalness) * surface.subsurface * coatTransmittance(surface, view) / chance);
-        sigma = vec3<f32>(1.0) / max(medium.rgb, vec3<f32>(1e-6));
-        walkAlbedo = subsurfaceAlbedo(surface.albedo);
-        walkG = materials[surface.material].subsurfaceAnisotropy;
-        walkSteps = 0u;
-
-        // Light that scattered inside is diffuse light, which is the signal it feeds.
-        if (!split) {
-          split = true;
-          splitBase = radiance;
-          splitDiffuse = true;
-        }
-
-        inMedium = true;
-        primary = false;
-        straight = false;
-        bsdfPdf = 0.0;
-        lightsOwnDirect = false;
-        escapeMap = NO_TEXTURE;
-        bounce = bounce + 1u;
-        direction = cosineDirection(-surface.facing, bounceSample);
-        origin = point - surface.facing * RAY_EPSILON;
-        limit = walkDistance(throughput, sigma, pick, &walkOdds);
-        continue;
-      }
-
-      throughput = throughput / (1.0 - chance);
-
-      let position = point + surface.normal * RAY_EPSILON;
-      var directDiffuse: vec3<f32>;
-      let direct = throughput * directLight(surface, position, view, pick.x, lightSample, rng, &directDiffuse,
-        select(0.0, volumeDensity, inVolume));
-      let added = select(direct, clampIndirect(direct), bounce > 0u);
-      let before = radiance;
-
-      radiance = radiance + added;
-
-      let scattered = sampleBsdf(surface, view, (lobe.x - chance) / (1.0 - chance), bounceSample);
-
-      // The first scatter splits the path: its direct light by lobe, and everything after it by the lobe it chose.
-      if (!split) {
-        split = true;
-        splitBase = before;
-        splitDirect = added;
-        splitDirectDiffuse = throughput * directDiffuse * select(1.0, luminanceOf(added) / max(luminanceOf(direct), 1e-20),
-          bounce > 0u);
-        splitDiffuse = !scattered.valid || scattered.diffuse;
-        waitingForSpecular = scattered.valid && !scattered.diffuse;
-      }
-
-      if (!scattered.valid) {
-        break;
-      }
-
-      throughput = throughput * scattered.weight;
-      bsdfPdf = scattered.pdf;
-      lastPosition = position;
-      lastNormal = treeNormal(surface);
-      lightsOwnDirect = surface.kind == KIND_TOON;
-      escapeMap = surface.envMap;
-      escapeIntensity = surface.envMapIntensity;
-      next = scattered.direction;
-      nextOrigin = position;
-      primary = false;
-      straight = false;
-      bounce = bounce + 1u;
     }
 
     // A path that carries almost nothing is ended by chance rather than by a cut, which keeps the estimate unbiased.

package/src/wgsl/present.wgsl.ts

@@ -15,6 +15,8 @@ struct Present {
   transparent: u32,
   // Whether the colour comes from the denoiser's output rather than straight from the accumulation.
   denoised: u32,
+  // How much of AgX's Punchy look goes over its base curve.
+  contrast: f32,
 };
 
 @group(0) @binding(0) var<uniform> present: Present;
@@ -63,8 +65,16 @@ fn toneMapAgx(color: vec3<f32>) -> vec3<f32> {
     vec3<f32>(-0.0728, -0.0083, 1.1187));
   let logged = inset * (toAgx * color);
   let x = clamp((log2(max(logged, vec3<f32>(1e-10))) + 12.47393) / 16.499999, vec3<f32>(0.0), vec3<f32>(1.0));
-  let curved = 15.5 * pow(x, vec3<f32>(6.0)) - 40.14 * pow(x, vec3<f32>(5.0)) + 31.96 * pow(x, vec3<f32>(4.0))
+  let base = 15.5 * pow(x, vec3<f32>(6.0)) - 40.14 * pow(x, vec3<f32>(5.0)) + 31.96 * pow(x, vec3<f32>(4.0))
     - 6.868 * pow(x, vec3<f32>(3.0)) + 0.4298 * x * x + 0.1191 * x - 0.00232;
+  // A look in the spirit of Blender's Punchy, a power of 1.35 and more saturation, but pivoted on middle grey: Punchy
+  // raises the power around zero, which takes middle grey from half the display down to a third and darkens the whole
+  // image. Here the highlights rise and the shadows fall while grey, which the automatic exposure aims at, stands.
+  let pivot = 0.49673;
+  let contrasted = pivot * pow(max(base, vec3<f32>(0.0)) / pivot, vec3<f32>(1.35));
+  let luma = dot(contrasted, vec3<f32>(0.2126, 0.7152, 0.0722));
+  let punchy = luma + 1.2 * (contrasted - luma);
+  let curved = mix(base, punchy, clamp(present.contrast, 0.0, 1.0));
 
   return fromAgx * pow(max(outset * curved, vec3<f32>(0.0)), vec3<f32>(2.2));
 }

package/weights/LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.