@woosh/meep-engine 3.60.7 → 3.60.9

package/package.json

@@ -6,7 +6,7 @@
   "description": "Advanced 3D game engine",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "3.60.7",
+  "version": "3.60.9",
   "exports": {
     "./build/*": "./build/*",
     "./src/*": "./src/*",

package/src/engine/graphics3/AnimationGraphSystem.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @typedef {import("../ecs/EntityComponentDataset.js").EntityComponentDataset} EntityComponentDataset
+ */
 /**
  * Drives every entity's {@link AnimationGraphController}: runs its clock, writes its clips' weights
  * and times into the entity's {@link AnimationClips}, and hands that blend to the renderer through
@@ -58,10 +61,10 @@ export class AnimationGraphSystem extends System<any> {
      * @param {number} entity
      */
     unlink(controller: AnimationGraphController, clips: AnimationClips, entity: number): void;
-    startup(entityManager: any): Promise<void>;
     shutdown(entityManager: any): Promise<void>;
     #private;
 }
+export type EntityComponentDataset = import("../ecs/EntityComponentDataset.js").EntityComponentDataset;
 import { System } from "../ecs/System.js";
 import { AnimationClips } from "./animation/AnimationClips.js";
 import { AnimationGraphController } from "./animation/AnimationGraphController.js";

package/src/engine/graphics3/AnimationGraphSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AnimationGraphSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/AnimationGraphSystem.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH;IAWI;;;OAGG;IACH,oDAcC;IATG,0EAA8D;IAK9D,uIAGC;IAGL;;;;;;;;;OASG;IACH,iBAJW,wBAAwB,SACxB,cAAc,UACd,MAAM,QAShB;IAED;;;;;;;;;OASG;IACH,6BANW,cAAc,UACd,MAAM,GACJ,OAAO,CAYnB;IAED;;;;OAIG;IACH,mBAJW,wBAAwB,SACxB,cAAc,UACd,MAAM,QAYhB;IAED,2CAEC;IAED,4CAYC;;CAoGJ;uBAxOsB,kBAAkB;+BACV,+BAA+B;yCAErB,yCAAyC;4CAJtC,iDAAiD"}
+{"version":3,"file":"AnimationGraphSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/AnimationGraphSystem.js"],"names":[],"mappings":"AAOA;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH;IAWI;;;OAGG;IACH,oDAcC;IATG,0EAA8D;IAK9D,uIAGC;IAGL;;;;;;;;;OASG;IACH,iBAJW,wBAAwB,SACxB,cAAc,UACd,MAAM,QAShB;IAED;;;;;;;;;OASG;IACH,6BANW,cAAc,UACd,MAAM,GACJ,OAAO,CAYnB;IAED;;;;OAIG;IACH,mBAJW,wBAAwB,SACxB,cAAc,UACd,MAAM,QAYhB;IAED,4CAEC;;CA4IJ;qCAhQY,OAAO,kCAAkC,EAAE,sBAAsB;uBANvD,kBAAkB;+BACV,+BAA+B;yCAErB,yCAAyC;4CAJtC,iDAAiD"}

package/src/engine/graphics3/AnimationGraphSystem.js

@@ -5,6 +5,10 @@ import { AnimationClips } from "./animation/AnimationClips.js";
 import { AnimationClipsSink } from "./animation/AnimationClipsSink.js";
 import { AnimationGraphController } from "./animation/AnimationGraphController.js";
 
+/**
+ * @typedef {import("../ecs/EntityComponentDataset.js").EntityComponentDataset} EntityComponentDataset
+ */
+
 /**
  * Drives every entity's {@link AnimationGraphController}: runs its clock, writes its clips' weights
  * and times into the entity's {@link AnimationClips}, and hands that blend to the renderer through
@@ -116,28 +120,54 @@ export class AnimationGraphSystem extends System {
         this.#entries.delete(entity);
     }
 
-    async startup(entityManager) {
-        this.#sink.startup(entityManager.dataset);
+    async shutdown(entityManager) {
+        this.#detach();
     }
 
-    async shutdown(entityManager) {
+    /**
+     * @param {EntityComponentDataset} dataset
+     */
+    handleDatasetAttached(dataset) {
+        this.#detach();
+
+        this.#sink.attach_dataset(dataset);
+    }
+
+    /**
+     * @param {EntityComponentDataset} dataset
+     */
+    handleDatasetDetached(dataset) {
+        this.#detach();
+    }
+
+    /**
+     * Let go of the dataset: every entity's graph and clips, the sink's chains, and the scene's name
+     * for it.
+     */
+    #detach() {
+        // the manager unlinks every entity before it detaches; anything left goes the same way
         for (const entry of this.#entries.values()) {
             entry.controller.unlink();
 
             if (entry.bound) {
-                this.#sink.unbind_on_shutdown(entry.clips);
+                this.#sink.unbind_on_detach(entry.clips);
             }
         }
 
         this.#entries.clear();
 
