@pascal-app/viewer 1.0.1 → 1.0.4

package/dist/systems/wall/wall-cutout-cache.js

@@ -1,9 +1,11 @@
 // New kind-specific modules belong in nodes; viewer must not depend on nodes.
 // This extends the existing viewer-owned wall cutout and material implementation.
-import { getLibraryMaterialsVersion, getWallFaceBandConfig, getWallPlaneTop, resolveLevelId, resolveWallEffectiveHeight, sceneRegistry, spatialGridManager, useLiveTransforms, useScene, } from '@pascal-app/core';
+import { getEffectiveNode, getLibraryMaterialsVersion, sceneRegistry, useLiveNodeOverrides, useLiveTransforms, useScene, } from '@pascal-app/core';
 import { Matrix4, Vector3 } from 'three';
 import { getMaterialTextureVersion } from '../../lib/materials';
+import { hasMaterialsForGroups } from '../../lib/pointer-events';
 import useViewer, {} from '../../store/use-viewer';
+import { getWallFinishRefs } from './wall-finish-data';
 import { resolveWallMaterialVariant } from './wall-material-variant';
 import { getHoverHighlightMaterials, getMaterialsForWall, getSelectionHighlightMaterials, } from './wall-materials';
 export function sameMaterialArray(a, b) {
@@ -38,6 +40,9 @@ function materialsForVariant(variant, materials) {
         }
     }
 }
+function wallPaletteKey(mesh) {
+    return getWallFinishRefs(mesh.geometry).join('|');
+}
 // About 0.06 degrees: retain the previous side at edge-on poses without
 // introducing a perceptible delay when an orbit crosses a wall's plane.
 export const WALL_FACING_HYSTERESIS = 0.001;
