@woosh/meep-engine 3.64.1 → 3.65.0

package/src/engine/physics/fluid/obstacle/chunk_fluid_obstacle_record.js

@@ -1,5 +1,6 @@
 import { chunk_quat_rotate_v3 } from "../../../../shade/renderer/shader/chunk/geometry/quaternion/chunk_v3_apply_quat.js";
 import { chunk_rigid_velocity_at_point } from "../../../../shade/renderer/shader/chunk/physics/kinematics/chunk_rigid_velocity_at_point.js";
+import { chunk_shape_record_line_span } from "../../../../shade/renderer/shader/chunk/sdf/chunk_shape_record_line_span.js";
 import { chunk_shape_record_signed_distance } from "../../../../shade/renderer/shader/chunk/sdf/chunk_shape_record_signed_distance.js";
 import { CodeChunk } from "../../../../shade/renderer/shader/compiler/CodeChunk.js";
 import { FLUID_OBSTACLE_RECORD_STRUCT } from "./FLUID_OBSTACLE_RECORD_STRUCT.js";
@@ -10,7 +11,11 @@ import { FLUID_OBSTACLE_RECORD_STRUCT } from "./FLUID_OBSTACLE_RECORD_STRUCT.js"
  * - `fluid_obstacle_record_signed_distance(record, global, x) -> f32`: signed distance to its
  *   surface, negative inside; the point is solid when it is at most `record.inflation`;
  * - `fluid_obstacle_record_wall_velocity(record, global, x) -> vec3<f32>`: the wall's velocity there,
- *   `rigid_velocity_at_point(v, ω, t, x)` with `t` the node's translation.
+ *   `rigid_velocity_at_point(v, ω, t, x)` with `t` the node's translation;
+ * - `fluid_obstacle_record_line_span(record, global, origin, direction) -> vec2<f32>`: the part of the
+ *   world line `origin + t · direction` (`direction` unit) inside its surface, as the `t` it enters at
+ *   and the `t` it leaves at, the first greater than the second for a line that misses
+ *   (`shape_record_line_span`). The inflation is not part of it.
  *
  * The node poses the record rigidly: its translation, and its matrix's rotation with each column
  * normalised, scale ignored, as the physics narrowphase and the CPU fluid pose a collider; then the
@@ -47,6 +52,26 @@ fn fluid_obstacle_record_signed_distance(
     return shape_record_signed_distance(record.shape_kind, record.shape_parameters, local);
 }
 
+fn fluid_obstacle_record_line_span(
+    record: ${FLUID_OBSTACLE_RECORD_STRUCT.wgsl_ref}, global: mat4x4<f32>, origin: vec3<f32>, direction: vec3<f32>
+) -> vec2<f32> {
+    // the node's rotation: its columns normalised, so its scale is ignored
+    let r0 = global[0].xyz * (1.0 / length(global[0].xyz));
+    let r1 = global[1].xyz * (1.0 / length(global[1].xyz));
+    let r2 = global[2].xyz * (1.0 / length(global[2].xyz));
+
+    let offset = origin - global[3].xyz;
+
+    // the record's own pose within the collider, inverted
+    let q = record.pose_rotation;
+    let inverse = vec4<f32>(-q.xyz, q.w);
+
+    let local_origin = quat_rotate_v3(inverse, vec3<f32>(dot(r0, offset), dot(r1, offset), dot(r2, offset)) - record.pose_translation);
+    let local_direction = quat_rotate_v3(inverse, vec3<f32>(dot(r0, direction), dot(r1, direction), dot(r2, direction)));
+
+    return shape_record_line_span(record.shape_kind, record.shape_parameters, local_origin, local_direction);
+}
+
 fn fluid_obstacle_record_wall_velocity(
     record: ${FLUID_OBSTACLE_RECORD_STRUCT.wgsl_ref}, global: mat4x4<f32>, x: vec3<f32>
 ) -> vec3<f32> {
@@ -57,5 +82,6 @@ fn fluid_obstacle_record_wall_velocity(
         chunk_quat_rotate_v3,
         chunk_rigid_velocity_at_point,
         chunk_shape_record_signed_distance,
+        chunk_shape_record_line_span,
     ]
 );

package/src/shade/device/shader/ShaderModuleCompiler.d.ts

