@pascal-app/viewer 1.0.6 → 1.0.7

package/dist/lib/hardware-geometry.js

@@ -0,0 +1,283 @@
+import { BoxGeometry, CapsuleGeometry, CatmullRomCurve3, CylinderGeometry, LatheGeometry, SphereGeometry, TubeGeometry, Vector2, Vector3, } from 'three';
+import { RoundedBoxGeometry } from 'three/addons/geometries/RoundedBoxGeometry.js';
+import { mergeGeometries } from 'three/addons/utils/BufferGeometryUtils.js';
+const cache = new Map();
+const mm = (value) => Math.round(value * 1000);
+function cached(name, dimensions, build) {
+    const sizes = dimensions.map(mm);
+    const key = `${name}:${sizes.join(':')}`;
+    let geometry = cache.get(key);
+    if (!geometry) {
+        geometry = build(...sizes.map((size) => size / 1000));
+        geometry.userData.shared = true;
+        cache.set(key, geometry);
+    }
+    return geometry;
+}
+function scaleUVs(geometry, u, v) {
+    const uv = geometry.getAttribute('uv');
+    for (let i = 0; i < uv.count; i++)
+        uv.setXY(i, uv.getX(i) * u, uv.getY(i) * v);
+}
+function lathe(profile, segments) {
+    const geometry = new LatheGeometry(profile.map(([r, y]) => new Vector2(r, y)), segments);
+    geometry.normalizeNormals();
+    const uv = geometry.getAttribute('uv');
+    let distance = 0;
+    for (let j = 0; j < profile.length; j++) {
+        const [r, y] = profile[j];
+        if (j > 0) {
+            const [previousR, previousY] = profile[j - 1];
+            distance += Math.hypot(r - previousR, y - previousY);
+        }
+        for (let i = 0; i <= segments; i++) {
+            uv.setXY(i * profile.length + j, (i / segments) * 2 * Math.PI * r, distance);
+        }
+    }
+    return geometry;
+}
+function cylinder(radius, length, segments) {
+    const geometry = new CylinderGeometry(radius, radius, length, segments);
+    const uv = geometry.getAttribute('uv');
+    const position = geometry.getAttribute('position');
+    const sideVertices = (segments + 1) * 2;
+    for (let i = 0; i < uv.count; i++) {
+        if (i < sideVertices) {
+            uv.setXY(i, uv.getX(i) * 2 * Math.PI * radius, uv.getY(i) * length);
+        }
+        else {
+            uv.setXY(i, position.getX(i), position.getZ(i));
+        }
+    }
+    return geometry;
+}
+function merge(parts) {
+    const indexed = parts.every((part) => part.index !== null);
+    const normalized = parts.map((part) => (!indexed && part.index ? part.toNonIndexed() : part));
+    const geometry = mergeGeometries(normalized);
+    for (const part of normalized)
+        if (!parts.includes(part))
+            part.dispose();
+    for (const part of parts)
+        part.dispose();
+    return geometry;
+}
+function hemisphere(radius, radialSegments, heightSegments) {
+    const geometry = new SphereGeometry(radius, radialSegments, heightSegments, 0, 2 * Math.PI, 0, Math.PI / 2);
+    scaleUVs(geometry, 2 * Math.PI * radius, (Math.PI * radius) / 2);
+    return geometry;
+}
+/** Origin is the spindle on the mounting face; the grip points along +X, out along +Z. */
+function buildLever(curved, plate = false) {
+    return cached(plate ? 'lever-plate' : curved ? 'lever-curved' : 'lever-straight', [], () => {
+        const faceFillet = 0.0005;
+        const faceRadius = 0.0245 - faceFillet * (Math.SQRT2 - 1);
+        const profile = [
+            [0, 0],
+            [0.026, 0],
+            [0.026, 0.0075],
+        ];
+        for (const angle of [Math.PI / 4, Math.PI / 2]) {
+            profile.push([
+                faceRadius + faceFillet * Math.cos(angle),
+                0.0085 + faceFillet * Math.sin(angle),
+            ]);
+        }
+        profile.push([0, 0.009]);
+        const rose = plate
+            ? roundedBox(0.04, 0.22, 0.006, 0.003).clone().translate(0, 0, 0.003)
+            : lathe(profile, 32).rotateX(Math.PI / 2);
+        const neck = cylinder(0.01, 0.037, 16)
+            .rotateX(Math.PI / 2)
+            .translate(0, 0, 0.009 + 0.037 / 2);
+        const neckProfile = [];
+        for (let i = 0; i <= 4; i++) {
+            const angle = (i * Math.PI) / 8;
+            neckProfile.push([0.009 + 0.001 * Math.cos(angle), 0.046 + 0.001 * Math.sin(angle)]);
+        }
+        neckProfile.push([0, 0.047]);
+        const fillet = lathe(neckProfile, 16);
+        const filletNormals = fillet.getAttribute('normal');
+        // Match the cylinder tangent exactly rather than averaging the first fillet chord.
+        for (let i = 0; i <= 16; i++) {
+            const phi = (i * 2 * Math.PI) / 16;
+            for (let j = 0; j < neckProfile.length; j++) {
+                const angle = (Math.min(j, 4) * Math.PI) / 8;
+                filletNormals.setXYZ(i * neckProfile.length + j, Math.cos(angle) * Math.sin(phi), Math.sin(angle), Math.cos(angle) * Math.cos(phi));
+            }
+        }
+        fillet.rotateX(Math.PI / 2);
+        const curve = new CatmullRomCurve3((curved
+            ? [
+                [0, 0],
+                [0.01, 0],
+                [0.02, 0],
+                [0.035, 0],
+                [0.065, -0.004],
+                [0.095, -0.011],
+                [0.105, -0.012],
+                [0.1155, -0.012],
+            ]
+            : [
+                [0, 0],
+                [0.1155, 0],
+            ]).map(([x, y]) => new Vector3(x, y, 0.047)));
+        const grip = new TubeGeometry(curve, curved ? 24 : 2, 0.0095, 16, false);
+        scaleUVs(grip, curve.getLength(), 2 * Math.PI * 0.0095);
+        const cap = hemisphere(0.0095, 12, 6)
+            .rotateZ(-Math.PI / 2)
+            .translate(0.1155, curved ? -0.012 : 0, 0.047);
+        // Close the heel where the horizontal grip meets the vertical neck.
+        const heel = hemisphere(0.0095, 12, 6)
+            .rotateZ(Math.PI / 2)
+            .translate(0, 0, 0.047);
+        if (plate)
+            for (const part of [neck, fillet, grip, cap, heel])
+                part.translate(0, 0, -0.003);
+        return merge([rose, neck, fillet, grip, cap, heel]);
+    });
+}
+export function leverOnRose() {
+    return buildLever(false);
+}
+export function leverOnRoseCurved() {
+    return buildLever(true);
+}
+export function leverOnPlate() {
+    return buildLever(false, true);
+}
+/** Origin at the mounting face; a 56 mm ball on a 20 mm neck and 56 mm rose. */
+export function knobOnRose() {
+    return cached('knob', [], () => {
+        const rose = cylinder(0.028, 0.006, 32)
+            .rotateX(Math.PI / 2)
+            .translate(0, 0, 0.003);
+        const neck = cylinder(0.01, 0.025, 16)
+            .rotateX(Math.PI / 2)
+            .translate(0, 0, 0.0185);
+        const ball = new SphereGeometry(0.028, 32, 16);
+        scaleUVs(ball, 2 * Math.PI * 0.028, Math.PI * 0.028);
+        ball.translate(0, 0, 0.052);
+        return merge([rose, neck, ball]);
+    });
+}
+/** Origin at the face; a 40 × 120 mm open cup with a 3 mm rim, recessed 12 mm. */
+export function flushPull() {
+    return cached('flush-pull', [], () => {
+        const parts = [];
+        const box = (w, h, d, x, y, z) => {
+            const geometry = new BoxGeometry(w, h, d);
+            boxUVs(geometry, w, h, d);
+            parts.push(geometry.translate(x, y, z));
+        };
+        box(0.04, 0.12, 0.002, 0, 0, -0.011);
+        for (const side of [-1, 1]) {
+            box(0.002, 0.12, 0.01, side * 0.019, 0, -0.005);
+            box(0.036, 0.002, 0.01, 0, side * 0.059, -0.005);
+            box(0.003, 0.126, 0.001, side * 0.0215, 0, 0.0005);
+            box(0.04, 0.003, 0.001, 0, side * 0.0615, 0.0005);
+        }
+        return merge(parts);
+    });
+}
+function hingePart(leaf, diameter, height) {
+    return cached(leaf ? 'hinge-leaf' : 'hinge-jamb', [diameter, height], (d, h) => {
+        const radialScale = d / 0.014;
+        const heightScale = h / 0.103;
+        const radius = d / 2;
+        const plateW = 0.0025 * radialScale;
+        const plateH = 0.089 * heightScale;
+        const plateD = 0.028 * radialScale;
+        const plate = new BoxGeometry(plateW, plateH, plateD);
+        boxUVs(plate, plateW, plateH, plateD);
+        plate.translate(leaf ? plateW / 2 : -plateW / 2, 0, -plateD / 2);
+        const parts = [plate];
+        for (let i = leaf ? 0 : 1; i < 5; i += 2) {
+            parts.push(cylinder(radius, 0.017 * heightScale, 16).translate(0, (-0.036 + i * 0.018) * heightScale, 0));
+        }
+        if (leaf) {
+            for (const side of [-1, 1]) {
+                const cap = hemisphere(radius, 12, d <= 0.01 ? 2 : 3);
+                const capScale = heightScale / radialScale;
+                cap.scale(1, capScale, 1);
+                const uv = cap.getAttribute('uv');
+                for (let i = 0; i < uv.count; i++)
+                    uv.setY(i, uv.getY(i) * capScale);
+                if (side < 0)
+                    cap.rotateX(Math.PI);
+                parts.push(cap.translate(0, side * 0.0445 * heightScale, 0));
+            }
+        }
+        return merge(parts);
+    });
+}
+/** Odd knuckles and plate on the leaf edge (+X), extending into the rebate (-Z). */
+export function hingeLeafPart(diameter = 0.014, height = 0.103) {
+    return hingePart(true, diameter, height);
+}
+/** Even knuckles and plate on the jamb face (-X), extending into the rebate (-Z). */
+export function hingeJambPart(diameter = 0.014, height = 0.103) {
+    return hingePart(false, diameter, height);
+}
+/** Origin on the mounting face; bar along Y, projecting along +Z. */
+export function pullBar(doorScale = false) {
+    return cached(doorScale ? 'door-pull' : 'pull', [], () => {
+        if (doorScale) {
+            const bar = cylinder(0.0125, 0.4, 32).translate(0, 0, 0.05);
+            return merge([
+                bar,
+                ...[-0.15, 0.15].map((y) => cylinder(0.008, 0.05, 16)
+                    .rotateX(Math.PI / 2)
+                    .translate(0, y, 0.025)),
+            ]);
+        }
+        const bar = new CapsuleGeometry(0.009, 0.102, 6, 12);
+        scaleUVs(bar, 2 * Math.PI * 0.009, 0.102 + Math.PI * 0.009);
+        bar.translate(0, 0, 0.022);
+        const parts = [bar];
+        for (const y of [-0.02, 0.02]) {
+            parts.push(cylinder(0.005, 0.02, 16)
+                .rotateX(Math.PI / 2)
+                .translate(0, y, 0.01));
+        }
+        return merge(parts);
+    });
+}
+function boxUVs(geometry, width, height, depth) {
+    const uv = geometry.getAttribute('uv');
+    const faceSizes = [
+        [depth, height],
+        [depth, height],
+        [width, depth],
+        [width, depth],
+        [width, height],
+        [width, height],
+    ];
+    const verticesPerFace = uv.count / 6;
+    for (let i = 0; i < uv.count; i++) {
+        const [u, v] = faceSizes[Math.floor(i / verticesPerFace)];
+        uv.setXY(i, uv.getX(i) * u, uv.getY(i) * v);
+    }
+}
+export function roundedBox(w, h, d, r = Math.min(0.004, w / 4, h / 4, d / 4)) {
+    return cached('box', [w, h, d, r], (width, height, depth, radius) => {
+        const geometry = new RoundedBoxGeometry(width, height, depth, 1, radius);
+        boxUVs(geometry, width, height, depth);
+        return geometry;
+    });
+}
+/** A capped round bar along Y. */
+export function tube(radius, length) {
+    return cached('tube', [2 * radius, length], (diameter, l) => cylinder(diameter / 2, l, 12));
+}
+export function sphere(radius) {
+    return cached('sphere', [2 * radius], (diameter) => {
+        const geometry = new SphereGeometry(diameter / 2, 12, 8);
+        scaleUVs(geometry, Math.PI * diameter, (Math.PI * diameter) / 2);
+        return geometry;
+    });
+}
+/** A wheel with its axle along Z. */
+export function roller(radius, width) {
+    return cached('roller', [2 * radius, width], (diameter, w) => cylinder(diameter / 2, w, 20).rotateX(Math.PI / 2));
+}