-        this.#sink.shutdown();
+        this.#sink.detach_dataset();
     }
 
     /**
      * @param {number} time_delta_seconds
      */
     update(time_delta_seconds) {
+        if (!this.#sink.attached) {
+            // nothing to run
+            return;
+        }
+
         const ecd = this.entityManager.dataset;
         const context = this.#sink.begin_update();
 

package/src/engine/graphics3/AnimationSystem.d.ts

@@ -70,10 +70,10 @@ export class AnimationSystem extends System<any> {
      * @param {number} entity
      */
     unlink(component: Animation, clips: AnimationClips, entity: number): void;
-    startup(entityManager: any): Promise<void>;
     shutdown(entityManager: any): Promise<void>;
     #private;
 }
+export type EntityComponentDataset = import("../ecs/EntityComponentDataset.js").EntityComponentDataset;
 import { System } from "../ecs/System.js";
 import { Animation } from "../ecs/animation/Animation.js";
 import { AnimationClips } from "./animation/AnimationClips.js";

package/src/engine/graphics3/AnimationSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AnimationSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/AnimationSystem.js"],"names":[],"mappings":"AAoBA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH;IAWI;;;OAGG;IACH,oDAcC;IATG,2DAA+C;IAK/C,wHAGC;IAGL;;;;;;;;OAQG;IACH,qBAHW,MAAM,GACJ,cAAc,CAU1B;IAED;;;;;;;;;OASG;IACH,6BANW,cAAc,UACd,MAAM,GACJ,OAAO,CAYnB;IAED;;;;;;;;OAQG;IACH,gBAJW,SAAS,SACT,cAAc,UACd,MAAM,QAQhB;IAED;;;;OAIG;IACH,kBAJW,SAAS,SACT,cAAc,UACd,MAAM,QAUhB;IAED,2CAEC;IAED,4CAUC;;CAkEJ;uBAlOsB,kBAAkB;0BADf,+BAA+B;+BAE1B,+BAA+B;4CAHlB,iDAAiD"}
+{"version":3,"file":"AnimationSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/AnimationSystem.js"],"names":[],"mappings":"AAwBA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH;IAWI;;;OAGG;IACH,oDAcC;IATG,2DAA+C;IAK/C,wHAGC;IAGL;;;;;;;;OAQG;IACH,qBAHW,MAAM,GACJ,cAAc,CAU1B;IAED;;;;;;;;;OASG;IACH,6BANW,cAAc,UACd,MAAM,GACJ,OAAO,CAYnB;IAED;;;;;;;;OAQG;IACH,gBAJW,SAAS,SACT,cAAc,UACd,MAAM,QAQhB;IAED;;;;OAIG;IACH,kBAJW,SAAS,SACT,cAAc,UACd,MAAM,QAUhB;IAED,4CAEC;;CAuGJ;qCAzPY,OAAO,kCAAkC,EAAE,sBAAsB;uBANvD,kBAAkB;0BADf,+BAA+B;+BAE1B,+BAA+B;4CAHlB,iDAAiD"}

package/src/engine/graphics3/AnimationSystem.js

@@ -6,6 +6,10 @@ import { AnimationClips } from "./animation/AnimationClips.js";
 import { AnimationClipsSink } from "./animation/AnimationClipsSink.js";
 import { ClipListPlayer } from "./animation/ClipListPlayer.js";
 
+/**
+ * @typedef {import("../ecs/EntityComponentDataset.js").EntityComponentDataset} EntityComponentDataset
+ */
+
 /**
  * @type {ClipPlayback[]}
  */
@@ -147,20 +151,40 @@ export class AnimationSystem extends System {
         this.#entries.delete(entity);
     }
 
