@tinypoly/gpu-renderer 0.0.4 → 0.1.0

package/src/wgsl/bsdf.wgsl.ts

@@ -175,6 +175,12 @@ fn coatTransmittance(surface: Surface, view: vec3<f32>) -> f32 {
   return 1.0 - surface.clearcoat * schlick3(vec3<f32>(0.04), 1.0, nv).x;
 }
 
+/**
+ * A point inside a volume, where light scatters by the medium's phase function instead of off a surface. Only the
+ * integrator makes one: its normal faces back along the ray, its albedo is the medium's, its anisotropy the phase's.
+ */
+const KIND_VOLUME: u32 = 100u;
+
 /** How often each lobe is chosen, as (diffuse, specular, clearcoat): by how much of the reflection each accounts for. */
 fn lobeWeights(surface: Surface, view: vec3<f32>) -> vec3<f32> {
   let nv = max(dot(surface.normal, view), 1e-4);
@@ -192,7 +198,8 @@ fn lobeWeights(surface: Surface, view: vec3<f32>) -> vec3<f32> {
 
   let base = coatTransmittance(surface, view);
   // The floors keep every lobe reachable: the diffuse one also carries the sheen and the multiple scattering term.
-  let diffuse = (luminanceOf(surface.albedo * (1.0 - surface.metalness)) + max3(surface.sheenColor)) * base + 0.02;
+  let diffuse = (luminanceOf(surface.albedo * ((1.0 - surface.metalness) * (1.0 - surface.subsurface)))
+    + max3(surface.sheenColor)) * base + 0.02;
   let specular = luminanceOf(schlick3(surface.specularColor, surface.specularF90, nv)
     * (1.0 - surface.metalness) + surface.albedo * surface.metalness) * base + 0.05;
   let coat = select(0.0, (1.0 - base) + 0.02, surface.clearcoat > 0.0);
@@ -235,7 +242,8 @@ fn physicalValue(surface: Surface, view: vec3<f32>, light: vec3<f32>) -> vec3<f3
     let average = f0 + (vec3<f32>(1.0) - f0) * 0.047619;
     let multiple = essV * essL * average / (vec3<f32>(1.0) - emsV * emsL * average + 1e-7) * (emsV * emsL);
 
-    var diffuse = surface.albedo * (1.0 - surface.metalness) / PI;
+    // What scatters inside the material leaves it elsewhere, by the random walk, not from this point.
+    var diffuse = surface.albedo * ((1.0 - surface.metalness) * (1.0 - surface.subsurface)) / PI;
     var specular = single + multiple;
 
     // Three's sheen: its lobe sits on top and takes back the energy it reflects from the layers below.
@@ -344,6 +352,16 @@ fn evaluateBsdf(surface: Surface, view: vec3<f32>, light: vec3<f32>) -> BsdfEval
   let nl = dot(normal, light);
   let nv = dot(normal, view);
 
+  // In a medium every direction is open: the phase function stands for the lobes, and samples itself exactly.
+  if (surface.kind == KIND_VOLUME) {
+    let phase = henyeyGreenstein(dot(-view, light), surface.anisotropy);
+
+    result.value = surface.albedo * phase;
+    result.pdf = phase;
+
+    return result;
+  }
+
   if (nv <= 0.0) {
     return result;
   }
@@ -507,6 +525,15 @@ fn sampleBsdf(surface: Surface, view: vec3<f32>, lobe: f32, u: vec2<f32>) -> Bsd
   result.pdf = 0.0;
   result.diffuse = true;
 
+  if (surface.kind == KIND_VOLUME) {
+    result.direction = sampleHenyeyGreenstein(-view, surface.anisotropy, u);
+    result.weight = surface.albedo;
+    result.pdf = henyeyGreenstein(dot(-view, result.direction), surface.anisotropy);
+    result.valid = true;
+
+    return result;
+  }
+
   if (dot(normal, view) <= 0.0) {
     return result;
   }
@@ -574,6 +601,11 @@ fn diffuseValue(surface: Surface, view: vec3<f32>, light: vec3<f32>) -> vec3<f32
     return surface.albedo / PI * toonRamp(surface.gradientMap, nl);
   }
 
+  // Light scattered in a medium is all diffuse, as the denoiser sees it.
+  if (surface.kind == KIND_VOLUME) {
+    return surface.albedo * henyeyGreenstein(dot(-view, light), surface.anisotropy);
+  }
+
   if (nl <= 0.0) {
     return vec3<f32>(0.0);
   }
@@ -582,7 +614,7 @@ fn diffuseValue(surface: Surface, view: vec3<f32>, light: vec3<f32>) -> vec3<f32
     return surface.albedo / PI * nl;
   }
 