package/dist/lib/layer-pass.d.ts

@@ -1,5 +1,7 @@
 import { type Camera, Object3D, type Scene } from 'three';
 import { type NodeFrame, PassNode } from 'three/webgpu';
+export declare function getLayoutRevision(): number;
+export declare function isLayoutObserved(scene: Object3D): boolean;
 export declare class LayerPassIndex {
     readonly source: Scene;
     private readonly members;

package/dist/lib/layer-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layer-pass.d.ts","sourceRoot":"","sources":["../../src/lib/layer-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAiB,QAAQ,EAAE,KAAK,KAAK,EAAW,MAAM,OAAO,CAAA;AACjF,OAAO,EAAE,KAAK,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAoBvD,qBAAa,cAAc;IAKvB,QAAQ,CAAC,MAAM,EAAE,KAAK;IAJxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAC3D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAE3D,YACW,MAAM,EAAE,KAAK,EACtB,MAAM,EAAE,MAAM,EAAE,EASjB;IAED,QAAQ,CAAC,OAAO,EAAE,QAAQ,QAQzB;IAED,OAAO,CAAC,MAAM,CA2Cb;IAED,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE;;;MAkCvC;IAED,OAAO,SAGN;CACF;AAiBD,qBAAa,aAAc,SAAQ,QAAQ;IAMvC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAEtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgB;IACrC,OAAO,CAAC,UAAU,CAAO;IAEzB,YACmB,KAAK,EAAE,cAAc,EACtC,MAAM,EAAE,MAAM,EACG,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAYpC;IAEQ,OAAO,SAGf;IAEQ,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CA+DjD;CACF"}
+{"version":3,"file":"layer-pass.d.ts","sourceRoot":"","sources":["../../src/lib/layer-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAiB,QAAQ,EAAE,KAAK,KAAK,EAAW,MAAM,OAAO,CAAA;AACjF,OAAO,EAAE,KAAK,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAYvD,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAEzD;AAkBD,qBAAa,cAAc;IAKvB,QAAQ,CAAC,MAAM,EAAE,KAAK;IAJxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAC3D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAE3D,YACW,MAAM,EAAE,KAAK,EACtB,MAAM,EAAE,MAAM,EAAE,EAUjB;IAED,QAAQ,CAAC,OAAO,EAAE,QAAQ,QAQzB;IAED,OAAO,CAAC,MAAM,CA8Cb;IAED,OAAO,CAAC,MAAM;IAOd,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE;;;MAkCvC;IAED,OAAO,SAIN;CACF;AAiBD,qBAAa,aAAc,SAAQ,QAAQ;IAMvC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAEtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiB;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgB;IACrC,OAAO,CAAC,UAAU,CAAO;IAEzB,YACmB,KAAK,EAAE,cAAc,EACtC,MAAM,EAAE,MAAM,EACG,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAYpC;IAEQ,OAAO,SAGf;IAEQ,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CA+DjD;CACF"}

package/dist/lib/layer-pass.js

@@ -5,6 +5,19 @@
 import { Object3D, Vector2 } from 'three';
 import { PassNode } from 'three/webgpu';
 const maskObserver = Symbol('LayerPassIndex.maskObserver');
+/**
+ * Bumped on every observed mask change and child insertion or removal, so a per-frame walk can
+ * tell when what is drawable may have changed (scene-matrices.ts). Only meaningful for scenes
+ * with a live index ({@link isLayoutObserved}).
+ */
+let layoutRevision = 0;
+const observedScenes = new WeakSet();
+export function getLayoutRevision() {
+    return layoutRevision;
+}
+export function isLayoutObserved(scene) {
+    return observedScenes.has(scene);
+}
 function maskOwner(object) {
     const get = Object.getOwnPropertyDescriptor(object.layers, 'mask')?.get;
     return get?.[maskObserver];
@@ -22,6 +35,7 @@ export class LayerPassIndex {
             this.members.set(1 << layer, new Set());
         try {
             this.attach(source);
+            observedScenes.add(source);
         }
         catch (error) {
             this.dispose();
@@ -45,7 +59,11 @@ export class LayerPassIndex {
             throw new Error('LayerPassIndex requires one index per scene and unshared Layers');
         }
         let mask = layers.mask;
+        // Passes switch the camera's layers every frame; that changes nothing in the scene.
+        const isCamera = object.isCamera === true;
         const sync = () => {
+            if (!isCamera)
+                layoutRevision++;
             for (const [bit, members] of this.members) {
                 if ((mask & bit) !== 0 && object !== this.source)
                     members.add(object);
@@ -88,6 +106,7 @@ export class LayerPassIndex {
             this.attach(child);
     };
     detach(object) {
+        layoutRevision++;
         for (const child of object.children)
             this.detach(child);
         this.cleanups.get(object)?.();
@@ -136,6 +155,7 @@ export class LayerPassIndex {
         return { drawable, shadowLight };
     }
     dispose() {
+        observedScenes.delete(this.source);
         for (const cleanup of this.cleanups.values())
             cleanup();
         this.cleanups.clear();

package/dist/lib/materials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../src/lib/materials.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../src/lib/materials.ts"],"names":[],"mappings":"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"}

package/dist/lib/materials.js

@@ -1,7 +1,7 @@
 import { getMaterialPresetByRef, materialColorPaint, parseMaterialColor, parseMaterialRef, resolveMaterial, } from '@pascal-app/core';
 import { addAfterEffect, invalidate } from '@react-three/fiber';
 import * as THREE from 'three';
-import { float, mix, positionViewDirection, transformedNormalView } from 'three/tsl';
+import { float, mix, normalView, positionViewDirection } from 'three/tsl';
 import { MeshLambertNodeMaterial, MeshStandardNodeMaterial } from 'three/webgpu';
 import { resolveCdnUrl } from './asset-url';
 import { isKtx2Url, ktx2Loader, whenKtx2Ready } from './ktx2-loader';
@@ -162,35 +162,41 @@ export function resolveTextureRepeat(repeat, scale) {
     }
     return [fallback, fallback];
 }
+function textureOffset(texture) {
+    return texture.offset ?? [0, 0];
+}
+function getPlacementKey(texture) {
+    const [repeatX, repeatY] = resolveTextureRepeat(texture.repeat, texture.scale);
+    const [offsetX, offsetY] = textureOffset(texture);
+    return `${repeatX}x${repeatY}+${offsetX},${offsetY}`;
+}
 export function getTextureKey(material) {
     const texture = material?.texture;
     if (!texture)
         return 'none';
-    const [repeatX, repeatY] = resolveTextureRepeat(texture.repeat, texture.scale);
-    return `${texture.url}-${repeatX}x${repeatY}`;
+    const normal = texture.normalMap ? `-n:${texture.normalMap}*${texture.normalScale ?? 1}` : '';
+    const bump = texture.bumpMap ? `-b:${texture.bumpMap}*${texture.bumpScale ?? 1}` : '';
+    return `${texture.url}-${getPlacementKey(texture)}${normal}${bump}`;
 }
-function getTexture(material) {
-    const textureConfig = material?.texture;
-    if (!textureConfig?.url)
-        return undefined;
-    const cacheKey = getTextureKey(material);
+/** One map of a native material's texture; every map shares the albedo's repeat and offset. */
+function getTexture(textureConfig, url, slot) {
+    const cacheKey = `${url}-${getPlacementKey(textureConfig)}-${slot}`;
     const cached = textureCache.get(cacheKey);
     if (cached)
         return cached;
-    const resolvedUrl = /^(?:asset|blob|data):/.test(textureConfig.url)
-        ? textureConfig.url
-        : (resolveCdnUrl(textureConfig.url) ?? textureConfig.url);
+    const resolvedUrl = /^(?:asset|blob|data):/.test(url) ? url : (resolveCdnUrl(url) ?? url);
     const texture = loadTexture(resolvedUrl, cacheKey);
     texture.wrapS = THREE.RepeatWrapping;
     texture.wrapT = THREE.RepeatWrapping;
     const [repeatX, repeatY] = resolveTextureRepeat(textureConfig.repeat, textureConfig.scale);
     texture.repeat.set(repeatX, repeatY);
+    texture.offset.set(...textureOffset(textureConfig));
     texture.updateMatrix();
-    texture.colorSpace = THREE.SRGBColorSpace;
+    texture.colorSpace = slot === 'map' ? THREE.SRGBColorSpace : THREE.NoColorSpace;
     stampPascalTextureRef(texture, {
         kind: 'project-asset',
         src: resolvedUrl,
-        slot: 'map',
+        slot,
     });
     textureCache.set(cacheKey, texture);
     return texture;
@@ -272,9 +278,14 @@ async function loadPresetTexture(path, props, slot) {
     // materials can be created while a capture canvas's renderer is still
     // initializing, and failing here would cache the material permanently
     // texture-less (white).
-    const load = isKtx2Url(resolvedPath)
-        ? whenKtx2Ready().then(() => ktx2Loader.loadAsync(resolvedPath))
-        : textureLoader.loadAsync(resolvedPath);
+    const loadFrom = (url) => isKtx2Url(url)
+        ? whenKtx2Ready().then(() => ktx2Loader.loadAsync(url))
+        : textureLoader.loadAsync(url);
+    // A catalog map ships in the app's public folder before the asset CDN has it
+    // (a branch, a deploy ahead of the CDN): a CDN miss retries the app's own copy.
+    const load = resolvedPath !== path && path.startsWith('/')
+        ? loadFrom(resolvedPath).catch(() => loadFrom(path))
+        : loadFrom(resolvedPath);
     const promise = load
         .then((texture) => {
         applyTextureProperties(texture, props, slot);
@@ -383,7 +394,9 @@ export function materialCastsShadow(material) {
  * This is what makes glass read as a surface instead of a flat blue tint.
  */
 function applyGlassFresnel(material) {
-    const facing = transformedNormalView.dot(positionViewDirection).clamp(0, 1);
+    // The daylight look swaps in its tuned glass for flagged materials (lib/daylight/material-hooks).
+    material.userData.isGlass = true;
+    const facing = normalView.dot(positionViewDirection).clamp(0, 1);
     const fresnel = facing.oneMinus().pow(3);
     material.opacityNode = mix(float(material.opacity), float(0.92), fresnel);
     material.envMapIntensity = 1.4;
@@ -449,22 +462,36 @@ export function createMaterial(material, shading = 'rendered') {
     if (materialCache.has(cacheKey)) {
         return materialCache.get(cacheKey);
     }
-    const map = getTexture(material);
+    const texture = material?.texture?.url ? material.texture : undefined;
     const materialParams = {
         color: props.color,
         opacity: props.opacity,
         transparent: props.transparent,
         side: sideMap[props.side],
     };
-    if (map)
-        materialParams.map = map;
-    const threeMaterial = shading === 'solid'
-        ? new MeshLambertNodeMaterial(materialParams)
-        : new MeshStandardNodeMaterial({
+    if (texture)
+        materialParams.map = getTexture(texture, texture.url, 'map');
+    let threeMaterial;
+    if (shading === 'solid') {
+        threeMaterial = new MeshLambertNodeMaterial(materialParams);
+    }
+    else {
+        const standard = new MeshStandardNodeMaterial({
             ...materialParams,
             roughness: props.roughness,
             metalness: props.metalness,
         });
+        if (texture?.normalMap) {
+            standard.normalMap = getTexture(texture, texture.normalMap, 'normalMap');
+            const normalScale = texture.normalScale ?? 1;
+            standard.normalScale.set(normalScale, normalScale);
+        }
+        if (texture?.bumpMap) {
+            standard.bumpMap = getTexture(texture, texture.bumpMap, 'bumpMap');
+            standard.bumpScale = texture.bumpScale ?? 1;
+        }
+        threeMaterial = standard;
+    }
     // Explicit source transparency keeps its opacity; the glass preset owns this styling.
     if (glassPreset)
         maybeApplyGlassFresnel(threeMaterial);

package/dist/lib/merged-outline-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merged-outline-node.d.ts","sourceRoot":"","sources":["../../src/lib/merged-outline-node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merged-outline-node.d.ts","sourceRoot":"","sources":["../../src/lib/merged-outline-node.ts"],"names":[],"mappings":"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"}

package/dist/lib/merged-outline-node.js

@@ -15,6 +15,8 @@ import { DepthTexture, FloatType, Mesh, Object3D, RenderTarget, Scene, Sprite, V
 import { builtin, color, exp, Fn, float, floatBitsToUint, int, Loop, min, mul, nodeObject, orthographicDepthToViewZ, passTexture, perspectiveDepthToViewZ, positionView, reference, screenUV, texture, textureSize, uniform, uv, vec2, vec3, vec4, } from 'three/tsl';
 import { NodeMaterial, NodeUpdateType, QuadMesh, RendererUtils, SpriteNodeMaterial, TempNode, } from 'three/webgpu';
 import { hasDrawableGeometry } from './drawable-geometry';
+import { BATCHED_LAYER, SCENE_LAYER } from './layers';
+import { isSetAsideForRender } from './scene-matrices';
 const _quadMesh = new QuadMesh();
 const _size = new Vector2();
 const _BLUR_X = new Vector2(1.0, 0.0);
@@ -431,7 +433,8 @@ export class MergedOutlineNode extends TempNode {
             let visible = true;
             let attached = false;
             for (let ancestor = source; ancestor; ancestor = ancestor.parent) {
-                if (!ancestor.visible)
+                // A subtree set aside for this render (nothing in it draws itself) is still shown.
+                if (!ancestor.visible && !isSetAsideForRender(ancestor))
                     visible = false;
                 if (ancestor === this.scene)
                     attached = true;
@@ -440,6 +443,9 @@ export class MergedOutlineNode extends TempNode {
             proxy.material = source.material;
             proxy.matrixWorld.copy(source.matrixWorld);
             proxy.layers.mask = source.layers.mask;
+            // A batched source is drawn by its batch: outline it as if it drew itself.
+            if (proxy.layers.isEnabled(BATCHED_LAYER))
+                proxy.layers.enable(SCENE_LAYER);
             proxy.visible = visible && attached;
             proxy.renderOrder = source.renderOrder;
             proxy.morphTargetInfluences = source.morphTargetInfluences;

package/dist/lib/occlusion-culler.d.ts

@@ -0,0 +1,34 @@
+import * as THREE from 'three';
+export type OcclusionStats = {
+    occluders: number;
+    triangles: number;
+    tested: number;
+    culled: number;
+    ms: number;
+};
+export type OcclusionCuller = {
+    /** Computes which drawn meshes the camera can't see. Returns the culled meshes. */
+    cull(camera: THREE.Camera): ReadonlySet<THREE.Mesh>;
+    /** Whether a mesh moved, appeared or vanished since the last call. */
+    changed(): boolean;
+    readonly stats: OcclusionStats;
+    dispose(): void;
+};
+export declare function createOcclusionCuller(root: THREE.Object3D): OcclusionCuller;
+/** The part of three's drawing pipeline (`renderer.drawingPipeline`) the culler hooks into. */
+export type CullingPipeline = {
+    isCulled(object: THREE.Object3D, camera: THREE.Camera): boolean;
+};
+/**
+ * Culls `culler`'s meshes from the renders of `scene` through the camera `getCamera` returns:
+ * recomputed when that camera moves or the scene changes, and answered through the drawing
+ * pipeline's own culling test while such a render collects its draws. Nothing about the meshes
+ * changes, so other cameras (the sun's shadow, captures) see them all.
+ */
+export declare function attachOcclusionCuller({ scene, pipeline, culler, getCamera, }: {
+    scene: THREE.Scene;
+    pipeline: CullingPipeline;
+    culler: OcclusionCuller;
+    getCamera: () => THREE.Camera;
+}): () => void;
+//# sourceMappingURL=occlusion-culler.d.ts.map

package/dist/lib/occlusion-culler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"occlusion-culler.d.ts","sourceRoot":"","sources":["../../src/lib/occlusion-culler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAiD9B,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,mFAAmF;IACnF,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACnD,sEAAsE;IACtE,OAAO,IAAI,OAAO,CAAA;IAClB,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAA;IAC9B,OAAO,IAAI,IAAI,CAAA;CAChB,CAAA;AAUD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,GAAG,eAAe,CA6gB3E;AAED,+FAA+F;AAC/F,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAEjG;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,SAAS,GACV,EAAE;IACD,KAAK,EAAE,KAAK,CAAC,KAAK,CAAA;IAClB,QAAQ,EAAE,eAAe,CAAA;IACzB,MAAM,EAAE,eAAe,CAAA;IACvB,SAAS,EAAE,MAAM,KAAK,CAAC,MAAM,CAAA;CAC9B,GAAG,MAAM,IAAI,CAoDb"}