@woosh/meep-engine 3.49.0 → 3.50.0

package/src/shade/playground/particle_ecs/effects/flame.json

@@ -1535,6 +1535,38 @@
         },
         "x": 1372,
         "y": 1492.75
+      },
+      {
+        "id": 57,
+        "type": "wind",
+        "parameters": {},
+        "x": 3113,
+        "y": 1599.25
+      },
+      {
+        "id": 58,
+        "type": "const",
+        "parameters": {
+          "value": [
+            0.5
+          ]
+        },
+        "x": 3113,
+        "y": 1719.25
+      },
+      {
+        "id": 59,
+        "type": "scale",
+        "parameters": {},
+        "x": 3413,
+        "y": 1599.25
+      },
+      {
+        "id": 60,
+        "type": "add",
+        "parameters": {},
+        "x": 3673,
+        "y": 1539.25
       }
     ],
     "connections": [
@@ -1839,7 +1871,7 @@
         "toPort": "value"
       },
       {
-        "from": 45,
+        "from": 60,
         "fromPort": "out",
         "to": 48,
         "toPort": "v"
@@ -1903,6 +1935,36 @@
         "fromPort": "out",
         "to": 56,
         "toPort": "value"
+      },
+      {
+        "from": 47,
+        "fromPort": "out",
+        "to": 57,
+        "toPort": "position"
+      },
+      {
+        "from": 57,
+        "fromPort": "out",
+        "to": 59,
+        "toPort": "v"
+      },
+      {
+        "from": 58,
+        "fromPort": "out",
+        "to": 59,
+        "toPort": "s"
+      },
+      {
+        "from": 45,
+        "fromPort": "out",
+        "to": 60,
+        "toPort": "a"
+      },
+      {
+        "from": 59,
+        "fromPort": "out",
+        "to": 60,
+        "toPort": "b"
       }
     ]
   },

package/src/shade/playground/particle_ecs/effects/smoke.json

@@ -1287,19 +1287,6 @@
         "x": 2342.5,
         "y": 610
       },
-      {
-        "id": 36,
-        "type": "const",
-        "parameters": {
-          "value": [
-            0,
-            0,
-            0
-          ]
-        },
-        "x": 2353.75,
-        "y": 720
-      },
       {
         "id": 37,
         "type": "mul",
@@ -1554,6 +1541,13 @@
         },
         "x": 455,
         "y": 1190
+      },
+      {
+        "id": 59,
+        "type": "wind",
+        "parameters": {},
+        "x": 2353.75,
+        "y": 720
       }
     ],
     "connections": [
@@ -1804,7 +1798,7 @@
         "toPort": "a"
       },
       {
-        "from": 36,
+        "from": 59,
         "fromPort": "out",
         "to": 40,
         "toPort": "b"
@@ -1928,6 +1922,12 @@
         "fromPort": "quat",
         "to": 58,
         "toPort": "value"
+      },
+      {
+        "from": 42,
+        "fromPort": "out",
+        "to": 59,
+        "toPort": "position"
       }
     ]
   },

package/src/shade/playground/particle_ecs/effects/soot.json

@@ -1227,6 +1227,38 @@
         "parameters": {},
         "x": 301,
         "y": 1514
+      },
+      {
+        "id": 62,
+        "type": "wind",
+        "parameters": {},
+        "x": 2783.25,
+        "y": 1088.25
+      },
+      {
+        "id": 63,
+        "type": "const",
+        "parameters": {
+          "value": [
+            1
+          ]
+        },
+        "x": 2783.25,
+        "y": 1208.25
+      },
+      {
+        "id": 64,
+        "type": "scale",
+        "parameters": {},
+        "x": 3083.25,
+        "y": 1088.25
+      },
+      {
+        "id": 65,
+        "type": "add",
+        "parameters": {},
+        "x": 3343.25,
+        "y": 1028.25
       }
     ],
     "connections": [
@@ -1495,7 +1527,7 @@
         "toPort": "value"
       },
       {
-        "from": 40,
+        "from": 65,
         "fromPort": "out",
         "to": 43,
         "toPort": "v"
@@ -1583,6 +1615,36 @@
         "fromPort": "quat",
         "to": 58,
         "toPort": "value"
+      },
+      {
+        "from": 42,
+        "fromPort": "out",
+        "to": 62,
+        "toPort": "position"
+      },
+      {
+        "from": 62,
+        "fromPort": "out",
+        "to": 64,
+        "toPort": "v"
+      },
+      {
+        "from": 63,
+        "fromPort": "out",
+        "to": 64,
+        "toPort": "s"
+      },
+      {
+        "from": 40,
+        "fromPort": "out",
+        "to": 65,
+        "toPort": "a"
+      },
+      {
+        "from": 64,
+        "fromPort": "out",
+        "to": 65,
+        "toPort": "b"
       }
     ]
   },

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