@@ -8,6 +8,8 @@ export class ShaderModuleCompiler {
      */
     constructor(device: GPUDevice);
     /**
+     * The module for `descriptor`. Equal descriptors are handed the same module for as long as
+     * something holds it; once nothing does, a later call may compile it again and hand out a new one.
      *
      * @param {ShaderModuleDescriptor} descriptor
      * @returns {GPUShaderModule}

package/src/shade/device/shader/ShaderModuleCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ShaderModuleCompiler.d.ts","sourceRoot":"","sources":["../../../../../src/shade/device/shader/ShaderModuleCompiler.js"],"names":[],"mappings":"AAGA;;GAEG;AAEH;IAaI;;;OAGG;IACH,+BAEC;IAwCD;;;;OAIG;IACH,mBAHW,sBAAsB,mBAOhC;;CAEJ;qCAzEY,OAAO,qDAAqD,EAAE,sBAAsB"}
+{"version":3,"file":"ShaderModuleCompiler.d.ts","sourceRoot":"","sources":["../../../../../src/shade/device/shader/ShaderModuleCompiler.js"],"names":[],"mappings":"AAGA;;GAEG;AAEH;IAmBI;;;OAGG;IACH,+BAEC;IAwCD;;;;;;OAMG;IACH,mBAHW,sBAAsB,mBAsBhC;;CAEJ;qCAhGY,OAAO,qDAAqD,EAAE,sBAAsB"}

package/src/shade/device/shader/ShaderModuleCompiler.js

@@ -13,8 +13,14 @@ export class ShaderModuleCompiler {
     #device
 
     /**
+     * Held weakly. A pipeline keeps the module it was built from alive in the GPU process without our
+     * help, while the browser charges every `GPUShaderModule` object the page still references to the
+     * JS heap's accounting as external memory, and the garbage a collection is allowed to gather grows
+     * with that. So a module is kept only for as long as something holds it: one nobody holds goes at
+     * the next major collection, and a later request compiles it again from the descriptor, which this
+     * map does keep.
      *
-     * @type {HashMap<ShaderModuleDescriptor, GPUShaderModule>}
+     * @type {HashMap<ShaderModuleDescriptor, WeakRef<GPUShaderModule>>}
      */
     #cache = new HashMap();
 
@@ -65,14 +71,31 @@ export class ShaderModuleCompiler {
     }
 
     /**
+     * The module for `descriptor`. Equal descriptors are handed the same module for as long as
+     * something holds it; once nothing does, a later call may compile it again and hand out a new one.
      *
      * @param {ShaderModuleDescriptor} descriptor
      * @returns {GPUShaderModule}
      */
     obtain(descriptor) {
+        const cache = this.#cache;
 
-        return this.#cache.getOrCompute(descriptor, this.#compile, this);
+        const held = cache.get(descriptor);
 
+        if (held !== undefined) {
+            const live = held.deref();
+
+            if (live !== undefined) {
+                return live;
+            }
+        }
+
+        const module = this.#compile(descriptor);
+
+        // an equal descriptor that is already a key keeps its entry, and the dead reference is replaced
+        cache.set(descriptor, new WeakRef(module));
+
+        return module;
     }
 
 }

package/src/shade/playground/grass_surfaces/index.html

@@ -0,0 +1,75 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Grass surfaces</title>
+    <style>
+        :root {
+            color-scheme: dark;
+        }
+
+        html, body {
+            margin: 0;
+            height: 100%;
+            overflow: hidden;
+            background: #101215;
+            color: #e3e5e8;
+            font: 13px/1.4 'Segoe UI', system-ui, sans-serif;
+        }
+
+        #viewport {
+            position: absolute;
+            inset: 0;
+        }
+
+        #legend {
+            position: absolute;
+            left: 12px;
+            top: 12px;
+            padding: 10px 12px;
+            background: rgba(14, 15, 20, 0.78);
+            border: 1px solid rgba(255, 255, 255, 0.1);
+            border-radius: 4px;
+            max-width: 360px;
+        }
+
+        #legend h1 {
+            font-size: 14px;
+            margin: 0 0 6px;
+        }
+
+        #legend p {
+            margin: 4px 0;
+            color: #a8adb5;
+        }
+
+        #status {
+            font-variant-numeric: tabular-nums;
+            color: #e3e5e8;
+            white-space: pre;
+        }
+
+        #message {
+            position: absolute;
+            inset: 0;
+            display: none;
+            place-items: center;
+            white-space: pre-wrap;
+            padding: 24px;
+        }
+    </style>
+</head>
+<body tabindex="0">
+<div id="viewport"></div>
+<div id="legend">
+    <h1>Grass surfaces</h1>
+    <p>A field of two sheets, a boulder sunk into one and a hill over a cave on the other, sampled as one
+        surface; and a platform of two sheets and a crate that moves as another.</p>
+    <p>A grey slab hangs over the field and is no member of it.</p>
+    <p id="status"></p>
+</div>
+<div id="message"></div>
+<script type="module" src="./main.js"></script>
+</body>
+</html>

package/src/shade/playground/grass_surfaces/main.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=main.d.ts.map

package/src/shade/playground/grass_surfaces/main.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/grass_surfaces/main.js"],"names":[],"mappings":""}