@woosh/meep-engine 3.23.0 → 3.24.0

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

@@ -11,6 +11,7 @@ import { ssr_resolve_shader_LPV } from "../../renderer/postprocess/ssr/resolve/s
 import { ssr_reproject_shader } from "../../renderer/postprocess/ssr/ssr_reproject_shader.js";
 import { ssr_spatial_denoise_shader, ssr_spatial_denoise_metadata_shader } from "../../renderer/postprocess/ssr/ssr_spatial_denoise_shader.js";
 import { create_scene } from "./scene.js";
+import { move_primitive } from "../../renderer/scene/rows/place_primitive.js";
 
 const element = id => document.getElementById(id);
 const hints = {
@@ -47,7 +48,8 @@ async function start() {
     renderer.exposure_compensation = 1;
     renderer.internal_resolution_scale = 1;
     report("Building procedural scene…");
-    const world = await create_scene();
+    const world = await create_scene(renderer);
+    const scene_context = renderer.scenes.obtain(world.scene);
     const camera = new PerspectiveCamera();
     camera.near = 0.1;
     camera.far = 80;
@@ -76,17 +78,17 @@ async function start() {
         else { pose([offset, 3.4, 8], [0, 0.3, -1.5]); }
         const moving = world.targets[2];
         const x = moving.position[0] + (experiment === 'object' ? 1.3 * t : 0);
-        moving.mesh.transform_local.setTranslation(x, moving.position[1], moving.position[2]);
-        moving.mesh.updateMatrices();
-        world.occluder.transform_local.setTranslation(experiment === 'occluder' ? 3 * t : 20, 1, 1);
-        world.occluder.updateMatrices();
+        moving.transform.setTranslation(x, moving.position[1], moving.position[2]);
+        move_primitive(scene_context, moving.entity, moving.transform);
+        world.occluder.transform.setTranslation(experiment === 'occluder' ? 3 * t : 20, 1, 1);
+        move_primitive(scene_context, world.occluder.entity, world.occluder.transform);
     }
     function reset_anchors() {
         const c = camera.transform.translation;
         // Independent oracle: mirror physical centres across y=0, then intersect C->V
         // with the plane once. These anchors stay on the floor as the camera moves.
-        anchors = world.targets.map(({ mesh }) => {
-            const p = mesh.transform_local.translation;
+        anchors = world.targets.map(({ transform }) => {
+            const p = transform.translation;
             const v = [p[0], -p[1], p[2]];
             const t = -c[1] / (v[1] - c[1]);
             return [c[0] + (v[0] - c[0]) * t, 0, c[2] + (v[2] - c[2]) * t];
@@ -133,8 +135,8 @@ async function start() {
             ctx.beginPath(); ctx.moveTo(x-8,y); ctx.lineTo(x+8,y); ctx.moveTo(x,y-8); ctx.lineTo(x,y+8); ctx.stroke();
             if (label) { ctx.font = '12px system-ui'; ctx.fillText(label,x+11,y-5); }
         };
-        world.targets.forEach(({mesh,color,label},i) => {
-            const p = mesh.transform_local.translation;
+        world.targets.forEach(({transform,color,label},i) => {
+            const p = transform.translation;
             cross([p[0],-p[1],p[2]],false,color,label);
             cross(anchors[i],true,'#c2ccd9','');
         });

package/src/shade/playground/ssr_reprojection/scene.d.ts

@@ -1,18 +1,29 @@
+/**
+ * @typedef {import("../../renderer/Renderer.js").Renderer} Renderer
+ */
 /** Small, entirely procedural scene. The top of the mirror is exactly y=0. */
-export function create_scene(): Promise<{
+/**
+ * @param {Renderer} renderer whose scene context the primitives take rows on
+ */
+export function create_scene(renderer: Renderer): Promise<{
     scene: Scene;
     mirror_material: StandardShadeMaterial;
     targets: {
-        mesh: Mesh;
+        entity: number;
+        transform: Transform64;
         label: string;
         position: number[];
         size: number[];
         color: string;
         rgb: number[];
     }[];
-    occluder: Mesh;
+    occluder: {
+        entity: number;
+        transform: Transform64;
+    };
 }>;
+export type Renderer = import("../../renderer/Renderer.js").Renderer;
 import { Scene } from "../../renderer/scene/Scene.js";
 import { StandardShadeMaterial } from "../../renderer/material/StandardShadeMaterial.js";
-import { Mesh } from "../../renderer/scene/Mesh.js";
+import { Transform64 } from "../../../engine/ecs/transform/Transform64.js";
 //# sourceMappingURL=scene.d.ts.map

package/src/shade/playground/ssr_reprojection/scene.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scene.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/ssr_reprojection/scene.js"],"names":[],"mappings":"AAUA,8EAA8E;AAC9E;;;;;;;;;;;;GAuCC;sBA3CqB,+BAA+B;sCAHf,kDAAkD;qBAEnE,8BAA8B"}
+{"version":3,"file":"scene.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/ssr_reprojection/scene.js"],"names":[],"mappings":"AAaA;;GAEG;AAEH,8EAA8E;AAC9E;;GAEG;AACH,uCAFW,QAAQ;;;;gBAuBO,MAAM;mBAAa,WAAW;;;;;;;;gBAA9B,MAAM;mBAAa,WAAW;;GA6BvD;uBAzDY,OAAO,4BAA4B,EAAE,QAAQ;sBAJpC,+BAA+B;sCANf,kDAAkD;4BAI5D,8CAA8C"}

package/src/shade/playground/ssr_reprojection/scene.js

@@ -4,14 +4,30 @@ import { BoxGeometry } from "../../renderer/geometry/BoxGeometry.js";
 import { MeshoptClusterizer } from "../../renderer/geometry/meshlet/build/meshoptimizer/meshopt_clusterizer.js";
 import { StandardShadeMaterial } from "../../renderer/material/StandardShadeMaterial.js";
 import { make_sunlight } from "../../renderer/light/make_sunlight.js";
-import { Mesh } from "../../renderer/scene/Mesh.js";
+import { place_light } from "../../renderer/light/place_light.js";
+import { EntityComponentDataset } from "../../../engine/ecs/EntityComponentDataset.js";
+import { Transform64 } from "../../../engine/ecs/transform/Transform64.js";
+import { place_primitive } from "../../renderer/scene/rows/place_primitive.js";
 import { Scene } from "../../renderer/scene/Scene.js";
 import { make_flat_environment } from "../skinned_blas_refit/flat_environment.js";
 
+/**
+ * @typedef {import("../../renderer/Renderer.js").Renderer} Renderer
+ */
+
 /** Small, entirely procedural scene. The top of the mirror is exactly y=0. */
-export async function create_scene() {
+/**
+ * @param {Renderer} renderer whose scene context the primitives take rows on
+ */
+export async function create_scene(renderer) {
     await MeshoptClusterizer.ready;
+
     const scene = new Scene();
+
+    // the sun and every box stand at entities, so the scene names a dataset for them
+    scene.dataset = new EntityComponentDataset();
+
+    const scene_context = renderer.scenes.obtain(scene);
     const cube = new BoxGeometry();
     const material = (rgb, roughness = 0.65, metallic = 0, glow = 0) => {
         const result = new StandardShadeMaterial();
@@ -21,14 +37,19 @@ export async function create_scene() {
         result.metallic_factor = metallic;
         return result;
     };
+        /**
+     * A box at a row. The transform is the page's to move, through `move_primitive`.
+     *
+     * @returns {{entity: number, transform: Transform64}}
+     */
     const box = (name, position, scale, mat) => {
-        const mesh = Mesh.from(cube, mat);
-        mesh.name = name;
-        mesh.transform_local.setTranslation(...position);
-        mesh.transform_local.setScale(...scale);
-        mesh.updateMatrices();
-        scene.add(mesh);
-        return mesh;
+        const transform = new Transform64();
+
+        transform.setTranslation(...position);
+        transform.setScale(...scale);
+        transform.updateMatrix();
+
+        return { entity: place_primitive(scene_context, cube, mat, transform, { name }), transform };
     };
     const mirror_material = material([0.85, 0.88, 0.92], 0.03, 1);
     box('Planar mirror', [0, -0.1, -1], [14, 0.2, 13], mirror_material);
@@ -42,10 +63,10 @@ export async function create_scene() {
         { label: 'A', position: [-2.4, 1.3, -1.8], size: [0.85, 2.1, 0.8], color: '#ff966b', rgb: [1, 0.23, 0.08] },
         { label: 'B', position: [0, 1.7, -3.4], size: [0.9, 2.7, 0.8], color: '#82cfff', rgb: [0.08, 0.5, 1] },
         { label: 'C', position: [2.3, 1.1, -0.8], size: [0.85, 1.7, 0.8], color: '#e9a4ff', rgb: [0.75, 0.1, 1] },
-    ].map(spec => ({ ...spec, mesh: box(spec.label, spec.position, spec.size, material(spec.rgb, 0.5, 0, 0.35)) }));
+    ].map(spec => ({ ...spec, ...box(spec.label, spec.position, spec.size, material(spec.rgb, 0.5, 0, 0.35)) }));
     // Keep its resource identity stable while moving it into/out of the view.
     const occluder = box('Moving occluder', [20, 1, 1], [0.7, 2, 0.35], material([0.04, 0.05, 0.06]));
     scene.lights.environment = make_flat_environment([0.045, 0.055, 0.075]);
-    scene.lights.add(make_sunlight({ intensity: 1.5, direction: new Vector3(-0.4, -1, -0.3), temperature: 6500 }));
+    place_light(scene, make_sunlight({ intensity: 1.5, direction: new Vector3(-0.4, -1, -0.3), temperature: 6500 }));
     return { scene, mirror_material, targets, occluder };
 }

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

@@ -45,7 +45,7 @@ async function start() {
     renderer.internal_resolution_scale = 1;
     renderer.ssr.spatial_denoising_enabled = element('spatial').value === 'on';
     renderer.ssr.reprojection_mode = element('temporal').value === 'off' ? 2 : 0;
-    const world = await create_scene();
+    const world = await create_scene(renderer);
     const camera = new PerspectiveCamera();
     camera.near = 0.1; camera.far = 50; camera.fov = 50 * Math.PI / 180;
     camera.aspect = canvas.width / canvas.height;

package/src/shade/playground/ssr_variance/scene.d.ts

@@ -1,11 +1,17 @@
+/**
+ * @typedef {import("../../renderer/Renderer.js").Renderer} Renderer
+ */
 /** Two quads. The cross is a texture, with no extra geometry or surface-normal edges. */
-export function create_scene(): Promise<{
+/**
+ * @param {Renderer} renderer whose scene context the quads take rows on
+ */
+export function create_scene(renderer: Renderer): Promise<{
     scene: Scene;
-    ground: Mesh;
-    card: Mesh;
+    ground: number;
+    card: number;
     ground_material: StandardShadeMaterial;
 }>;
+export type Renderer = import("../../renderer/Renderer.js").Renderer;
 import { Scene } from "../../renderer/scene/Scene.js";
-import { Mesh } from "../../renderer/scene/Mesh.js";
 import { StandardShadeMaterial } from "../../renderer/material/StandardShadeMaterial.js";
 //# sourceMappingURL=scene.d.ts.map

package/src/shade/playground/ssr_variance/scene.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scene.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/ssr_variance/scene.js"],"names":[],"mappings":"AAeA,yFAAyF;AACzF;;;;;GA4CC;sBAnDqB,+BAA+B;qBADhC,8BAA8B;sCADb,kDAAkD"}
+{"version":3,"file":"scene.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/ssr_variance/scene.js"],"names":[],"mappings":"AAiBA;;GAEG;AAEH,yFAAyF;AACzF;;GAEG;AACH,uCAFW,QAAQ;;;;;GA6DlB;uBAlEY,OAAO,4BAA4B,EAAE,QAAQ;sBAPpC,+BAA+B;sCAJf,kDAAkD"}

package/src/shade/playground/ssr_variance/scene.js

@@ -6,34 +6,55 @@ import { make_plane_geometry } from "../../renderer/geometry/primitives/make_pla
 import { MeshletGeometry } from "../../renderer/geometry/MeshletGeometry.js";
 import { meshlet_geometry_build_from_geometry } from "../../renderer/geometry/meshlet_geometry_build_from_geometry.js";
 import { StandardShadeMaterial } from "../../renderer/material/StandardShadeMaterial.js";
-import { Mesh } from "../../renderer/scene/Mesh.js";
+import { Transform64 } from "../../../engine/ecs/transform/Transform64.js";
+import { EntityComponentDataset } from "../../../engine/ecs/EntityComponentDataset.js";
+import { place_primitive } from "../../renderer/scene/rows/place_primitive.js";
 import { Scene } from "../../renderer/scene/Scene.js";
 import { ColorSpace } from "../../renderer/texture/ColorSpace.js";
 import { ShadeTexture } from "../../renderer/texture/ShadeTexture.js";
 import { ShadeImage } from "../../renderer/texture/source/ShadeImage.js";
 import { make_flat_environment } from "../skinned_blas_refit/flat_environment.js";
 
+/**
+ * @typedef {import("../../renderer/Renderer.js").Renderer} Renderer
+ */
+
 /** Two quads. The cross is a texture, with no extra geometry or surface-normal edges. */
-export async function create_scene() {
+/**
+ * @param {Renderer} renderer whose scene context the quads take rows on
+ */
+export async function create_scene(renderer) {
     await MeshoptClusterizer.ready;
+
     const scene = new Scene();
-    const quad = (name, width, height, material) => {
+
+    // the quads stand at entities, so the scene names a dataset for them
+    scene.dataset = new EntityComponentDataset();
+
+    const scene_context = renderer.scenes.obtain(scene);
+
+    /**
+     * @returns {number} the quad's entity
+     */
+    const quad = (name, width, height, material, transform) => {
         const geometry = new MeshletGeometry();
+
         meshlet_geometry_build_from_geometry(make_plane_geometry(width, height), geometry);
-        const mesh = Mesh.from(geometry, material);
-        mesh.name = name;
-        scene.add(mesh);
-        return mesh;
+
+        return place_primitive(scene_context, geometry, material, transform, { name });
     };
     const ground_material = new StandardShadeMaterial();
     ground_material.diffuse_color.copy(new Color(0.85, 0.85, 0.85));
     ground_material.roughness_factor = 0.3;
     ground_material.metallic_factor = 1;
-    const ground = quad('Ground / roughness 0.30', 18, 18, ground_material);
-    const rotation = Quaternion.fromAxisAngle(Vector3.right, -Math.PI / 2);
-    ground.transform_local.setRotation(rotation.x, rotation.y, rotation.z, rotation.w);
-    ground.transform_local.setTranslation(0, 0, -2);
-    ground.updateMatrices();
+        const rotation = Quaternion.fromAxisAngle(Vector3.right, -Math.PI / 2);
+    const ground_transform = new Transform64();
+
+    ground_transform.setRotation(rotation.x, rotation.y, rotation.z, rotation.w);
+    ground_transform.setTranslation(0, 0, -2);
+    ground_transform.updateMatrix();
+
+    const ground = quad('Ground / roughness 0.30', 18, 18, ground_material, ground_transform);
 
     const canvas = document.createElement('canvas');
     canvas.width = canvas.height = 512;
@@ -53,9 +74,12 @@ export async function create_scene() {
     card_material.texture_emissive = pattern;
     card_material.emissive_factor.copy(new Color(1, 1, 1));
     card_material.roughness_factor = 1;
-    const card = quad('Pattern card', 3, 3, card_material);
-    card.transform_local.setTranslation(0, 2, -2);
-    card.updateMatrices();
+        const card_transform = new Transform64();
+
+    card_transform.setTranslation(0, 2, -2);
+    card_transform.updateMatrix();
+
+    const card = quad('Pattern card', 3, 3, card_material, card_transform);
     scene.lights.environment = make_flat_environment([0.025, 0.025, 0.025]);
     return { scene, ground, card, ground_material };
 }

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

@@ -32,6 +32,8 @@ import {
     vgeo_install_all_pages
 } from "../../renderer/geometry/virtual/format/read/tool/vgeo_install_all_pages.js";
 import { make_sunlight } from "../../renderer/light/make_sunlight.js";
+import { place_light } from "../../renderer/light/place_light.js";
+import { EntityComponentDataset } from "../../../engine/ecs/EntityComponentDataset.js";
 import { Renderer } from "../../renderer/Renderer.js";
 import { DynamicMesh } from "../../renderer/scene/DynamicMesh.js";
 import { DynamicMeshBatch } from "../../renderer/scene/DynamicMeshBatch.js";
@@ -435,6 +437,9 @@ class VGeoViewer {
         this.camera = new PerspectiveCamera();
         this.scene = new Scene();
 
+        // the sun stands at an entity, so the scene names a dataset for it
+        this.scene.dataset = new EntityComponentDataset();
+
         this.#dynamic.opaque = true;
     }
 
@@ -501,7 +506,7 @@ class VGeoViewer {
         this.renderer.feature_lpv_enabled = false;
         this.renderer.pixel_ratio = 1;
 
-        this.scene.lights.add(make_sunlight({ intensity: 3 }));
+        place_light(this.scene, make_sunlight({ intensity: 3 }));
 
         this.camera.near = 0.05;
         this.camera.far = 500;
@@ -716,7 +721,6 @@ class VGeoViewer {
         }
 
         this.#mesh = DynamicMesh.from(this.#cut_geometry.geometry);
-        this.#mesh.updateMatrices();
 
         this.#batch.add(this.#mesh);
 

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

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/volumetrics_froxel/main.js"],"names":[],"mappings":"AAmaA,uCAsfC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../src/shade/playground/volumetrics_froxel/main.js"],"names":[],"mappings":"AA2aA,uCA4fC"}