@@ -215,6 +215,22 @@
             flex: 1;
         }
 
+        p.sub.wind {
+            margin: 12px 0 4px;
+        }
+
+        label.slider input {
+            flex: 2;
+            min-width: 0;
+        }
+
+        label.slider output {
+            min-width: 4.5em;
+            text-align: right;
+            color: var(--muted);
+            font-variant-numeric: tabular-nums;
+        }
+
         button {
             width: 100%;
             margin-top: 10px;
@@ -283,6 +299,11 @@
     <label class="row"><input type="checkbox" id="soot" checked><span>Soot</span></label>
 
     <button id="stoke">Stoke the fire</button>
+
+    <p class="sub wind">The wind, as the scene's far field</p>
+    <label class="row slider"><span>Wind</span><input type="range" id="wind_speed" min="0" max="8" step="0.1"><output id="wind_speed_out"></output></label>
+    <label class="row slider"><span>Gust</span><input type="range" id="wind_gust" min="0" max="4" step="0.1"><output id="wind_gust_out"></output></label>
+    <label class="row slider"><span>Heading</span><input type="range" id="wind_heading" min="-180" max="180" step="1"><output id="wind_heading_out"></output></label>
 </section>
 
 <section class="panel" id="stats">

package/src/shade/playground/particle_ecs/main.js

@@ -23,6 +23,7 @@ import {
     particle_stats_after_readback_failure
 } from "../particle_stats_readback.js";
 import { install_effect_editor } from "./bonfire_editor.js";
+import { BonfireWind } from "./bonfire_wind.js";
 import { bonfire_sprites } from "./bonfire_sprites.js";
 import { moonlit_environment } from "./moonlit_environment.js";
 
@@ -170,6 +171,35 @@ async function main() {
         particles.burst(world.flame, STOKE_FLAME);
     });
 
+    // ---- the wind -------------------------------------------------------------------------------
+    // Written onto the scene's wind field every frame, below; the sliders and `?wind=`, `?gust=`,
+    // `?heading=` only set what it blows. `?wind=0&gust=0` is the still night the page had before.
+
+    const weather = new BonfireWind();
+    const query = new URLSearchParams(location.search);
+
+    for (const [id, field, unit, parameter] of [
+        ["wind_speed", "speed", " m/s", "wind"],
+        ["wind_gust", "gust", " m/s", "gust"],
+        ["wind_heading", "heading_degrees", "°", "heading"],
+    ]) {
+        const input = element(id);
+        const readout = element(`${id}_out`);
+        const show = () => { readout.textContent = `${weather[field]}${unit}`; };
+
+        if (query.has(parameter) && Number.isFinite(Number(query.get(parameter)))) {
+            weather[field] = Number(query.get(parameter));
+        }
+
+        input.value = String(weather[field]);
+        show();
+
+        input.addEventListener("input", () => {
+            weather[field] = Number(input.value);
+            show();
+        });
+    }
+
     // ---- the particle editor --------------------------------------------------------------------
     // E opens it over the fire. An edit recompiles the document and swaps the component on its
     // entity, so what is on screen is the effect being edited rather than a preview of it.