-  var diffuse = surface.albedo * (1.0 - surface.metalness) / PI;
+  var diffuse = surface.albedo * ((1.0 - surface.metalness) * (1.0 - surface.subsurface)) / PI;
 
   if (any(surface.sheenColor > vec3<f32>(0.0))) {
     diffuse = diffuse * (1.0 - max3(surface.sheenColor)

package/src/wgsl/bvh.wgsl.ts

@@ -1,17 +1,33 @@
-/** Triangle intersection and the iterative traversal, with the fixed stack the builder caps its depth to. */
+/**
+ * Triangle intersection and the iterative traversal, with the fixed stack the builder caps its depth to.
+ *
+ * The positions are uploaded in the hierarchy's leaf order, so a leaf is a run of triangles read straight off the
+ * buffer; the scene's own triangle number is looked up once, for the hit a trace returns. Every other reader goes the
+ * other way, from a triangle number to where its corners sit.
+ */
 export const BVH_WGSL = /* wgsl */ `
-fn triangleVertex(triangle: u32, corner: u32) -> vec3<f32> {
-  let base = triangle * 9u + corner * 3u;
+/** A corner of the triangle at this position of the hierarchy's leaf order. */
+fn leafVertex(at: u32, corner: u32) -> vec3<f32> {
+  let base = at * 9u + corner * 3u;
 
   return vec3<f32>(positions[base], positions[base + 1u], positions[base + 2u]);
 }
 
+/** Where a triangle of the scene sits in the leaf order the positions are stored in. */
+fn leafOf(triangle: u32) -> u32 {
+  return indices[frame.leafOffset + triangle];
+}
+
+fn triangleVertex(triangle: u32, corner: u32) -> vec3<f32> {
+  return leafVertex(leafOf(triangle), corner);
+}
+
 /** Moller-Trumbore. Returns the distance in x and the barycentric coordinates in yz, or a negative distance. */
-fn intersectTriangle(triangle: u32, origin: vec3<f32>, direction: vec3<f32>) -> vec3<f32> {
+fn intersectTriangle(at: u32, origin: vec3<f32>, direction: vec3<f32>) -> vec3<f32> {
   let miss = vec3<f32>(-1.0, 0.0, 0.0);
-  let a = triangleVertex(triangle, 0u);
-  let edge1 = triangleVertex(triangle, 1u) - a;
-  let edge2 = triangleVertex(triangle, 2u) - a;
+  let a = leafVertex(at, 0u);
+  let edge1 = leafVertex(at, 1u) - a;
+  let edge2 = leafVertex(at, 2u) - a;
   let p = cross(direction, edge2);
   let determinant = dot(edge1, p);
 
@@ -37,10 +53,10 @@ fn intersectTriangle(triangle: u32, origin: vec3<f32>, direction: vec3<f32>) ->
   return vec3<f32>(dot(edge2, q) * inverse, u, v);
 }
 
-/** Where a ray enters a node's box, or 1e30 when it misses it or only meets it past maxDistance. */
-fn enterBox(node: BvhNode, origin: vec3<f32>, inverse: vec3<f32>, maxDistance: f32) -> f32 {
-  let first = (node.low - origin) * inverse;
-  let second = (node.high - origin) * inverse;
+/** Where a ray enters a box, or 1e30 when it misses it or only meets it past maxDistance. */
+fn enterBox(low: vec3<f32>, high: vec3<f32>, origin: vec3<f32>, inverse: vec3<f32>, maxDistance: f32) -> f32 {
+  let first = (low - origin) * inverse;
+  let second = (high - origin) * inverse;
   let near = min(first, second);
   let far = max(first, second);
   let enter = max(max(near.x, near.y), max(near.z, 0.0));
@@ -49,27 +65,67 @@ fn enterBox(node: BvhNode, origin: vec3<f32>, inverse: vec3<f32>, maxDistance: f
   return select(1e30, enter, enter <= exit);
 }
 
-/** The triangles of a leaf, against the closest hit so far. */
-fn intersectLeaf(node: BvhNode, origin: vec3<f32>, direction: vec3<f32>, hit: ptr<function, Hit>) {
-  let start = u32(-1 - node.link);
+/** The triangles of a leaf, against the closest hit so far, which records where in the leaf order it found one. */
+fn intersectLeaf(link: i32, count: i32, origin: vec3<f32>, direction: vec3<f32>, hit: ptr<function, Hit>) {
+  let start = u32(-1 - link);
 
-  for (var i = 0u; i < u32(node.count); i = i + 1u) {
-    let triangle = orderedTriangle(start + i);
-    let result = intersectTriangle(triangle, origin, direction);
+  for (var i = 0u; i < u32(count); i = i + 1u) {
+    let result = intersectTriangle(start + i, origin, direction);
 
     if (result.x > RAY_EPSILON && result.x < (*hit).distance) {
       (*hit).distance = result.x;
-      (*hit).triangle = triangle;
+      (*hit).triangle = start + i;
       (*hit).u = result.y;
       (*hit).v = result.z;
     }
   }
 }
 
+/** Whether any triangle of a leaf lies along the ray before maxDistance: its position in the leaf order, or NO_HIT. */
+fn anyInLeaf(link: i32, count: i32, origin: vec3<f32>, direction: vec3<f32>, maxDistance: f32) -> u32 {
+  let start = u32(-1 - link);
+
+  for (var i = 0u; i < u32(count); i = i + 1u) {
+    let result = intersectTriangle(start + i, origin, direction);
+
+    if (result.x > RAY_EPSILON && result.x < maxDistance) {
+      return start + i;
+    }
+  }
+
+  return NO_HIT;
+}
+
+/** No node to go to: the traversal takes the next entry off the stack. */
+const NO_NODE: u32 = 0xffffffffu;
+
+/**
+ * A stack entry that is a leaf rather than a node: the node holding it and which of its two children it is. A leaf
+ * has no node of its own, so this is how one waits its turn.
+ */
+const LEAF_ENTRY: u32 = 0x80000000u;
+
+fn leafEntry(parent: u32, right: bool) -> u32 {
+  return LEAF_ENTRY | (parent << 1u) | select(0u, 1u, right);
+}
+
+/** A waiting leaf's link and count, read back from the node that holds it. */
+fn waitingLeaf(entry: u32) -> vec2<i32> {
+  let parent = (entry & ~LEAF_ENTRY) >> 1u;
+
+  if ((entry & 1u) != 0u) {
+    return vec2<i32>(nodes[parent].rightLink, nodes[parent].rightCount);
+  }
+
+  return vec2<i32>(nodes[parent].leftLink, nodes[parent].leftCount);
+}
+
 /**
- * The closest hit along a ray. Both children of a node are tested together and the nearer one is visited first, so
- * the closest hit shrinks the search early and whole subtrees behind it are skipped; each node remembers where the ray
- * entered it, and one whose entry is already past the closest hit is dropped without being opened.
+ * The closest hit along a ray. A node holds both of its children's boxes, so one read tests them both. The nearer is
+ * visited first, so the closest hit shrinks the search early and whole subtrees behind it are skipped; the farther one
+ * waits on the stack with where the ray entered it, and is dropped unopened if something closer turned up meanwhile.
+ * A leaf is tested at the top of the next step, the one place the loop tests triangles, which keeps the kernel small.
+ * This visits what the binary tree's traversal visited, in the same order, so it finds the same hit.
  */
 fn traceScene(origin: vec3<f32>, direction: vec3<f32>, maxDistance: f32) -> Hit {
   var hit: Hit;
@@ -85,74 +141,81 @@ fn traceScene(origin: vec3<f32>, direction: vec3<f32>, maxDistance: f32) -> Hit
   // A huge finite reciprocal instead of an infinite one: an axis aligned slab would otherwise produce 0 * inf.
   let signs = select(vec3<f32>(-1.0), vec3<f32>(1.0), direction >= vec3<f32>(0.0));
   let inverse = signs / max(abs(direction), vec3<f32>(1e-20));
-  let rootEnter = enterBox(nodes[0], origin, inverse, hit.distance);
-
-  if (rootEnter >= 1e30) {
-    return hit;
-  }
 
   var stack: array<u32, 32>;
   var enters: array<f32, 32>;
-  var depth = 1u;
-  stack[0] = 0u;
-  enters[0] = rootEnter;
+  var depth = 0u;
+  var current = 0u;
+  // A leaf to test before anything else: its link, and its triangle count, zero when there is none.
+  var leaf = vec2<i32>(0, 0);
 
   loop {
-    if (depth == 0u) {
-      break;
+    if (leaf.y > 0) {
+      intersectLeaf(leaf.x, leaf.y, origin, direction, &hit);
+      leaf.y = 0;
     }
 
-    depth = depth - 1u;
+    if (current == NO_NODE) {
+      if (depth == 0u) {
+        break;
+      }
 
-    // Something closer was found since this node was pushed.
-    if (enters[depth] > hit.distance) {
-      continue;
-    }
+      depth = depth - 1u;
 
-    let node = nodes[stack[depth]];
+      // Something closer was found since this was pushed.
+      if (enters[depth] > hit.distance) {
+        continue;
+      }
 
-    if (node.link < 0) {
-      intersectLeaf(node, origin, direction, &hit);
-      continue;
-    }
+      let entry = stack[depth];
 
-    let leftIndex = u32(node.link);
-    let rightIndex = u32(node.count);
-    let leftEnter = enterBox(nodes[leftIndex], origin, inverse, hit.distance);
-    let rightEnter = enterBox(nodes[rightIndex], origin, inverse, hit.distance);
-    let leftHit = leftEnter < 1e30;
-    let rightHit = rightEnter < 1e30;
+      if ((entry & LEAF_ENTRY) != 0u) {
+        leaf = waitingLeaf(entry);
+        continue;
+      }
 
-    // The builder caps its depth so both children always fit; the guard keeps a malformed tree inside the stack.
-    if (depth + 2u > 32u) {
-      continue;
+      current = entry;
     }
 
-    if (leftHit && rightHit) {
-      // The farther first, so the nearer comes off the stack next.
-      let leftNearer = leftEnter <= rightEnter;
-      stack[depth] = select(leftIndex, rightIndex, leftNearer);
-      enters[depth] = select(leftEnter, rightEnter, leftNearer);
-      stack[depth + 1u] = select(rightIndex, leftIndex, leftNearer);
-      enters[depth + 1u] = select(rightEnter, leftEnter, leftNearer);
-      depth = depth + 2u;
-    } else if (leftHit) {
-      stack[depth] = leftIndex;
-      enters[depth] = leftEnter;
-      depth = depth + 1u;
-    } else if (rightHit) {
-      stack[depth] = rightIndex;
-      enters[depth] = rightEnter;
+    let node = nodes[current];
+    let leftEnter = enterBox(node.leftLow, node.leftHigh, origin, inverse, hit.distance);
+    let rightEnter = enterBox(node.rightLow, node.rightHigh, origin, inverse, hit.distance);
+    let leftFirst = leftEnter <= rightEnter;
+    let nearLink = select(node.rightLink, node.leftLink, leftFirst);
+    let farEnter = select(leftEnter, rightEnter, leftFirst);
+    let farLink = select(node.leftLink, node.rightLink, leftFirst);
+    let parent = current;
+
+    current = NO_NODE;
+
+    // The nearer child: a miss means both missed.
+    if (min(leftEnter, rightEnter) < 1e30) {
+      if (nearLink < 0) {
+        leaf = vec2<i32>(nearLink, select(node.rightCount, node.leftCount, leftFirst));
+      } else {
+        current = u32(nearLink);
+      }
+    }
+
+    // The builder caps its depth so the far children always fit; the guard keeps a malformed tree inside the stack.
+    if (farEnter < 1e30 && depth < 32u) {
+      stack[depth] = select(u32(farLink), leafEntry(parent, leftFirst), farLink < 0);
+      enters[depth] = farEnter;
       depth = depth + 1u;
     }
   }
 
+  if (hit.triangle != NO_HIT) {
+    hit.triangle = orderedTriangle(hit.triangle);
+  }
+
   return hit;
 }
 
 /**
  * Whether anything at all lies along a ray before maxDistance, stopping at the first triangle it finds rather than the
- * closest: what a shadow ray asks when every surface it could meet blocks it. Returns that triangle, or NO_HIT.
+ * closest: what a shadow ray asks when every surface it could meet blocks it. Returns that triangle, or NO_HIT. The
+ * right child goes first and the left one waits, the order the binary tree's traversal took.
  */
 fn traceAny(origin: vec3<f32>, direction: vec3<f32>, maxDistance: f32) -> u32 {
   if (frame.triangleCount == 0u) {
@@ -162,52 +225,60 @@ fn traceAny(origin: vec3<f32>, direction: vec3<f32>, maxDistance: f32) -> u32 {
   let signs = select(vec3<f32>(-1.0), vec3<f32>(1.0), direction >= vec3<f32>(0.0));
   let inverse = signs / max(abs(direction), vec3<f32>(1e-20));
 
-  if (enterBox(nodes[0], origin, inverse, maxDistance) >= 1e30) {
-    return NO_HIT;
-  }
-
   var stack: array<u32, 32>;
-  var depth = 1u;
-  stack[0] = 0u;
+  var depth = 0u;
+  var current = 0u;
+  var leaf = vec2<i32>(0, 0);
 
   loop {
-    if (depth == 0u) {
-      break;
-    }
+    if (leaf.y > 0) {
+      let found = anyInLeaf(leaf.x, leaf.y, origin, direction, maxDistance);
 
-    depth = depth - 1u;
+      if (found != NO_HIT) {
+        return orderedTriangle(found);
+      }
 
-    let node = nodes[stack[depth]];
+      leaf.y = 0;
+    }
 
-    if (node.link < 0) {
-      let start = u32(-1 - node.link);
+    if (current == NO_NODE) {
+      if (depth == 0u) {
+        break;
+      }
+
+      depth = depth - 1u;
 
-      for (var i = 0u; i < u32(node.count); i = i + 1u) {
-        let triangle = orderedTriangle(start + i);
-        let result = intersectTriangle(triangle, origin, direction);
+      let entry = stack[depth];
 
-        if (result.x > RAY_EPSILON && result.x < maxDistance) {
-          return triangle;
-        }
+      if ((entry & LEAF_ENTRY) != 0u) {
+        leaf = waitingLeaf(entry);
+        continue;
       }
 
-      continue;
+      current = entry;
     }
 
-    let leftIndex = u32(node.link);
-    let rightIndex = u32(node.count);
+    let node = nodes[current];
+    let rightHit = enterBox(node.rightLow, node.rightHigh, origin, inverse, maxDistance) < 1e30;
+    let leftHit = enterBox(node.leftLow, node.leftHigh, origin, inverse, maxDistance) < 1e30;
+    let parent = current;
 
-    if (depth + 2u > 32u) {
-      continue;
-    }
+    current = NO_NODE;
 
-    if (enterBox(nodes[leftIndex], origin, inverse, maxDistance) < 1e30) {
-      stack[depth] = leftIndex;
-      depth = depth + 1u;
+    // The right child is taken now and the left one waits; with only one of them hit, that one is taken now.
+    let takeRight = rightHit;
+    let takenLink = select(node.leftLink, node.rightLink, takeRight);
+
+    if (rightHit || leftHit) {
+      if (takenLink < 0) {
+        leaf = vec2<i32>(takenLink, select(node.leftCount, node.rightCount, takeRight));
+      } else {
+        current = u32(takenLink);
+      }
     }
 
-    if (enterBox(nodes[rightIndex], origin, inverse, maxDistance) < 1e30) {
-      stack[depth] = rightIndex;
+    if (rightHit && leftHit && depth < 32u) {
+      stack[depth] = select(u32(node.leftLink), leafEntry(parent, false), node.leftLink < 0);
       depth = depth + 1u;
     }
   }

package/src/wgsl/common.wgsl.ts

@@ -1,15 +1,21 @@
 import { FRAME_LAYOUT } from "../frameLayout.js";
 import { MATERIAL_KIND, MATERIAL_LAYOUT } from "../materialLayout.js";
+import { SOBOL_TABLE, SRGB_TABLE, TEXTURE_TABLE } from "../texturePack.js";
 
 /** Bindings and structs shared by every stage of the path tracing module. */
 export const COMMON_WGSL = /* wgsl */ `
 ${FRAME_LAYOUT.wgsl}
-// Thirty two bytes: a corner and a link, twice. A leaf stores -1 - start in place of its left child.
+// Sixty four bytes: the boxes of a node's two children, each a corner and a link, then a corner and a count. A link of
+// zero or more is the child's own node; a leaf stores -1 - start in it, into the hierarchy's leaf order. See bvh.ts.
 struct BvhNode {
-  low: vec3<f32>,
-  link: i32,
-  high: vec3<f32>,
-  count: i32,
+  leftLow: vec3<f32>,
+  leftLink: i32,
+  leftHigh: vec3<f32>,
+  leftCount: i32,
+  rightLow: vec3<f32>,
+  rightLink: i32,
+  rightHigh: vec3<f32>,
+  rightCount: i32,
 };
 
 /** As materialLayout.ts packs it. A map index of NO_TEXTURE means the slot is empty. */
@@ -93,6 +99,10 @@ const MATERIAL_OBJECT_NORMAL_MAP: u32 = 256u;
 const MATERIAL_PATCHED: u32 = 512u;
 const MATERIAL_ALPHA_HASH: u32 = 2048u;
 const MATERIAL_SPECULAR: u32 = 4096u;
+// The mesh only bounds a medium: its surface is invisible and the space inside scatters light.
+const MATERIAL_VOLUME: u32 = 8192u;
+// An unlit material of a fixed colour, which direct sampling aims at: it emits what it shows.
+const MATERIAL_UNLIT_LIGHT: u32 = 16384u;
 
 const KIND_STANDARD: u32 = ${MATERIAL_KIND.standard}u;
 const KIND_PHYSICAL: u32 = ${MATERIAL_KIND.physical}u;
@@ -119,14 +129,21 @@ const BLEND_MULTIPLY: u32 = 4u;
 const NO_TEXTURE: u32 = 0xffffffffu;
 const NO_PROGRAM: u32 = 0xffffffffu;
 
+// The lookup tables that lead the texture buffer, and where its table of textures starts after them: see texturePack.ts.
+const SOBOL_TABLE: u32 = ${SOBOL_TABLE}u;
+const SRGB_TABLE: u32 = ${SRGB_TABLE}u;
+const TEXTURE_TABLE: u32 = ${TEXTURE_TABLE}u;
+
 // A WebGPU device only has to offer eight storage buffers per stage, so arrays of the same kind share one binding and
 // the uniform says where the second one starts. See sceneUpload.ts, which joins them.
 @group(0) @binding(0) var<uniform> frame: Frame;
+// Nine coordinates per triangle, in the hierarchy's leaf order: see leafOf in bvh.wgsl.ts.
 @group(0) @binding(1) var<storage, read> positions: array<f32>;
 // Normals, then the UV sets from frame.uvOffset, vertex colours from frame.colorOffset and shader varyings from
 // frame.varyingOffset.
 @group(0) @binding(2) var<storage, read> attributes: array<f32>;
-// One material index per triangle, then the hierarchy's triangle order from frame.orderOffset on.
+// One material index per triangle, then the hierarchy's triangle order from frame.orderOffset on (the triangle at each
+// position of the leaf order), then from frame.leafOffset on the other way (the position of each triangle).
 @group(0) @binding(3) var<storage, read> indices: array<u32>;
 @group(0) @binding(4) var<storage, read> materials: array<Material>;
 @group(0) @binding(5) var<storage, read> nodes: array<BvhNode>;
@@ -174,7 +191,7 @@ fn extraVec4(at: u32) -> vec4<f32> {
 
 /** One entry of the texture table, unpacked from the words it shares with the texels. */
 fn textureInfo(index: u32) -> TextureInfo {
-  let at = index * 16u;
+  let at = TEXTURE_TABLE + index * 16u;
   var info: TextureInfo;
 
   info.size = vec2<u32>(textures[at], textures[at + 1u]);