@@ -59,6 +64,7 @@ export function wallFacingNegative(dot, previous) {
 }
 export class WallCutoutCache {
     viewerStore;
+    materialResolver;
     walls = new Map();
     rebuilt = new Set();
     viewer;
@@ -76,8 +82,10 @@ export class WallCutoutCache {
     selected = new Set();
     highlightKey = '';
     transformed = new Set();
-    constructor(viewerStore = useViewer) {
+    overrides = useLiveNodeOverrides.getState().overrides;
+    constructor(viewerStore = useViewer, materialResolver = getMaterialsForWall) {
         this.viewerStore = viewerStore;
+        this.materialResolver = materialResolver;
     }
     subscribeLiveTransforms() {
         return useLiveTransforms.subscribe((state, previous) => {
@@ -98,6 +106,8 @@ export class WallCutoutCache {
         const libraryVersion = getLibraryMaterialsVersion();
         const textureVersion = getMaterialTextureVersion();
         const previous = this.viewer;
+        const overrides = useLiveNodeOverrides.getState().overrides;
+        const overridesChanged = this.overrides !== overrides;
         const nodesChanged = this.nodes !== scene.nodes;
         const registryChanged = this.registryRevision !== sceneRegistry.revision || this.wallCount !== wallIds.size;
         let highlightChanged = false;
@@ -126,23 +136,25 @@ export class WallCutoutCache {
         const previewId = (state) => state && state.hoverHighlightMode !== 'default' && state.hoverHighlightMode !== 'delete'
             ? state.hoveredId
             : null;
-        const releasedPreview = previewId(previous) !== previewId(viewer) ? previewId(previous) : null;
+        const releasedPreview = previewId(previous) === previewId(viewer) ? null : previewId(previous);
         this.viewer = viewer;
-        const invalidated = appearanceChanged ||
+        const invalidated = overridesChanged ||
+            appearanceChanged ||
             nodesChanged ||
             registryChanged ||
             this.rebuilt.size > 0 ||
             this.transformed.size > 0 ||
             releasedPreview !== null;
-        if (!invalidated && viewer.wallMode !== 'cutaway')
+        const cutaway = viewer.wallMode === 'cutaway';
+        if (!invalidated && !cutaway)
             return;
         camera.getWorldDirection(this.cameraDirection);
         this.cameraTarget.copy(this.cameraDirection).add(camera.position);
-        const cameraChanged = viewer.wallMode === 'cutaway' &&
+        const cameraChanged = cutaway &&
             time - this.lastUpdateTime > 0.1 &&
             (camera.position.distanceTo(this.lastCameraPosition) > 0.5 ||
                 this.cameraTarget.distanceTo(this.lastCameraTarget) > 0.3);
-        if (!invalidated && !cameraChanged)
+        if (!(invalidated || cameraChanged))
             return;
         if (registryChanged || nodesChanged) {
             for (const [id, wall] of this.walls) {
@@ -188,6 +200,7 @@ export class WallCutoutCache {
                         assignedMaterials: undefined,
                         visibleVariant: { key: 'visible', materials: [] },
                         hiddenVariant: { key: 'invisible', materials: [] },
+                        paletteKey: '',
                     };
                     this.walls.set(id, wall);
                 }
@@ -195,16 +208,20 @@ export class WallCutoutCache {
                 const rebuilt = this.rebuilt.has(id);
                 if (added || changed || rebuilt)
                     this.refreshNormal(wall, visited);
-                wall.node = node;
-                if (added || appearanceChanged || (nodesChanged && changed))
+                const overrideChanged = this.overrides.get(id) !== overrides.get(id);
+                wall.node = getEffectiveNode(node);
+                const repaletted = rebuilt && wallPaletteKey(wall.mesh) !== wall.paletteKey;
+                const refresh = added || appearanceChanged || overrideChanged || (nodesChanged && changed) || repaletted;
+                if (refresh)
                     this.refreshAppearance(wall);
                 if (added ||
                     appearanceChanged ||
+                    overrideChanged ||
                     changed ||
                     rebuilt ||
                     releasedPreview === id ||
                     cameraChanged) {
-                    this.apply(wall, viewer.wallMode, added || appearanceChanged || (nodesChanged && changed));
+                    this.apply(wall, viewer.wallMode, refresh);
                 }
             }
         }
@@ -214,6 +231,7 @@ export class WallCutoutCache {
         }
         this.rebuilt.clear();
         this.transformed.clear();
+        this.overrides = overrides;
         this.nodes = scene.nodes;
         this.materials = scene.materials;
         this.registryRevision = sceneRegistry.revision;
@@ -226,19 +244,35 @@ export class WallCutoutCache {
             this.lastUpdateTime = time;
         }
     }
+    /**
+     * A rebuilt wall whose finish palette changed must swap materials in the same
+     * frame: its new groups already index the new palette.
+     */
+    handleRebuilt(id) {
+        this.rebuilt.add(id);
+        const wall = this.walls.get(id);
+        const viewer = this.viewer;
+        if (!(wall && viewer) || wall.mesh !== sceneRegistry.nodes.get(id))
+            return;
+        if (wallPaletteKey(wall.mesh) === wall.paletteKey)
+            return;
+        const node = useScene.getState().nodes[id];
+        if (node?.type !== 'wall')
+            return;
+        wall.node = getEffectiveNode(node);
+        this.refreshAppearance(wall);
+        this.apply(wall, viewer.wallMode, true);
+    }
     refreshAppearance(wall) {
         const viewer = this.viewer;
         const scene = useScene.getState();
         const node = wall.node;
         const deleted = viewer.hoverHighlightMode === 'delete' && viewer.hoveredId === node.id;
-        let selectionHighlighted = !deleted && this.selected.has(node.id);
-        if (selectionHighlighted) {
-            const levelId = resolveLevelId(node, scene.nodes);
-            const support = spatialGridManager.getSlabSupportForWall(levelId, node.start, node.end, node.curveOffset ?? 0, node.thickness, node.supportSlabId);
-            const height = resolveWallEffectiveHeight(node, getWallPlaneTop(node, levelId, scene.nodes), support.elevation);
-            selectionHighlighted = !getWallFaceBandConfig(node, height).enabled;
-        }
-        const materials = getMaterialsForWall(node, viewer.shading, viewer.textures, viewer.colorPreset, viewer.sceneTheme, scene.materials);
+        // Painted parts stay readable while their wall is selected for editing.
+        const selectionHighlighted = !deleted && this.selected.has(node.id) && !(node.faceRegions?.length ?? 0);
+        const finishRefs = getWallFinishRefs(wall.mesh.geometry);
+        wall.paletteKey = finishRefs.join('|');
+        const materials = this.materialResolver(node, viewer.shading, viewer.textures, viewer.colorPreset, viewer.sceneTheme, scene.materials, finishRefs);
         const variant = (hidden) => {
             const key = resolveWallMaterialVariant({
                 translucentMode: viewer.wallMode === 'translucent',
@@ -280,11 +314,15 @@ export class WallCutoutCache {
         if (wall.mesh.userData.wallHidden !== stamp)
             wall.mesh.userData.wallHidden = stamp;
         const variant = hidden ? wall.hiddenVariant : wall.visibleVariant;
-        // Non-highlight hover owns a temporary material until its restore callback runs.
+        // Non-highlight hover (a paint preview) owns a temporary material until its
+        // restore callback runs — unless the rebuilt geometry now draws a finish that
+        // array has no entry for (a click just added one): then the new palette goes
+        // on and the preview is dropped, rather than leaving groups with no material.
         const viewer = this.viewer;
         if (viewer.hoveredId === wall.node.id &&
             viewer.hoverHighlightMode !== 'default' &&
-            viewer.hoverHighlightMode !== 'delete') {
+            viewer.hoverHighlightMode !== 'delete' &&
+            hasMaterialsForGroups(wall.mesh)) {
             if (refresh)
                 wall.variantKey = undefined;
             return;

package/dist/systems/wall/wall-cutout.d.ts

@@ -3,6 +3,7 @@ import type { Camera } from 'three';
 import { type Mesh, Vector3 } from 'three/webgpu';
 import { type WallMode } from '../../store/use-viewer';
 import { WallCutoutCache, type WallCutoutViewerStore } from './wall-cutout-cache';
+import { type WallMaterialsResolver } from './wall-materials';
 export declare const WALL_CUTOUT_FRAME_PRIORITY = 0;
 export declare function runWallCutoutFrame(cache: WallCutoutCache, { camera, clock }: {
     camera: Camera;
@@ -19,7 +20,14 @@ export declare function runWallCutoutFrame(cache: WallCutoutCache, { camera, clo
  * from the assigned material variant.
  */
 export declare function getWallHideState(wallNode: WallNode, wallMesh: Mesh, wallMode: WallMode, cameraDir: Vector3): boolean;
-export declare const WallCutout: ({ viewerStore, }: {
+/**
+ * The walls as a capture draws them, until the returned function puts them back: a delete or a
+ * selection highlight taken off and, with `wholeWalls`, every wall whole whatever the wall mode.
+ * The palettes come from the renderer's own resolver, so a curtain wall keeps its glass.
+ */
+export declare function wallsForCapture(materialResolver: WallMaterialsResolver, viewerStore: WallCutoutViewerStore, wholeWalls: boolean): () => void;
+export declare const WallCutout: ({ viewerStore, materialResolver, }: {
     viewerStore?: WallCutoutViewerStore;
+    materialResolver?: WallMaterialsResolver;
 }) => null;
 //# sourceMappingURL=wall-cutout.d.ts.map

package/dist/systems/wall/wall-cutout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wall-cutout.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-cutout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAGlG,OAAO,KAAK,EAAE,MAAM,EAAY,MAAM,OAAO,CAAA;AAC7C,OAAO,EAAE,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACjD,OAAkB,EAAE,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,EAEL,eAAe,EACf,KAAK,qBAAqB,EAE3B,MAAM,qBAAqB,CAAA;AAM5B,eAAO,MAAM,0BAA0B,IAAI,CAAA;AAE3C,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,eAAe,EACtB,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,QAGtE;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,IAAI,EACd,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,OAAO,GACjB,OAAO,CAKT;AAED,eAAO,MAAM,UAAU,GAAI,kBAExB;IACD,WAAW,CAAC,EAAE,qBAAqB,CAAA;CACpC,SA2DA,CAAA"}
+{"version":3,"file":"wall-cutout.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-cutout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAGlG,OAAO,KAAK,EAAE,MAAM,EAAY,MAAM,OAAO,CAAA;AAC7C,OAAO,EAAE,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACjD,OAAkB,EAAE,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,EAEL,eAAe,EACf,KAAK,qBAAqB,EAE3B,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAGL,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAA;AAKzB,eAAO,MAAM,0BAA0B,IAAI,CAAA;AAE3C,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,eAAe,EACtB,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,QAGtE;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,IAAI,EACd,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,OAAO,GACjB,OAAO,CAKT;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,gBAAgB,EAAE,qBAAqB,EACvC,WAAW,EAAE,qBAAqB,EAClC,UAAU,EAAE,OAAO,GAClB,MAAM,IAAI,CAmCZ;AAED,eAAO,MAAM,UAAU,GAAI,oCAGxB;IACD,WAAW,CAAC,EAAE,qBAAqB,CAAA;IACnC,gBAAgB,CAAC,EAAE,qBAAqB,CAAA;CACzC,SAiCA,CAAA"}

package/dist/systems/wall/wall-cutout.js

@@ -4,7 +4,8 @@ import { useEffect, useMemo } from 'react';
 import { Vector3 } from 'three/webgpu';
 import useViewer, {} from '../../store/use-viewer';
 import { sameMaterialArray, WallCutoutCache, wallHiddenFromFacing, } from './wall-cutout-cache';
-import { getMaterialsForWall, getSelectionHighlightMaterials } from './wall-materials';
+import { getWallFinishRefs } from './wall-finish-data';
+import { getMaterialsForWall, getSelectionHighlightMaterials, } from './wall-materials';
 import { subscribeWallRebuilds } from './wall-rebuild-notifications';
 const v = new Vector3();
 export const WALL_CUTOUT_FRAME_PRIORITY = 0;
@@ -27,43 +28,56 @@ export function getWallHideState(wallNode, wallMesh, wallMode, cameraDir) {
     wallMesh.getWorldDirection(v);
     return wallHiddenFromFacing(wallNode, wallMode, v.dot(cameraDir) < 0);
 }
-export const WallCutout = ({ viewerStore = useViewer, }) => {
-    const cache = useMemo(() => new WallCutoutCache(viewerStore), [viewerStore]);
-    useEffect(() => subscribeWallRebuilds((id) => cache.rebuilt.add(id)), [cache]);
+/**
+ * The walls as a capture draws them, until the returned function puts them back: a delete or a
+ * selection highlight taken off and, with `wholeWalls`, every wall whole whatever the wall mode.
+ * The palettes come from the renderer's own resolver, so a curtain wall keeps its glass.
+ */
+export function wallsForCapture(materialResolver, viewerStore, wholeWalls) {
+    const snapshot = new Map();
+    const viewer = viewerStore.getState();
+    sceneRegistry.byType.wall.forEach((wallId) => {
+        const wallMesh = sceneRegistry.nodes.get(wallId);
+        if (!wallMesh)
+            return;
+        const wallNode = useScene.getState().nodes[wallId];
+        if (wallNode?.type !== 'wall')
+            return;
+        const mats = materialResolver(wallNode, viewer.shading, viewer.textures, viewer.colorPreset, viewer.sceneTheme, useScene.getState().materials, getWallFinishRefs(wallMesh.geometry));
+        const current = wallMesh.material;
+        snapshot.set(wallMesh, current);
+        if (wholeWalls || current === mats.deleteVisible) {
+            wallMesh.material = mats.visible;
+        }
+        else if (current === mats.deleteInvisible) {
+            wallMesh.material = mats.invisible;
+        }
+        else if (current === mats.deleteTranslucent ||
+            sameMaterialArray(current, getSelectionHighlightMaterials(mats.translucent))) {
+            wallMesh.material = mats.translucent;
+        }
+    });
+    return () => {
+        snapshot.forEach((material, mesh) => {
+            mesh.material = material;
+        });
+    };
+}
+export const WallCutout = ({ viewerStore = useViewer, materialResolver = getMaterialsForWall, }) => {
+    const cache = useMemo(() => new WallCutoutCache(viewerStore, materialResolver), [viewerStore, materialResolver]);
+    useEffect(() => subscribeWallRebuilds((id) => cache.handleRebuilt(id)), [cache]);
     useEffect(() => cache.subscribeLiveTransforms(), [cache]);
     // Camera changes reach PostProcessing (1) in this frame. WallSystem (4)
     // notifies the next frame; WallBatchSystem (5) reads this frame's stamps.
     useFrame((state) => runWallCutoutFrame(cache, state), WALL_CUTOUT_FRAME_PRIORITY);
     useEffect(() => {
-        const snapshot = new Map();
-        const restoreForCapture = () => {
-            sceneRegistry.byType.wall.forEach((wallId) => {
-                const wallMesh = sceneRegistry.nodes.get(wallId);
-                if (!wallMesh)
-                    return;
-                const wallNode = useScene.getState().nodes[wallId];
-                if (wallNode?.type !== 'wall')
-                    return;
-                const mats = getMaterialsForWall(wallNode, viewerStore.getState().shading, viewerStore.getState().textures, viewerStore.getState().colorPreset, viewerStore.getState().sceneTheme, useScene.getState().materials);
-                const current = wallMesh.material;
-                snapshot.set(wallMesh, current);
-                if (current === mats.deleteVisible) {
-                    wallMesh.material = mats.visible;
-                }
-                else if (current === mats.deleteInvisible) {
-                    wallMesh.material = mats.invisible;
-                }
-                else if (current === mats.deleteTranslucent ||
-                    sameMaterialArray(current, getSelectionHighlightMaterials(mats.translucent))) {
-                    wallMesh.material = mats.translucent;
-                }
-            });
+        let restore = null;
+        const restoreForCapture = (event) => {
+            restore = wallsForCapture(materialResolver, viewerStore, event?.wholeWalls === true);
         };
         const reapplyAfterCapture = () => {
-            snapshot.forEach((mat, mesh) => {
-                mesh.material = mat;
-            });
-            snapshot.clear();
+            restore?.();
+            restore = null;
         };
         emitter.on('thumbnail:before-capture', restoreForCapture);
         emitter.on('thumbnail:after-capture', reapplyAfterCapture);
@@ -71,6 +85,6 @@ export const WallCutout = ({ viewerStore = useViewer, }) => {
             emitter.off('thumbnail:before-capture', restoreForCapture);
             emitter.off('thumbnail:after-capture', reapplyAfterCapture);
         };
-    }, [viewerStore]);
+    }, [viewerStore, materialResolver]);
     return null;
 };

package/dist/systems/wall/wall-finish-data.d.ts

@@ -0,0 +1,22 @@
+import type { BufferGeometry } from 'three';
+/** A run of one face's base, in wall-local x (m) and local y. */
+export type WallFaceBaseRun = {
+    start: number;
+    end: number;
+    y: number;
+};
+/**
+ * What the wall's material array and the paint resolver need from a build: the
+ * finish refs behind material indices 3.. and each face's base runs (null when
+ * both faces stand on the wall's own base).
+ */
+export type WallFinishGeometryData = {
+    refs: readonly string[];
+    faceBase: Record<'a' | 'b', WallFaceBaseRun[]> | null;
+};
+export declare function getWallFinishData(geometry: BufferGeometry | undefined | null): WallFinishGeometryData | undefined;
+/** Finish refs a built wall geometry's material indices 3.. point at. */
+export declare function getWallFinishRefs(geometry: BufferGeometry | undefined | null): readonly string[];
+/** Local y of a face's base at wall-local station `x` (0 when the faces share the wall base). */
+export declare function getWallFaceBaseAt(data: Pick<WallFinishGeometryData, 'faceBase'> | undefined, face: 'a' | 'b', x: number): number;
+//# sourceMappingURL=wall-finish-data.d.ts.map

package/dist/systems/wall/wall-finish-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wall-finish-data.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-finish-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAE3C,iEAAiE;AACjE,MAAM,MAAM,eAAe,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAEvE;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAC,GAAG,GAAG,GAAG,EAAE,eAAe,EAAE,CAAC,GAAG,IAAI,CAAA;CACtD,CAAA;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,GAC1C,sBAAsB,GAAG,SAAS,CAEpC;AAED,yEAAyE;AACzE,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,MAAM,EAAE,CAEhG;AAED,iGAAiG;AACjG,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,GAAG,SAAS,EAC1D,IAAI,EAAE,GAAG,GAAG,GAAG,EACf,CAAC,EAAE,MAAM,GACR,MAAM,CAKR"}

package/dist/systems/wall/wall-finish-data.js

@@ -0,0 +1,17 @@
+export function getWallFinishData(geometry) {
+    return geometry?.userData.wallFinish;
+}
+/** Finish refs a built wall geometry's material indices 3.. point at. */
+export function getWallFinishRefs(geometry) {
+    return getWallFinishData(geometry)?.refs ?? [];
+}
+/** Local y of a face's base at wall-local station `x` (0 when the faces share the wall base). */
+export function getWallFaceBaseAt(data, face, x) {
+    const runs = data?.faceBase?.[face];
+    if (!runs?.length)
+        return 0;
+    for (const run of runs)
+        if (x >= run.start && x < run.end)
+            return run.y;
+    return x < runs[0].start ? runs[0].y : runs.at(-1).y;
+}

package/dist/systems/wall/wall-materials.d.ts

@@ -11,7 +11,16 @@ export interface WallMaterials {
     deleteInvisible: WallMaterialArray;
     deleteTranslucent: WallMaterialArray;
     materialHash: string;
+    ownedVisible?: Material[];
 }
+export type WallMaterialOverride = {
+    hash: string;
+    create: () => {
+        visible: WallMaterialArray;
+        owned?: Material[];
+    };
+};
+export type WallMaterialsResolver = (wallNode: WallNode, shading?: RenderShading, textures?: boolean, colorPreset?: ColorPreset, sceneTheme?: string, sceneMaterials?: SceneMaterials, finishRefs?: readonly string[]) => WallMaterials;
 /** Lazy light-emissive selection variant of a wall's material array (keeps texture). */
 export declare function getSelectionHighlightMaterials(materials: WallMaterialArray): WallMaterialArray;
 /**
@@ -20,8 +29,13 @@ export declare function getSelectionHighlightMaterials(materials: WallMaterialAr
  * film so the wall the click would select reads under the cursor).
  */
 export declare function getHoverHighlightMaterials(materials: WallMaterialArray): WallMaterialArray;
-export declare function getWallMaterialHash(wallNode: WallNode, shading: RenderShading, sceneMaterials?: SceneMaterials): string;
-export declare function getMaterialsForWall(wallNode: WallNode, shading?: RenderShading, textures?: boolean, colorPreset?: ColorPreset, sceneTheme?: string, sceneMaterials?: SceneMaterials): WallMaterials;
-export declare function getVisibleWallMaterials(wallNode: WallNode, shading?: RenderShading, textures?: boolean, colorPreset?: ColorPreset, sceneTheme?: string, sceneMaterials?: SceneMaterials): WallMaterialArray;
+export declare function getWallMaterialHash(wallNode: WallNode, shading: RenderShading, sceneMaterials?: SceneMaterials, finishRefs?: readonly string[], overrideHash?: string): string;
+/**
+ * A wall's material palette: 0 caps/edges (themed role), 1 face a, 2 face b,
+ * then one entry per `finishRefs` — the region and room finishes the built
+ * geometry's groups point at (`getWallFinishRefs(mesh.geometry)`).
+ */
+export declare function getMaterialsForWall(wallNode: WallNode, shading?: RenderShading, textures?: boolean, colorPreset?: ColorPreset, sceneTheme?: string, sceneMaterials?: SceneMaterials, finishRefs?: readonly string[], override?: WallMaterialOverride): WallMaterials;
+export declare function getVisibleWallMaterials(wallNode: WallNode, shading?: RenderShading, textures?: boolean, colorPreset?: ColorPreset, sceneTheme?: string, sceneMaterials?: SceneMaterials, finishRefs?: readonly string[]): WallMaterialArray;
 export {};
 //# sourceMappingURL=wall-materials.d.ts.map

package/dist/systems/wall/wall-materials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wall-materials.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-materials.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,aAAa,EAClB,KAAK,eAAe,EAGpB,KAAK,QAAQ,EAId,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAS,KAAK,QAAQ,EAAE,MAAM,OAAO,CAAA;AAG5C,OAAO,EAEL,KAAK,WAAW,EAMhB,KAAK,aAAa,EAGnB,MAAM,qBAAqB,CAAA;AAE5B,KAAK,cAAc,GAAG,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GAAG,SAAS,CAAA;AAexE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,EAAE,CAAA;AAE1C,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,iBAAiB,CAAA;IAC1B,SAAS,EAAE,iBAAiB,CAAA;IAC5B,WAAW,EAAE,iBAAiB,CAAA;IAC9B,aAAa,EAAE,iBAAiB,CAAA;IAChC,eAAe,EAAE,iBAAiB,CAAA;IAClC,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,YAAY,EAAE,MAAM,CAAA;CACrB;AA+SD,wFAAwF;AACxF,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,iBAAiB,GAAG,iBAAiB,CAS9F;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,iBAAiB,GAAG,iBAAiB,CAS1F;AA4DD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,aAAa,EACtB,cAAc,CAAC,EAAE,cAAc,GAC9B,MAAM,CAcR;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,cAAc,GAC9B,aAAa,CAgIf;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,cAAc,GAC9B,iBAAiB,CAGnB"}
+{"version":3,"file":"wall-materials.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-materials.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,aAAa,EAClB,KAAK,eAAe,EAGpB,KAAK,QAAQ,EAGd,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAS,KAAK,QAAQ,EAAE,MAAM,OAAO,CAAA;AAG5C,OAAO,EAEL,KAAK,WAAW,EAMhB,KAAK,aAAa,EAInB,MAAM,qBAAqB,CAAA;AAE5B,KAAK,cAAc,GAAG,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GAAG,SAAS,CAAA;AAexE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,EAAE,CAAA;AAE1C,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,iBAAiB,CAAA;IAC1B,SAAS,EAAE,iBAAiB,CAAA;IAC5B,WAAW,EAAE,iBAAiB,CAAA;IAC9B,aAAa,EAAE,iBAAiB,CAAA;IAChC,eAAe,EAAE,iBAAiB,CAAA;IAClC,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAA;CAC1B;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM;QAAE,OAAO,EAAE,iBAAiB,CAAC;QAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAA;KAAE,CAAA;CACjE,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,CAClC,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,aAAa,EACvB,QAAQ,CAAC,EAAE,OAAO,EAClB,WAAW,CAAC,EAAE,WAAW,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,cAAc,EAC/B,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,KAC3B,aAAa,CAAA;AA2QlB,wFAAwF;AACxF,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,iBAAiB,GAAG,iBAAiB,CAS9F;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,iBAAiB,GAAG,iBAAiB,CAS1F;AA4DD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,aAAa,EACtB,cAAc,CAAC,EAAE,cAAc,EAC/B,UAAU,GAAE,SAAS,MAAM,EAAO,EAClC,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CAQR;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,cAAc,EAC/B,UAAU,GAAE,SAAS,MAAM,EAAO,EAClC,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,aAAa,CAmFf;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,cAAc,EAC/B,UAAU,GAAE,SAAS,MAAM,EAAO,GACjC,iBAAiB,CAUnB"}