@@ -290,7 +320,7 @@ async function main() {
      One name, one meaning.
     */
     Object.assign(globalThis, {
-        graphics, scene, dataset, entities, particles, world, camera, controller,
+        graphics, scene, dataset, entities, particles, world, camera, controller, weather,
         particle_editor: editor,
     });
 
@@ -420,6 +450,10 @@ async function main() {
         // particle system's is where the four components are compared against their emitters.
         entities.update(dt);
 
+        // The far field, onto the scene's wind field before the frame renders: the scene context
+        // uploads it in its own update, and every particle pass reads it there.
+        weather.blow(dt, renderer.scenes.obtain(scene).wind);
+
         /*
          Nothing is drawn while the editor is up. It covers the window, so a frame underneath it is
          a whole scene — the transparency pipeline, the particle passes, the resolve — composited

package/src/shade/playground/path_traced_media/main.js

@@ -12,6 +12,8 @@ import { Renderer } from "../../renderer/Renderer.js";
 import { place_primitive } from "../../renderer/scene/rows/place_primitive.js";
 import { Scene } from "../../renderer/scene/Scene.js";
 import { load_default_environment } from "../load_default_environment.js";
+import { render_submitted_frames } from "../render_submitted_frames.js";
+import { submit_frame } from "../submit_frame.js";
 import { make_flat_environment } from "../skinned_blas_refit/flat_environment.js";
 import { CaptureRadiance } from "./capture_radiance.js";
 import { agrees, MEDIA_CHECKS, region_statistics } from "./checks.js";
@@ -188,12 +190,13 @@ async function main() {
 
         aim(check);
 
-        // a few frames first, so pipeline compilation is not in the timing
-        for (let i = 0; i < 4; i++) {
-            renderer.render(camera, scene, 0);
-        }
-
-        await device.queue.onSubmittedWorkDone();
+        /*
+         A few frames first, so pipeline compilation is not in the timing. Submitted frames, not
+         calls: while the renderer's prepared pipelines compile, every call is refused, and so would
+         every frame of the measurement be, with nothing captured. After these, only a lost device
+         refuses a frame, and a check whose run accumulated fewer samples than frames fails.
+        */
+        await render_submitted_frames(renderer, camera, scene, 4, 0);
 
         renderer.path_tracer.clear_history = true;
 
@@ -390,9 +393,7 @@ async function main() {
     async function read_radiance() {
         capture.enabled = true;
 
-        renderer.render(camera, live_scene, 0);
-
-        await device.queue.onSubmittedWorkDone();
+        await render_submitted_frames(renderer, camera, live_scene, 1, 0);
 
         capture.enabled = false;
 
@@ -406,8 +407,9 @@ async function main() {
      * @returns {Promise<number>} samples per pixel so far
      */
     async function accumulate(frames) {
+        // submitted rather than called, without waiting on each: one wait per frame is six times slower
         for (let i = 0; i < frames; i++) {
-            renderer.render(camera, live_scene, 0);
+            await submit_frame(renderer, camera, live_scene, 0);
 
             if ((i & 15) === 15) {
                 await device.queue.onSubmittedWorkDone();

package/src/shade/playground/render_submitted_frames.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Draw `count` frames, each one submitted and finished on the GPU before the next is drawn — what a
+ * page does before it reads back anything a frame produces, and what a check does to advance the
+ * scene by hand.
+ *
+ * **Counted as frames the renderer submitted, not as calls** — see {@link submit_frame}, which
+ * draws each one. A refused frame flushes no rows, runs no skinning and refits no tree, and
+ * `onSubmittedWorkDone` resolves at once with nothing submitted, so a loop counting calls finishes
+ * its warm-up before the first real frame. A page that then reads a `meshes` row back gets
+ * `undefined`: no page of the table was ever written.
+ *
+ * @param {Renderer} renderer
+ * @param {PerspectiveCamera} camera
+ * @param {Scene} scene
+ * @param {number} count frames to submit
+ * @param {number} [dt] simulation seconds each submitted frame advances by
+ * @returns {Promise<void>}
+ */
+export function render_submitted_frames(renderer: Renderer, camera: PerspectiveCamera, scene: Scene, count: number, dt?: number): Promise<void>;
+//# sourceMappingURL=render_submitted_frames.d.ts.map

package/src/shade/playground/render_submitted_frames.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render_submitted_frames.d.ts","sourceRoot":"","sources":["../../../../src/shade/playground/render_submitted_frames.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;GAiBG;AACH,4GAJW,MAAM,OACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CAUzB"}

package/src/shade/playground/render_submitted_frames.js

@@ -0,0 +1,29 @@
+import { submit_frame } from "./submit_frame.js";
+
+/**
+ * Draw `count` frames, each one submitted and finished on the GPU before the next is drawn — what a
+ * page does before it reads back anything a frame produces, and what a check does to advance the
+ * scene by hand.
+ *
+ * **Counted as frames the renderer submitted, not as calls** — see {@link submit_frame}, which
+ * draws each one. A refused frame flushes no rows, runs no skinning and refits no tree, and
+ * `onSubmittedWorkDone` resolves at once with nothing submitted, so a loop counting calls finishes
+ * its warm-up before the first real frame. A page that then reads a `meshes` row back gets
+ * `undefined`: no page of the table was ever written.
+ *
+ * @param {Renderer} renderer
+ * @param {PerspectiveCamera} camera
+ * @param {Scene} scene
+ * @param {number} count frames to submit
+ * @param {number} [dt] simulation seconds each submitted frame advances by
+ * @returns {Promise<void>}
+ */
+export async function render_submitted_frames(renderer, camera, scene, count, dt = 1 / 60) {
+    const queue = renderer.graphics.device.queue;
+
+    for (let i = 0; i < count; i++) {
+        await submit_frame(renderer, camera, scene, dt);
+
+        await queue.onSubmittedWorkDone();
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/skinned_blas_refit/main.js"],"names":[],"mappings":"AAgQA;;;;;GAKG;AACH,yBAFa,QAAQ,IAAI,CAAC,CAoiBzB"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/skinned_blas_refit/main.js"],"names":[],"mappings":"AAiQA;;;;;GAKG;AACH,yBAFa,QAAQ,IAAI,CAAC,CAiiBzB"}

package/src/shade/playground/skinned_blas_refit/main.js

@@ -20,6 +20,7 @@ import { Renderer } from "../../renderer/Renderer.js";
 import { Scene } from "../../renderer/scene/Scene.js";
 import { load_default_environment } from "../load_default_environment.js";
 import { make_playground_asset_manager } from "../make_playground_asset_manager.js";
+import { render_submitted_frames } from "../render_submitted_frames.js";
 import { add_floor } from "./add_floor.js";
 import { geometry_of, grid_position, place_character } from "./place_character.js";
 
@@ -529,16 +530,13 @@ export async function start() {
 
     // Frames enough for skinning to run and its bounds-refresh chain to publish a deformed box,
     // which is the only box worth framing on — see `world_bounds_of`. The camera is parked at the
-    // origin until then, so nothing is worth looking at yet either.
+    // origin until then, so nothing is worth looking at yet either. Submitted frames, not calls:
+    // the first several calls are refused while the renderer's prepared pipelines compile.
     set_status(`first frames — uploading ${count} clones and their trees …`);
 
     const first_frames_started = performance.now();
 
-    for (let i = 0; i < 8; i++) {
-        renderer.render(camera, scene, 1 / 60);
-
-        await renderer.graphics.device.queue.onSubmittedWorkDone();
-    }
+    await render_submitted_frames(renderer, camera, scene, 8);
 
     load_timing.first_frames_ms = performance.now() - first_frames_started;
 

package/src/shade/playground/skinned_blas_refit/verify_instance_bounds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verify_instance_bounds.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/skinned_blas_refit/verify_instance_bounds.js"],"names":[],"mappings":"AA0FA;;;;;;;;;;;GAWG;AACH,qCAJW,UAAU,MAAM,CAAC,UACjB,UAAU,MAAM,CAAC,GACf,MAAM,EAAE,CAqBpB;AAuCD;;;;;;;;;;GAUG;AACH;IAP6B,QAAQ;IACX,KAAK;IACQ,MAAM;IAEjB,SAAS,GAA1B,MAAM;IACJ,QAAQ,MAAM,CAAC,CAoG3B"}
+{"version":3,"file":"verify_instance_bounds.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/skinned_blas_refit/verify_instance_bounds.js"],"names":[],"mappings":"AA2FA;;;;;;;;;;;GAWG;AACH,qCAJW,UAAU,MAAM,CAAC,UACjB,UAAU,MAAM,CAAC,GACf,MAAM,EAAE,CAqBpB;AAuCD;;;;;;;;;;GAUG;AACH;IAP6B,QAAQ;IACX,KAAK;IACQ,MAAM;IAEjB,SAAS,GAA1B,MAAM;IACJ,QAAQ,MAAM,CAAC,CAgG3B"}