-    async startup(entityManager) {
-        this.#sink.startup(entityManager.dataset);
+    async shutdown(entityManager) {
+        this.#detach();
     }
 
-    async shutdown(entityManager) {
+    /**
+     * @param {EntityComponentDataset} dataset
+     */
+    handleDatasetAttached(dataset) {
+        this.#detach();
+
+        this.#sink.attach_dataset(dataset);
+    }
+
+    /**
+     * @param {EntityComponentDataset} dataset
+     */
+    handleDatasetDetached(dataset) {
+        this.#detach();
+    }
+
+    /**
+     * Let go of the dataset: every entity's clips, the sink's chains, and the scene's name for it.
+     */
+    #detach() {
+        // the manager unlinks every entity before it detaches; anything left goes the same way
         for (const entry of this.#entries.values()) {
             if (entry.bound) {
-                this.#sink.unbind_on_shutdown(entry.clips);
+                this.#sink.unbind_on_detach(entry.clips);
             }
         }
 
         this.#entries.clear();
 
-        this.#sink.shutdown();
+        this.#sink.detach_dataset();
     }
 
     /**
@@ -206,6 +230,11 @@ export class AnimationSystem extends System {
      * @param {number} time_delta_seconds
      */
     update(time_delta_seconds) {
+        if (!this.#sink.attached) {
+            // nothing to play
+            return;
+        }
+
         const ecd = this.entityManager.dataset;
         const context = this.#sink.begin_update();
 

package/src/engine/graphics3/FoliageWindSystem.d.ts

@@ -1,4 +1,5 @@
 /**
+ * @typedef {import("../ecs/EntityComponentDataset.js").EntityComponentDataset} EntityComponentDataset
  * @typedef {import("../../shade/ShadeGraphicsEngine.js").ShadeGraphicsEngine} ShadeGraphicsEngine
  * @typedef {import("../../shade/PublicScene.js").PublicScene} PublicScene
  * @typedef {import("../../shade/renderer/scene/GPUSceneContext.js").GPUSceneContext} GPUSceneContext
@@ -33,7 +34,6 @@ export class FoliageWindSystem extends System<any> {
      */
     constructor(graphics: any, scene: any);
     dependencies: (typeof Transform64 | typeof FoliageWindRigs)[];
-    startup(entityManager: any): Promise<void>;
     shutdown(): Promise<void>;
     /**
      * @param {FoliageWindRigs} component
@@ -50,6 +50,7 @@ export class FoliageWindSystem extends System<any> {
     update(): void;
     #private;
 }
+export type EntityComponentDataset = import("../ecs/EntityComponentDataset.js").EntityComponentDataset;
 export type ShadeGraphicsEngine = any;
 export type PublicScene = any;
 export type GPUSceneContext = import("../../shade/renderer/scene/GPUSceneContext.js").GPUSceneContext;

package/src/engine/graphics3/FoliageWindSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FoliageWindSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/FoliageWindSystem.js"],"names":[],"mappings":"AAMA;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;;;;;;;;;;;GAaG;AACH;IA0BI;;;OAGG;IACH,uCAUC;IADG,8DAAkD;IAGtD,2CAYC;IAED,0BAUC;IAED;;;;OAIG;IACH,gBAJW,eAAe,cACf,WAAW,UACX,MAAM,QAkChB;IAED;;;;OAIG;IACH,mBAJW,eAAe,cACf,WAAW,UACX,MAAM,QA0BhB;IAED,eAoCC;;CA8CJ;;;8BAvPY,OAAO,+CAA+C,EAAE,eAAe;6BACvE,OAAO,0DAA0D,EAAE,cAAc;;eAKhF,eAAe;UACf,cAAc,EAAE;aAChB,eAAe,GAAC,IAAI;aACpB,UAAU,GAAC,IAAI;oBACf,MAAM;;uBAlBG,kBAAkB;4BACb,iCAAiC;gCAC7B,gCAAgC"}
+{"version":3,"file":"FoliageWindSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/FoliageWindSystem.js"],"names":[],"mappings":"AAMA;;;;;;GAMG;AAEH;;;;;;;GAOG;AAEH;;;;;;;;;;;;;GAaG;AACH;IAoCI;;;OAGG;IACH,uCAUC;IADG,8DAAkD;IAGtD,0BAEC;IAuDD;;;;OAIG;IACH,gBAJW,eAAe,cACf,WAAW,UACX,MAAM,QAkChB;IAED;;;;OAIG;IACH,mBAJW,eAAe,cACf,WAAW,UACX,MAAM,QA0BhB;IAED,eAyCC;;CA8CJ;qCAxSY,OAAO,kCAAkC,EAAE,sBAAsB;;;8BAGjE,OAAO,+CAA+C,EAAE,eAAe;6BACvE,OAAO,0DAA0D,EAAE,cAAc;;eAKhF,eAAe;UACf,cAAc,EAAE;aAChB,eAAe,GAAC,IAAI;aACpB,UAAU,GAAC,IAAI;oBACf,MAAM;;uBAnBG,kBAAkB;4BACb,iCAAiC;gCAC7B,gCAAgC"}

package/src/engine/graphics3/FoliageWindSystem.js

@@ -5,6 +5,7 @@ import { FoliageWindRigs } from "./animation/FoliageWindRigs.js";
 import { RowChains } from "./RowChains.js";
 
 /**
+ * @typedef {import("../ecs/EntityComponentDataset.js").EntityComponentDataset} EntityComponentDataset
  * @typedef {import("../../shade/ShadeGraphicsEngine.js").ShadeGraphicsEngine} ShadeGraphicsEngine
  * @typedef {import("../../shade/PublicScene.js").PublicScene} PublicScene
  * @typedef {import("../../shade/renderer/scene/GPUSceneContext.js").GPUSceneContext} GPUSceneContext
@@ -46,6 +47,16 @@ export class FoliageWindSystem extends System {
     #scene;
 
     /**
+     * The dataset whose rigs are registered, from {@link handleDatasetAttached} to
+     * {@link handleDatasetDetached}. Null while none is attached.
+     *
+     * @type {EntityComponentDataset|null}
+     */
+    #dataset = null;
+
+    /**
+     * Null while no dataset is attached.
+     *
      * @type {RowChains|null}
      */
     #chains = null;
@@ -76,8 +87,16 @@ export class FoliageWindSystem extends System {
         this.dependencies = [FoliageWindRigs, Transform64];
     }
 
-    async startup(entityManager) {
-        const dataset = entityManager.dataset;
+    async shutdown() {
+        this.#detach();
+    }
+
+    /**
+     * @param {EntityComponentDataset} dataset
+     */
+    handleDatasetAttached(dataset) {
+        this.#detach();
+
         const scene = this.#scene;
 
         assert.ok(
@@ -87,10 +106,27 @@ export class FoliageWindSystem extends System {
 
         scene.dataset = dataset;
 
+        this.#dataset = dataset;
         this.#chains = new RowChains(dataset);
     }
 
-    async shutdown() {
+    /**
+     * @param {EntityComponentDataset} dataset
+     */
+    handleDatasetDetached(dataset) {
+        this.#detach();
+    }
+
+    /**
+     * Let go of the dataset: every rig's registration, the chains, and the scene's name for it.
+     */
+    #detach() {
+        const dataset = this.#dataset;
+
+        if (dataset === null) {
+            return;
+        }
+
         for (const entry of this.#entries.values()) {
             this.#unregister(entry);
         }
@@ -100,6 +136,12 @@ export class FoliageWindSystem extends System {
         this.#chains.destroy();
         this.#chains = null;
         this.#context = null;
+
+        if (this.#scene.dataset === dataset) {
+            this.#scene.dataset = null;
+        }
+
+        this.#dataset = null;
     }
 
     /**
@@ -173,6 +215,11 @@ export class FoliageWindSystem extends System {
     }
 
     update() {
+        if (this.#dataset === null) {
+            // nothing to register
+            return;
+        }
+
         const context = this.#graphics.scene_context(this.#scene);
 
         if (context !== this.#context) {

package/src/engine/graphics3/GPUFluidSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GPUFluidSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/GPUFluidSystem.js"],"names":[],"mappings":"AAyCA;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,wCAFU,MAAM,CAE2B;AAmG3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkGG;AACH;IAEI;;;;;OAKG;IACH,iCAFW,OAAO,gDAAgD,EAAE,eAAe,QAMlF;IAyID;;;OAGG;IACH,sBAHW,OAAO,qBAAqB,EAAE,cAAc,SAC5C,OAAO,qCAAqC,EAAE,KAAK,EAU7D;IAnJD,gEAAgD;IAEhD,oOAME;IA6IF;;OAEG;IACH,iEAEC;IAED;;;;;OAKG;IACH,qBAEC;IAED;;;;;OAKG;IACH,kCAEC;IAED;;;;;OAKG;IACH,+BAEC;IAED;;;;;OAKG;IACH,iCAEC;IAED;;;;;;OAMG;IACH,eAFW,YAAY,GAAC,YAAY,GAAC,MAAM,EAAE,QAQ5C;IAED;;;;;;;;;;OAUG;IACH,yBAEC;IAED;;;;;OAKG;IACH,+BAEC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,eAbW,MAAM,SACN,MAAM,SACN,MAAM,SACN,MAAM,SACN,MAAM,SACN,MAAM,WACN,MAAM,WACN,MAAM,WACN,MAAM,UACN,YAAY,iBACZ,MAAM,GACJ,MAAM,CA+ClB;IAmMD,2CAoBC;IAED,4CAaC;IA6CD;;;;OAIG;IACH,gBAJW,iBAAiB,aACjB,WAAW,UACX,MAAM,QAOhB;IAED;;;;OAIG;IACH,kBAJW,iBAAiB,aACjB,WAAW,UACX,MAAM,QAiBhB;IAqiBD;;;;;OAKG;IACH,eAFW,YAAY,QAetB;IAkKL;;;;;;;OAOG;IACH,2BAFU,OAAO,CAEwB;;CAVxC;AAYD;;;GAGG;AACH;IAII;;OAEG;IACH,oBAFW,cAAc,EAMxB;IADG,uBAAoB;CAkB3B;8BAxkDY,OAAO,+CAA+C,EAAE,eAAe;2BACvE,OAAO,gDAAgD,EAAE,YAAY;oCACrE,OAAO,oDAAoD,EAAE,qBAAqB;kCAClF,OAAO,kEAAkE,EAAE,mBAAmB;kCAC9F,OAAO,2DAA2D,EAAE,mBAAmB;8BACvF,OAAO,6CAA6C,EAAE,eAAe;uBAjC3D,kBAAkB;4BACb,iCAAiC;kCAWtD,2CAA2C;wCARV,iDAAiD;4CAf7C,iDAAiD;8BAiB/D,uCAAuC;yBAJ5C,4BAA4B;0BAC3B,6BAA6B;qCARlB,oDAAoD;gCADzD,uDAAuD;gCAE5B,qDAAqD;gCAJhF,mDAAmD"}
+{"version":3,"file":"GPUFluidSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/GPUFluidSystem.js"],"names":[],"mappings":"AAyCA;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,wCAFU,MAAM,CAE2B;AAmG3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkGG;AACH;IAEI;;;;;OAKG;IACH,iCAFW,OAAO,gDAAgD,EAAE,eAAe,QAMlF;IAyID;;;OAGG;IACH,sBAHW,OAAO,qBAAqB,EAAE,cAAc,SAC5C,OAAO,qCAAqC,EAAE,KAAK,EAU7D;IAnJD,gEAAgD;IAEhD,oOAME;IA6IF;;OAEG;IACH,iEAEC;IAED;;;;;OAKG;IACH,qBAEC;IAED;;;;;OAKG;IACH,kCAEC;IAED;;;;;OAKG;IACH,+BAEC;IAED;;;;;OAKG;IACH,iCAEC;IAED;;;;;;OAMG;IACH,eAFW,YAAY,GAAC,YAAY,GAAC,MAAM,EAAE,QAQ5C;IAED;;;;;;;;;;OAUG;IACH,yBAEC;IAED;;;;;OAKG;IACH,+BAEC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,eAbW,MAAM,SACN,MAAM,SACN,MAAM,SACN,MAAM,SACN,MAAM,SACN,MAAM,WACN,MAAM,WACN,MAAM,WACN,MAAM,UACN,YAAY,iBACZ,MAAM,GACJ,MAAM,CA+ClB;IAmMD,2CAOC;IAED,4CAaC;IA4DD;;;;OAIG;IACH,gBAJW,iBAAiB,aACjB,WAAW,UACX,MAAM,QAOhB;IAED;;;;OAIG;IACH,kBAJW,iBAAiB,aACjB,WAAW,UACX,MAAM,QAiBhB;IAqiBD;;;;;OAKG;IACH,eAFW,YAAY,QAetB;IAkKL;;;;;;;OAOG;IACH,2BAFU,OAAO,CAEwB;;CAVxC;AAYD;;;GAGG;AACH;IAII;;OAEG;IACH,oBAFW,cAAc,EAMxB;IADG,uBAAoB;CAkB3B;8BA1kDY,OAAO,+CAA+C,EAAE,eAAe;2BACvE,OAAO,gDAAgD,EAAE,YAAY;oCACrE,OAAO,oDAAoD,EAAE,qBAAqB;kCAClF,OAAO,kEAAkE,EAAE,mBAAmB;kCAC9F,OAAO,2DAA2D,EAAE,mBAAmB;8BACvF,OAAO,6CAA6C,EAAE,eAAe;uBAjC3D,kBAAkB;4BACb,iCAAiC;kCAWtD,2CAA2C;wCARV,iDAAiD;4CAf7C,iDAAiD;8BAiB/D,uCAAuC;yBAJ5C,4BAA4B;0BAC3B,6BAA6B;qCARlB,oDAAoD;gCADzD,uDAAuD;gCAE5B,qDAAqD;gCAJhF,mDAAmD"}

package/src/engine/graphics3/GPUFluidSystem.js

@@ -767,19 +767,6 @@ export class GPUFluidSystem extends System {
     async startup(entityManager) {
         this.entityManager = entityManager;
 
-        const dataset = entityManager.dataset;
-        const scene = this.#scene;
-
-        assert.ok(
-            scene.dataset === null || scene.dataset === undefined || dataset === null || scene.dataset === dataset,
-            'the scene is bound to another dataset'
-        );
-
-        if (dataset !== null) {
-            // the scene's rows are this dataset's entities; the first system to place one says so
-            scene.dataset = dataset;
-        }
-
         this.#effectors_system = entityManager.getSystem(FluidEffectorsSystem);
 
         this.#extension = new GPUFluidExtension(this);
@@ -807,6 +794,16 @@ export class GPUFluidSystem extends System {
     handleDatasetAttached(dataset) {
         this.#detach();
 
+        // the scene's rows are this dataset's entities; the first system to place one says so
+        const scene = this.#scene;
+
+        assert.ok(
+            scene.dataset === null || scene.dataset === undefined || scene.dataset === dataset,
+            'the scene is bound to another dataset'
+        );
+
+        scene.dataset = dataset;
+
         this.#dataset = dataset;
         this.#transform_index = dataset.computeComponentTypeIndex(Transform64);
         this.#chains = new RowChains(dataset);
@@ -823,7 +820,8 @@ export class GPUFluidSystem extends System {
     }
 
     /**
-     * Stop watching the dataset: every entry let go, the device state and the chains with them.
+     * Stop watching the dataset: every entry let go, the device state and the chains with them, and
+     * the scene's name for it.
      */
     #detach() {
         const dataset = this.#dataset;
@@ -840,6 +838,10 @@ export class GPUFluidSystem extends System {
         this.#chains.destroy();
         this.#chains = null;
 
+        if (this.#scene.dataset === dataset) {
+            this.#scene.dataset = null;
+        }
+
         this.#dataset = null;
         this.#transform_index = -1;
     }

package/src/engine/graphics3/GPUParticleEmitterSystem.d.ts

@@ -175,8 +175,8 @@ export class GPUParticleEmitterSystem extends System<any> {
      *
      * Refused with a warning when the entity has no Transform64 or the field is declared at another
      * width than the channel writes; a refused binding is not retried until the request changes.
-     * The binding holds until {@link unbind_global_field}, the entity's removal, or
-     * {@link shutdown}. It is runtime state and is not saved.
+     * The binding holds until {@link unbind_global_field}, the entity's removal, the detach of the
+     * dataset it is an entity of, or {@link shutdown}. It is runtime state and is not saved.
      *
      * @param {string} name
      * @param {number} entity an entity with a Transform64

package/src/engine/graphics3/GPUParticleEmitterSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GPUParticleEmitterSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/GPUParticleEmitterSystem.js"],"names":[],"mappings":"AAqpCA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,+CAJW,eAAe,UACf,cAAc,GACZ,OAAO,CAyGnB;AAtvCD;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH;IAgFI;;;;;OAKG;IACH,sBALW,OAAO,qBAAqB,EAAE,cAAc,SAC5C,OAAO,qCAAqC,EAAE,KAAK,gEAoB7D;IArGD,6DAA6C;IAE7C;;;OAGG;IACH,OAFU,WAAW,CAEmC;IAiGxD;;;;;;OAMG;IACH,iEAEC;IAED;;;;;OAKG;IACH,kCAEC;IAED;;;;;;;;;;OAUG;IACH,mBAJW,MAAM,GACJ,eAAe,GAAC,IAAI,CAWhC;IAED;;;;;;;;;;;OAWG;IACH,cAHW,MAAM,SACN,MAAM,QA4BhB;IAED;;;;;;;;;;;;OAYG;IACH,uBAHW,MAAM,UACN,UAAU,MAAM,CAAC,QA8B3B;IAED;;;;;;;;;;;;;OAaG;IACH,wBAJW,MAAM,UACN,MAAM,WACN,MAAM,QAOhB;IAED;;;;;OAKG;IACH,0BAFW,MAAM,QAIhB;IAyQD,+BAA+B;IAC/B,YADc,QAAQ,IAAI,CAAC,CA0C1B;IAED;;;;OAIG;IACH,aAJW,cAAc,aACd,WAAW,UACX,MAAM,QAuChB;IAED;;;;OAIG;IACH,eAJW,cAAc,aACd,WAAW,UACX,MAAM,QAIhB;IAED;;;;;;;OAOG;IACH,4BAHW,MAAM,GACJ,IAAI,CAgBhB;IAoCD;;;;;;;;;;;;OAYG;IACH,eAHW,OAAO,gDAAgD,EAAE,YAAY,GACnE,IAAI,CA4ChB;;CA0UJ;;YAnnCa,MAAM;;;;YACN,cAAc;;;;eACd,WAAW;;;;aACX,eAAe,GAAC,IAAI;;;;;aACpB,OAAO,+CAA+C,EAAE,eAAe,GAAC,IAAI;gCAGjE,IAAI;;;;SACf,MAAM,GAAC,IAAI;;;;aACX,OAAO,kDAAkD,EAAE,qBAAqB,GAAC,IAAI;;;;;;;WACrF,IAAI,MAAM,EAAE;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,WAAS,IAAI,CAAC;QAAC,MAAM,EAAE,OAAO,yDAAyD,EAAE,cAAc,GAAC,IAAI,CAAA;KAAC,CAAC;;;;qBAKvL,OAAO,uDAAuD,EAAE,eAAe,GAAC,IAAI;;gCA3ClE,2DAA2D;+BAU5D,6CAA6C;uBARrD,kBAAkB;4BAEb,iCAAiC;4BAQjC,0CAA0C"}
+{"version":3,"file":"GPUParticleEmitterSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/GPUParticleEmitterSystem.js"],"names":[],"mappings":"AAysCA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,+CAJW,eAAe,UACf,cAAc,GACZ,OAAO,CAyGnB;AA1yCD;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH;IAsFI;;;;;OAKG;IACH,sBALW,OAAO,qBAAqB,EAAE,cAAc,SAC5C,OAAO,qCAAqC,EAAE,KAAK,gEAoB7D;IA3GD,6DAA6C;IAE7C;;;OAGG;IACH,OAFU,WAAW,CAEmC;IAuGxD;;;;;;OAMG;IACH,iEAEC;IAED;;;;;OAKG;IACH,kCAEC;IAED;;;;;;;;;;OAUG;IACH,mBAJW,MAAM,GACJ,eAAe,GAAC,IAAI,CAWhC;IAED;;;;;;;;;;;OAWG;IACH,cAHW,MAAM,SACN,MAAM,QA4BhB;IAED;;;;;;;;;;;;OAYG;IACH,uBAHW,MAAM,UACN,UAAU,MAAM,CAAC,QA8B3B;IAED;;;;;;;;;;;;;OAaG;IACH,wBAJW,MAAM,UACN,MAAM,WACN,MAAM,QAOhB;IAED;;;;;OAKG;IACH,0BAFW,MAAM,QAIhB;IA8PD,+BAA+B;IAC/B,YADc,QAAQ,IAAI,CAAC,CAuB1B;IA0ED;;;;OAIG;IACH,aAJW,cAAc,aACd,WAAW,UACX,MAAM,QAuChB;IAED;;;;OAIG;IACH,eAJW,cAAc,aACd,WAAW,UACX,MAAM,QAIhB;IAED;;;;;;;OAOG;IACH,4BAHW,MAAM,GACJ,IAAI,CAgBhB;IAoCD;;;;;;;;;;;;OAYG;IACH,eAHW,OAAO,gDAAgD,EAAE,YAAY,GACnE,IAAI,CAgDhB;;CA0UJ;;YAvqCa,MAAM;;;;YACN,cAAc;;;;eACd,WAAW;;;;aACX,eAAe,GAAC,IAAI;;;;;aACpB,OAAO,+CAA+C,EAAE,eAAe,GAAC,IAAI;gCAGjE,IAAI;;;;SACf,MAAM,GAAC,IAAI;;;;aACX,OAAO,kDAAkD,EAAE,qBAAqB,GAAC,IAAI;;;;;;;WACrF,IAAI,MAAM,EAAE;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,WAAS,IAAI,CAAC;QAAC,MAAM,EAAE,OAAO,yDAAyD,EAAE,cAAc,GAAC,IAAI,CAAA;KAAC,CAAC;;;;qBAKvL,OAAO,uDAAuD,EAAE,eAAe,GAAC,IAAI;;gCA3ClE,2DAA2D;+BAU5D,6CAA6C;uBARrD,kBAAkB;4BAEb,iCAAiC;4BAQjC,0CAA0C"}

package/src/engine/graphics3/GPUParticleEmitterSystem.js

@@ -121,6 +121,12 @@ export class GPUParticleEmitterSystem extends System {
     #scene;
     /** @type {import("../asset/AssetManager.js").AssetManager} */
     #assets;
+    /**
+     * The dataset whose emitters and bound entities these are, from {@link handleDatasetAttached} to
+     * {@link handleDatasetDetached}. Null while none is attached.
+     * @type {import("../ecs/EntityComponentDataset.js").EntityComponentDataset|null}
+     */
+    #dataset = null;
     /** @type {Map<number, ParticleEmitterEntry>} */
     #entries = new Map();
     /**
@@ -342,8 +348,8 @@ export class GPUParticleEmitterSystem extends System {
      *
      * Refused with a warning when the entity has no Transform64 or the field is declared at another
      * width than the channel writes; a refused binding is not retried until the request changes.
-     * The binding holds until {@link unbind_global_field}, the entity's removal, or
-     * {@link shutdown}. It is runtime state and is not saved.
+     * The binding holds until {@link unbind_global_field}, the entity's removal, the detach of the
+     * dataset it is an entity of, or {@link shutdown}. It is runtime state and is not saved.
      *
      * @param {string} name
      * @param {number} entity an entity with a Transform64
@@ -435,7 +441,7 @@ export class GPUParticleEmitterSystem extends System {
                         this.#let_go(scene_context, binding, false);
                     };
 
-                    this.entityManager.dataset.addEntityEventListener(entity, EventType.EntityRemoved, binding.on_removed);
+                    this.#dataset.addEntityEventListener(entity, EventType.EntityRemoved, binding.on_removed);
                 }
 
                 bound.set(field, binding);
@@ -486,7 +492,7 @@ export class GPUParticleEmitterSystem extends System {
                         this.#let_go(scene_context, binding, false);
                     };
 
-                    this.entityManager.dataset.addEntityEventListener(entity, EventType.EntityRemoved, binding.on_removed);
+                    this.#dataset.addEntityEventListener(entity, EventType.EntityRemoved, binding.on_removed);
                 }
 
                 global_bound.set(name, binding);
@@ -503,7 +509,7 @@ export class GPUParticleEmitterSystem extends System {
      * @returns {boolean} whether it is live; a refusal is reported with a warning
      */
     #hold(scene_context, binding, apply) {
-        const dataset = this.entityManager.dataset;
+        const dataset = this.#dataset;
         const entity = binding.entity;
 
         if (!dataset.entityExists(entity) || dataset.getComponent(entity, Transform64) === undefined) {
@@ -540,7 +546,7 @@ export class GPUParticleEmitterSystem extends System {
         }
 
         if (unlisten && binding.on_removed !== null) {
-            this.entityManager.dataset.removeEntityEventListener(binding.entity, EventType.EntityRemoved, binding.on_removed);
+            this.#dataset.removeEntityEventListener(binding.entity, EventType.EntityRemoved, binding.on_removed);
         }
 
         scene_context.rows.release(binding.entity);
@@ -558,7 +564,7 @@ export class GPUParticleEmitterSystem extends System {
     #forget_bindings(entry) {
         for (const binding of entry.bound.values()) {
             if (binding.live && binding.on_removed !== null) {
-                this.entityManager.dataset.removeEntityEventListener(binding.entity, EventType.EntityRemoved, binding.on_removed);
+                this.#dataset.removeEntityEventListener(binding.entity, EventType.EntityRemoved, binding.on_removed);
             }
         }
 
@@ -572,7 +578,7 @@ export class GPUParticleEmitterSystem extends System {
     #forget_global_bindings() {
         for (const binding of this.#global_bound.values()) {
             if (binding.live && binding.on_removed !== null) {
-                this.entityManager.dataset.removeEntityEventListener(binding.entity, EventType.EntityRemoved, binding.on_removed);
+                this.#dataset.removeEntityEventListener(binding.entity, EventType.EntityRemoved, binding.on_removed);
             }
         }
 
@@ -609,17 +615,6 @@ export class GPUParticleEmitterSystem extends System {
     async startup(entityManager) {
         this.entityManager = entityManager;
 
-        // the scene's rows are this dataset's entities; the first system to place one says so
-        const dataset = entityManager.dataset;
-        const scene = this.#scene;
-
-        assert.ok(
-            scene.dataset === null || scene.dataset === undefined || scene.dataset === dataset,
-            'the scene is bound to another dataset'
-        );
-
-        scene.dataset = dataset;
-
         if (!this.#assets.hasLoaderForType(GameAssetType.Image)) {
             await this.#assets.registerLoader(GameAssetType.Image, new ImageRGBADataLoader());
         }
@@ -636,6 +631,63 @@ export class GPUParticleEmitterSystem extends System {
             this.#extension = null;
         }
 
+        this.#detach_dataset();
+
+        // and those asked for while no dataset was attached
+        this.#global_bindings.clear();
+
+        this.#detach();
+
+        this.#texture?.destroy();
+        this.#texture = null;
+        this.#view = null;
+        this.#device = null;
+        this.#uploaded_version = -1;
+        this.#bursts.length = 0;
+
+        this.#managed_atlas.reset();
+        this.#create_defaults();
+    }
+
+    /**
+     * @param {import("../ecs/EntityComponentDataset.js").EntityComponentDataset} dataset
+     */
+    handleDatasetAttached(dataset) {
+        this.#detach_dataset();
+
+        // the scene's rows are this dataset's entities; the first system to place one says so
+        const scene = this.#scene;
+
+        assert.ok(
+            scene.dataset === null || scene.dataset === undefined || scene.dataset === dataset,
+            'the scene is bound to another dataset'
+        );
+
+        scene.dataset = dataset;
+
+        this.#dataset = dataset;
+    }
+
+    /**
+     * @param {import("../ecs/EntityComponentDataset.js").EntityComponentDataset} dataset
+     */
+    handleDatasetDetached(dataset) {
+        this.#detach_dataset();
+    }
+
+    /**
+     * Let go of the dataset: every entity's emitter and row, the global fields' transform bindings
+     * and the requests for them, the bursts not yet drained — all of these name its entities, and
+     * the next dataset issues the same ids to others — and the scene's name for it.
+     */
+    #detach_dataset() {
+        const dataset = this.#dataset;
+
+        if (dataset === null) {
+            return;
+        }
+
+        // the manager unlinks every entity before it detaches; anything left goes the same way
         for (const entity of Array.from(this.#entries.keys())) {
             this.#drop(entity);
         }
@@ -660,17 +712,13 @@ export class GPUParticleEmitterSystem extends System {
         this.#global_bindings_context = null;
         this.#global_bindings.clear();
 
-        this.#detach();
-
-        this.#texture?.destroy();
-        this.#texture = null;
-        this.#view = null;
-        this.#device = null;
-        this.#uploaded_version = -1;
         this.#bursts.length = 0;
 
-        this.#managed_atlas.reset();
-        this.#create_defaults();
+        if (this.#scene.dataset === dataset) {
+            this.#scene.dataset = null;
+        }
+
+        this.#dataset = null;
     }
 
     /**
@@ -704,7 +752,7 @@ export class GPUParticleEmitterSystem extends System {
         */
         entry.on_transform_changed = () => this.#place(entry);
 
-        this.entityManager.dataset.addEntityEventListener(
+        this.#dataset.addEntityEventListener(
             entity, TRANSFORM64_EVENT_CHANGE, entry.on_transform_changed
         );
 
@@ -830,7 +878,11 @@ export class GPUParticleEmitterSystem extends System {
         }
 
         this.#register(particles, frame.view.scene);
-        this.#bind(particles, frame.view.scene);
+
+        if (this.#dataset !== null) {
+            // a transform binding names an entity of the attached dataset
+            this.#bind(particles, frame.view.scene);
+        }
 
         this.#upload(renderer.graphics);
 
@@ -993,7 +1045,7 @@ export class GPUParticleEmitterSystem extends System {
              does for a primitive. Nothing draws differently for it: what it buys is that a walk over
              the registry is readable in a debugger.
             */
-            const name = this.entityManager.dataset.getComponent(entry.entity, Name);
+            const name = this.#dataset.getComponent(entry.entity, Name);
 
             emitter.name = name === undefined || name === null
                 ? `particles/entity ${entry.entity}`
@@ -1076,7 +1128,7 @@ export class GPUParticleEmitterSystem extends System {
         }
 
         if (entry.on_transform_changed !== null) {
-            this.entityManager.dataset.removeEntityEventListener(
+            this.#dataset.removeEntityEventListener(
                 entity, TRANSFORM64_EVENT_CHANGE, entry.on_transform_changed
             );
 

package/src/engine/graphics3/LightSystem.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @typedef {import("../ecs/EntityComponentDataset.js").EntityComponentDataset} EntityComponentDataset
+ */
 /**
  * Mirrors light entities into Shade's scene.
  *
@@ -36,6 +39,7 @@ export class LightSystem extends System<any> {
     unlink(component: Light, transform: Transform64, entity: number): void;
     #private;
 }
+export type EntityComponentDataset = import("../ecs/EntityComponentDataset.js").EntityComponentDataset;
 import { System } from "../ecs/System.js";
 import { Transform64 } from "../ecs/transform/Transform64.js";
 import { Light } from "../graphics/ecs/light/Light.js";

package/src/engine/graphics3/LightSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LightSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/LightSystem.js"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;;GAcG;AACH;IAgBI;;;OAGG;IACH,oDAUC;IADG,oDAAwC;IAG5C,2CAeC;IAED,4CAIC;IAED;;;;OAIG;IACH,gBAJW,KAAK,aACL,WAAW,UACX,MAAM,QAwEhB;IAED;;;;OAIG;IACH,kBAJW,KAAK,aACL,WAAW,UACX,MAAM,QAIhB;;CA4BJ;uBA5LsB,kBAAkB;4BACb,iCAAiC;sBACvC,gCAAgC"}
+{"version":3,"file":"LightSystem.d.ts","sourceRoot":"","sources":["../../../../src/engine/graphics3/LightSystem.js"],"names":[],"mappings":"AAWA;;GAEG;AAEH;;;;;;;;;;;;;;GAcG;AACH;IAgBI;;;OAGG;IACH,oDAUC;IADG,oDAAwC;IAG5C,2CAIC;IAED,4CAIC;IA0BD;;;;OAIG;IACH,gBAJW,KAAK,aACL,WAAW,UACX,MAAM,QAwEhB;IAED;;;;OAIG;IACH,kBAJW,KAAK,aACL,WAAW,UACX,MAAM,QAIhB;;CA4BJ;qCAtMY,OAAO,kCAAkC,EAAE,sBAAsB;uBAPvD,kBAAkB;4BACb,iCAAiC;sBACvC,gCAAgC"}