@pascal-app/viewer 1.0.3 → 1.0.4

package/dist/systems/item-light/item-light-system.js

@@ -1,8 +1,9 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { findLevelAncestorId, sceneRegistry, useInteractive, useScene } from '@pascal-app/core';
-import { useFrame } from '@react-three/fiber';
+import { findLevelAncestorId, sceneRegistry, useScene } from '@pascal-app/core';
+import { useFrame, useThree } from '@react-three/fiber';
 import { useRef } from 'react';
 import { MathUtils, Vector3 } from 'three';
+import { SCENE_LAYER } from '../../lib/layers';
 import { useItemLightPool } from '../../store/use-item-light-pool';
 import useViewer from '../../store/use-viewer';
 const POOL_SIZE = 12;
@@ -19,22 +20,30 @@ const _dir = new Vector3();
 const _camPos = new Vector3();
 const _camFwd = new Vector3();
 const _itemPos = new Vector3();
-function scoreRegistration(reg, nodes, selectedLevelId, levelMode, interactiveState) {
-    // Skip lights that are toggled off — they contribute no illumination
-    if (reg.toggleIndex >= 0) {
-        const values = interactiveState.items[reg.nodeId]?.controlValues;
-        const isOn = Boolean(values?.[reg.toggleIndex]);
-        if (!isOn)
+function isRendered(nodeId) {
+    let object = sceneRegistry.nodes.get(nodeId);
+    if (!object?.layers.isEnabled(SCENE_LAYER))
+        return false;
+    while (object) {
+        if (!object.visible)
+            return false;
+        object = object.parent;
+    }
+    return true;
+}
+function scoreRegistration(reg, nodes, selectedLevelId, levelMode, hideAbove) {
+    if (!reg.isEligible() || !isRendered(reg.nodeId) || !reg.getWorldPosition(_itemPos))
+        return Number.POSITIVE_INFINITY;
+    const { nodeId } = reg;
+    let current = nodes[nodeId];
+    while (current) {
+        if (current.type !== 'site' && current.visible === false)
             return Number.POSITIVE_INFINITY;
+        current = current.parentId ? nodes[current.parentId] : undefined;
     }
-    const { nodeId, effect } = reg;
-    const obj = sceneRegistry.nodes.get(nodeId);
-    if (!obj)
+    const itemLevelId = findLevelAncestorId(nodeId, nodes);
+    if (selectedLevelId && itemLevelId !== selectedLevelId && levelMode === 'solo')
         return Number.POSITIVE_INFINITY;
-    obj.getWorldPosition(_itemPos);
-    _itemPos.x += effect.offset[0];
-    _itemPos.y += effect.offset[1];
-    _itemPos.z += effect.offset[2];
     _dir.copy(_itemPos).sub(_camPos).normalize();
     const dot = _camFwd.dot(_dir); // 1 = ahead, -1 = behind
     // Angular component (0 = dead ahead, 2 = directly behind)
@@ -42,12 +51,15 @@ function scoreRegistration(reg, nodes, selectedLevelId, levelMode, interactiveSt
     // Normalised distance component (assumes scenes < 200 units)
     const dist = _camPos.distanceTo(_itemPos) / 200;
     // ── Level factor ──────────────────────────────────────────────────────────
-    const itemLevelId = findLevelAncestorId(nodeId, nodes);
     let levelPenalty = 0;
     if (selectedLevelId) {
         if (itemLevelId !== selectedLevelId) {
-            // In solo mode items on other levels are invisible — deprioritize strongly
-            levelPenalty = levelMode === 'solo' ? 100 : 0.8;
+            // Items on hidden levels (every other one in solo, those above the
+            // selected one while editing) are invisible — deprioritize strongly
+            const itemIndex = nodes[itemLevelId]?.level ?? 0;
+            const selectedIndex = nodes[selectedLevelId]?.level ?? 0;
+            const hidden = levelMode === 'solo' || (hideAbove && itemIndex > selectedIndex);
+            levelPenalty = hidden ? 100 : 0.8;
         }
     }
     else if (itemLevelId) {
@@ -60,6 +72,8 @@ function scoreRegistration(reg, nodes, selectedLevelId, levelMode, interactiveSt
     return angular * 0.7 + dist * 0.3 + levelPenalty;
 }
 export function ItemLightSystem() {
+    const scene = useThree((state) => state.scene);
+    const bakedOwner = useItemLightPool((state) => state.bakedCanvases.has(scene));
     const lightRefs = useRef(Array.from({ length: POOL_SIZE }, () => null));
     const slots = useRef(Array.from({ length: POOL_SIZE }, () => ({ key: null, pendingKey: null, isFadingOut: false })));
     const reassignTimer = useRef(0);
@@ -67,9 +81,10 @@ export function ItemLightSystem() {
     const prevReassignCamPos = useRef(new Vector3());
     const prevReassignCamFwd = useRef(new Vector3(0, 0, -1));
     useFrame(({ camera }, delta) => {
+        if (bakedOwner)
+            return;
         const dt = Math.min(delta, 0.1);
         const { registrations } = useItemLightPool.getState();
-        const interactiveState = useInteractive.getState();
         // ── 1. Throttled priority reassignment ──────────────────────────────────
         camera.getWorldPosition(_camPos);
         camera.getWorldDirection(_camFwd);
@@ -86,12 +101,13 @@ export function ItemLightSystem() {
             const viewerState = useViewer.getState();
             const selectedLevelId = viewerState.selection.levelId;
             const levelMode = viewerState.levelMode;
+            const hideAbove = viewerState.hideLevelsAboveSelection;
             // Score every registration
             const scored = [];
             for (const [key, reg] of registrations) {
                 scored.push({
                     key,
-                    score: scoreRegistration(reg, nodes, selectedLevelId, levelMode, interactiveState),
+                    score: scoreRegistration(reg, nodes, selectedLevelId, levelMode, hideAbove),
                 });
             }
             scored.sort((a, b) => a.score - b.score);
@@ -155,8 +171,8 @@ export function ItemLightSystem() {
                         const light = lightRefs.current[freeSlot];
                         const reg = registrations.get(key);
                         if (light && reg) {
-                            light.color.set(reg.effect.color);
-                            light.distance = reg.effect.distance ?? 0;
+                            light.color.set(reg.color);
+                            light.distance = reg.distance;
                         }
                     }
                 }
@@ -183,19 +199,17 @@ export function ItemLightSystem() {
                 continue;
             // Fade-out phase: lerp intensity → 0, then complete the transition
             if (slot.isFadingOut) {
-                light.visible = true;
                 light.intensity = MathUtils.lerp(light.intensity, 0, dt * 12);
                 if (light.intensity < 0.01) {
                     light.intensity = 0;
-                    light.visible = false;
                     slot.isFadingOut = false;
                     slot.key = slot.pendingKey;
                     slot.pendingKey = null;
                     if (slot.key) {
                         const reg = registrations.get(slot.key);
                         if (reg) {
-                            light.color.set(reg.effect.color);
-                            light.distance = reg.effect.distance ?? 0;
+                            light.color.set(reg.color);
+                            light.distance = reg.distance;
                         }
                     }
                 }
@@ -204,45 +218,26 @@ export function ItemLightSystem() {
             if (!slot.key) {
                 // Idle slot — keep dark
                 light.intensity = 0;
-                light.visible = false;
                 continue;
             }
             const reg = registrations.get(slot.key);
             if (!reg) {
                 slot.key = null;
                 light.intensity = 0;
-                light.visible = false;
                 continue;
             }
-            // Snap world position each frame
-            const obj = sceneRegistry.nodes.get(reg.nodeId);
-            if (obj) {
-                obj.getWorldPosition(_itemPos);
-                const [ox, oy, oz] = reg.effect.offset;
-                light.position.set(_itemPos.x + ox, _itemPos.y + oy, _itemPos.z + oz);
-            }
-            // Compute target intensity
-            const values = interactiveState.items[reg.nodeId]?.controlValues;
-            const isOn = reg.toggleIndex >= 0 ? Boolean(values?.[reg.toggleIndex]) : true;
-            let t = 1;
-            if (reg.hasSlider) {
-                const raw = values?.[reg.sliderIndex] ?? reg.sliderMin;
-                t = (raw - reg.sliderMin) / (reg.sliderMax - reg.sliderMin);
-            }
-            const targetIntensity = isOn
-                ? MathUtils.lerp(reg.effect.intensityRange[0], reg.effect.intensityRange[1], t)
-                : reg.effect.intensityRange[0];
-            if (targetIntensity > 0) {
-                light.visible = true;
-            }
+            if (reg.getWorldPosition(_itemPos))
+                light.position.copy(_itemPos);
+            const targetIntensity = reg.isEligible() && isRendered(reg.nodeId) ? reg.getIntensity() : 0;
             light.intensity = MathUtils.lerp(light.intensity, targetIntensity, dt * 12);
             if (targetIntensity <= 0 && light.intensity < 0.01) {
                 light.intensity = 0;
-                light.visible = false;
             }
         }
-    });
-    return (_jsx(_Fragment, { children: Array.from({ length: POOL_SIZE }, (_, i) => (_jsx("pointLight", { castShadow: false, intensity: 0, visible: false, ref: (el) => {
+    }, 6);
+    if (bakedOwner)
+        return null;
+    return (_jsx(_Fragment, { children: Array.from({ length: POOL_SIZE }, (_, i) => (_jsx("pointLight", { castShadow: false, intensity: 0, visible: true, ref: (el) => {
                 lightRefs.current[i] = el;
             } }, i))) }));
 }

package/dist/systems/level/level-system.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"level-system.d.ts","sourceRoot":"","sources":["../../../src/systems/level/level-system.tsx"],"names":[],"mappings":"AAcA,eAAO,MAAM,WAAW,YA6DvB,CAAA"}
+{"version":3,"file":"level-system.d.ts","sourceRoot":"","sources":["../../../src/systems/level/level-system.tsx"],"names":[],"mappings":"AAQA,eAAO,MAAM,WAAW,YA+DvB,CAAA"}

package/dist/systems/level/level-system.js

@@ -4,15 +4,12 @@ import { lerp } from 'three/src/math/MathUtils.js';
 import { applyShadowOnly, clearShadowOnly } from '../../lib/shadow-only';
 import useViewer from '../../store/use-viewer';
 import { EXPLODED_GAP, resolveLevelVisibility } from './level-utils';
-// Levels currently in shadow-caster-only mode (solo hides them from the color
-// passes but keeps their sun shadows). Tracked so we can restore layer masks
-// exactly once on transition; apply re-runs every frame so meshes rebuilt
-// while hidden (theme/texture changes) get re-hidden.
-const shadowOnlyLevels = new WeakSet();
+import { shadowOnlyLevels } from './shadow-only-levels';
 export const LevelSystem = () => {
     useFrame((_, delta) => {
         const nodes = useScene.getState().nodes;
         const levelMode = useViewer.getState().levelMode;
+        const hideAbove = useViewer.getState().hideLevelsAboveSelection;
         const selectedLevel = useViewer.getState().selection.levelId;
         const levelElevations = getLevelElevations(nodes);
         const entries = [];
@@ -44,6 +41,7 @@ export const LevelSystem = () => {
             obj.position.y = lerp(obj.position.y, targetY, Math.min(1, delta * 12));
             const { visible, shadowOnly } = resolveLevelVisibility({
                 levelMode,
+                hideAbove,
                 hasSelectedLevel: Boolean(selectedLevel),
                 isSelected: level?.id === selectedLevel,
                 index,

package/dist/systems/level/level-utils.d.ts

@@ -12,14 +12,17 @@ export declare function getLevelPresentationY(levelId: string, nodes: Record<str
  * shadow-caster only.
  *
  * Two unrelated things hide a level and they do not compose: the author's own
- * `visible` flag (the sidebar eye), which hides the floor outright, and solo
- * mode, which hides every level but the soloed one — keeping the levels ABOVE
- * it in the shadow map so the sun still shadows the soloed floor through them.
+ * `visible` flag (the sidebar eye), which hides the floor outright, and
+ * presentation hiding — solo mode hides every level but the soloed one, and
+ * the editor's level display (`hideAbove`) hides the levels above the
+ * selected one. Presentation-hidden levels ABOVE the selected one stay in the
+ * shadow map so the sun still shadows the selected floor through them.
  * A level the author hid never enters that shadow-caster branch: its shadows
  * on the floor below would be exactly what hiding it was meant to remove.
  */
-export declare function resolveLevelVisibility({ levelMode, hasSelectedLevel, isSelected, index, selectedIndex, nodeVisible, }: {
+export declare function resolveLevelVisibility({ levelMode, hideAbove, hasSelectedLevel, isSelected, index, selectedIndex, nodeVisible, }: {
     levelMode: 'stacked' | 'exploded' | 'solo' | 'manual';
+    hideAbove: boolean;
     hasSelectedLevel: boolean;
     isSelected: boolean;
     index: number;

package/dist/systems/level/level-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"level-utils.d.ts","sourceRoot":"","sources":["../../../src/systems/level/level-utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY,IAAI,CAAA;AAE7B;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,SAAS,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GACpD,MAAM,CAKR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,SAAS,EACT,gBAAgB,EAChB,UAAU,EACV,KAAK,EACL,aAAa,EACb,WAAW,GACZ,EAAE;IACD,SAAS,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAA;IACrD,gBAAgB,EAAE,OAAO,CAAA;IACzB,UAAU,EAAE,OAAO,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAM5C;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,IAAI,CA2CtD"}
+{"version":3,"file":"level-utils.d.ts","sourceRoot":"","sources":["../../../src/systems/level/level-utils.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,IAAI,CAAA;AAE7B;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,SAAS,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GACpD,MAAM,CAKR;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,UAAU,EACV,KAAK,EACL,aAAa,EACb,WAAW,GACZ,EAAE;IACD,SAAS,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAA;IACrD,SAAS,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE,OAAO,CAAA;IACzB,UAAU,EAAE,OAAO,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAQ5C;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,IAAI,CA+CtD"}

package/dist/systems/level/level-utils.js

@@ -1,4 +1,6 @@
 import { getLevelElevations, sceneRegistry, useScene } from '@pascal-app/core';
+import { applyShadowOnly, clearShadowOnly } from '../../lib/shadow-only';
+import { shadowOnlyLevels } from './shadow-only-levels';
 export const EXPLODED_GAP = 5;
 /**
  * The Y a level settles at under the given presentation mode — its stacked
@@ -18,16 +20,19 @@ export function getLevelPresentationY(levelId, nodes, levelMode) {
  * shadow-caster only.
  *
  * Two unrelated things hide a level and they do not compose: the author's own
- * `visible` flag (the sidebar eye), which hides the floor outright, and solo
- * mode, which hides every level but the soloed one — keeping the levels ABOVE
- * it in the shadow map so the sun still shadows the soloed floor through them.
+ * `visible` flag (the sidebar eye), which hides the floor outright, and
+ * presentation hiding — solo mode hides every level but the soloed one, and
+ * the editor's level display (`hideAbove`) hides the levels above the
+ * selected one. Presentation-hidden levels ABOVE the selected one stay in the
+ * shadow map so the sun still shadows the selected floor through them.
  * A level the author hid never enters that shadow-caster branch: its shadows
  * on the floor below would be exactly what hiding it was meant to remove.
  */
-export function resolveLevelVisibility({ levelMode, hasSelectedLevel, isSelected, index, selectedIndex, nodeVisible, }) {
+export function resolveLevelVisibility({ levelMode, hideAbove, hasSelectedLevel, isSelected, index, selectedIndex, nodeVisible, }) {
     if (!nodeVisible)
         return { visible: false, shadowOnly: false };
-    const hidden = levelMode === 'solo' && hasSelectedLevel && !isSelected;
+    const hidden = (levelMode === 'solo' && hasSelectedLevel && !isSelected) ||
+        (hideAbove && selectedIndex !== undefined && index > selectedIndex);
     const shadowOnly = hidden && selectedIndex !== undefined && index > selectedIndex;
     return { visible: shadowOnly || !hidden, shadowOnly };
 }
@@ -62,11 +67,15 @@ export function snapLevelsToTruePositions() {
     const levelElevations = getLevelElevations(nodes);
     // Snapshot current Y and visibility so we can restore them after the render
     const snapshot = new Map(entries.map(({ levelId, obj }) => [levelId, { y: obj.position.y, visible: obj.visible }]));
-    // Snap to true stacked positions and undo presentation hiding
+    // Snap to true stacked positions and undo presentation hiding — including
+    // the levels kept shadow-caster-only above the selected level.
+    const shadowOnly = entries.filter(({ obj }) => shadowOnlyLevels.has(obj));
     for (const { levelId, obj, nodeVisible } of entries) {
         obj.position.y = levelElevations.get(levelId)?.baseY ?? 0;
         obj.visible = nodeVisible;
     }
+    for (const { obj } of shadowOnly)
+        clearShadowOnly(obj);
     return () => {
         for (const { levelId, obj } of entries) {
             const saved = snapshot.get(levelId);
@@ -75,5 +84,7 @@ export function snapLevelsToTruePositions() {
                 obj.visible = saved.visible;
             }
         }
+        for (const { obj } of shadowOnly)
+            applyShadowOnly(obj);
     };
 }

package/dist/systems/level/shadow-only-levels.d.ts

@@ -0,0 +1,9 @@
+import type { Object3D } from 'three';
+/**
+ * Levels currently in shadow-caster-only mode (hidden above the selected level
+ * by solo or by the editor's level display). Tracked so layer masks are
+ * restored exactly once on transition, and so a full-building capture can
+ * show them for its one render.
+ */
+export declare const shadowOnlyLevels: WeakSet<Object3D<import("three").Object3DEventMap>>;
+//# sourceMappingURL=shadow-only-levels.d.ts.map

package/dist/systems/level/shadow-only-levels.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shadow-only-levels.d.ts","sourceRoot":"","sources":["../../../src/systems/level/shadow-only-levels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAErC;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,qDAA0B,CAAA"}

package/dist/systems/level/shadow-only-levels.js

@@ -0,0 +1,7 @@
+/**
+ * Levels currently in shadow-caster-only mode (hidden above the selected level
+ * by solo or by the editor's level display). Tracked so layer masks are
+ * restored exactly once on transition, and so a full-building capture can
+ * show them for its one render.
+ */
+export const shadowOnlyLevels = new WeakSet();

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

@@ -1,6 +1,18 @@
-import { type RoofNode } from '@pascal-app/core';
+import { type AnyNode, type RoofNode, type SceneMaterial, type SceneMaterialId } from '@pascal-app/core';
 import type * as THREE from 'three';
 import { type ColorPreset, type RenderShading } from '../../lib/materials';
+type SceneMaterials = Record<SceneMaterialId, SceneMaterial> | undefined;
 export type RoofMaterialArray = [THREE.Material, THREE.Material, THREE.Material, THREE.Material];
-export declare function getRoofMaterialArray(node: RoofNode, shading?: RenderShading, textures?: boolean, colorPreset?: ColorPreset, sceneTheme?: string): RoofMaterialArray | null;
+/**
+ * The cladding the walls under a roof declare through their ASSEMBLIES
+ * (`wall.assembly.exterior.finish` → catalog ref), so the roof's gable band —
+ * the triangle of wall above the plate that the roof kind builds — is skinned
+ * like the walls it sits on instead of the bare drywall default. The most
+ * common ref among the level's walls wins; null when none declares one.
+ */
+export declare function levelWallCladdingRef(nodes: Readonly<Record<string, AnyNode | undefined>>, roof: Pick<RoofNode, 'parentId'>): string | null;
+export declare function getRoofMaterialArray(node: RoofNode, shading?: RenderShading, textures?: boolean, colorPreset?: ColorPreset, sceneTheme?: string, 
+/** Catalog ref for the gable/trim band when unpainted — see `levelWallCladdingRef`. */
+wallCladdingRef?: string | null, sceneMaterials?: SceneMaterials): RoofMaterialArray | null;
+export {};
 //# sourceMappingURL=roof-materials.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"roof-materials.d.ts","sourceRoot":"","sources":["../../../src/systems/roof/roof-materials.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,kBAAkB,CAAA;AACzB,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAA;AACnC,OAAO,EACL,KAAK,WAAW,EAIhB,KAAK,aAAa,EAEnB,MAAM,qBAAqB,CAAA;AAa5B,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;AA6BhG,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,QAAQ,EACd,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM,GAClB,iBAAiB,GAAG,IAAI,CAsE1B"}
+{"version":3,"file":"roof-materials.d.ts","sourceRoot":"","sources":["../../../src/systems/roof/roof-materials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAGZ,KAAK,QAAQ,EAEb,KAAK,aAAa,EAClB,KAAK,eAAe,EAErB,MAAM,kBAAkB,CAAA;AACzB,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAA;AACnC,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,aAAa,EAGnB,MAAM,qBAAqB,CAAA;AAE5B,KAAK,cAAc,GAAG,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC,GAAG,SAAS,CAAA;AAaxE,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;AAqChG;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC,EACpD,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,GAC/B,MAAM,GAAG,IAAI,CAkBf;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,QAAQ,EACd,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM;AACnB,uFAAuF;AACvF,eAAe,GAAE,MAAM,GAAG,IAAW,EACrC,cAAc,CAAC,EAAE,cAAc,GAC9B,iBAAiB,GAAG,IAAI,CAyE1B"}

package/dist/systems/roof/roof-materials.js

@@ -1,5 +1,5 @@
-import { getEffectiveRoofSurfaceMaterial, } from '@pascal-app/core';
-import { createMaterial, createMaterialFromPresetRef, createSurfaceRoleMaterial, resolveSlotDefaultMaterial, } from '../../lib/materials';
+import { getEffectiveRoofSurfaceMaterial, parseMaterialRef, wallAssemblyFinishRef, } from '@pascal-app/core';
+import { createMaterial, createSurfaceRoleMaterial, resolveMaterialRef, resolveSlotDefaultMaterial, } from '../../lib/materials';
 // Declared catalog defaults for an unpainted roof, per the 4-slot layout
 // (0 wall/trim · 1 deck · 2 interior soffit · 3 shingle top). The wall/trim
 // band mirrors the wall kind's default (WALL_SLOT_DEFAULT = concrete-drywall)
@@ -11,22 +11,59 @@ const ROOF_DEFAULT_REFS = [
     'library:roof-terracottatiles',
 ];
 const roofMaterialArrayCache = new Map();
-function getSurfaceMaterialSignature(spec) {
+function getSurfaceMaterialSignature(spec, sceneMaterials) {
+    const ref = parseMaterialRef(spec.materialPreset);
     return JSON.stringify({
         material: spec.material ?? null,
         materialPreset: spec.materialPreset ?? null,
+        sceneMaterial: ref?.kind === 'scene'
+            ? (sceneMaterials?.[ref.id]?.material ?? null)
+            : null,
     });
 }
-function createResolvedMaterial(material, materialPreset, shading) {
-    if (materialPreset) {
-        return createMaterialFromPresetRef(materialPreset, shading);
-    }
+function createResolvedMaterial(material, materialPreset, sceneMaterials, shading) {
+    // An unknown or dangling ref resolves to nothing: fall through to the
+    // colour, then the slot default, as the segment renderer does.
+    const preset = resolveMaterialRef(materialPreset, sceneMaterials, shading);
+    if (preset)
+        return preset;
     if (material) {
         return createMaterial(material, shading);
     }
     return null;
 }
-export function getRoofMaterialArray(node, shading = 'rendered', textures = true, colorPreset = 'clay', sceneTheme) {
+/**
+ * The cladding the walls under a roof declare through their ASSEMBLIES
+ * (`wall.assembly.exterior.finish` → catalog ref), so the roof's gable band —
+ * the triangle of wall above the plate that the roof kind builds — is skinned
+ * like the walls it sits on instead of the bare drywall default. The most
+ * common ref among the level's walls wins; null when none declares one.
+ */
+export function levelWallCladdingRef(nodes, roof) {
+    const levelId = roof.parentId;
+    if (!levelId)
+        return null;
+    const counts = new Map();
+    for (const node of Object.values(nodes)) {
+        if (node?.type !== 'wall' || node.parentId !== levelId)
+            continue;
+        const ref = wallAssemblyFinishRef(node);
+        if (ref)
+            counts.set(ref, (counts.get(ref) ?? 0) + 1);
+    }
+    let best = null;
+    let bestCount = 0;
+    for (const [ref, count] of counts) {
+        if (count > bestCount) {
+            best = ref;
+            bestCount = count;
+        }
+    }
+    return best;
+}
+export function getRoofMaterialArray(node, shading = 'rendered', textures = true, colorPreset = 'clay', sceneTheme, 
+/** Catalog ref for the gable/trim band when unpainted — see `levelWallCladdingRef`. */
+wallCladdingRef = null, sceneMaterials) {
     const top = getEffectiveRoofSurfaceMaterial(node, 'top');
     const edge = getEffectiveRoofSurfaceMaterial(node, 'edge');
     const wall = getEffectiveRoofSurfaceMaterial(node, 'wall');
@@ -35,9 +72,10 @@ export function getRoofMaterialArray(node, shading = 'rendered', textures = true
         textures,
         colorPreset,
         sceneTheme,
-        top: getSurfaceMaterialSignature(top),
-        edge: getSurfaceMaterialSignature(edge),
-        wall: getSurfaceMaterialSignature(wall),
+        wallCladdingRef,
+        top: getSurfaceMaterialSignature(top, sceneMaterials),
+        edge: getSurfaceMaterialSignature(edge, sceneMaterials),
+        wall: getSurfaceMaterialSignature(wall, sceneMaterials),
     });
     const cached = roofMaterialArrayCache.get(cacheKey);
     if (cached)
@@ -63,14 +101,15 @@ export function getRoofMaterialArray(node, shading = 'rendered', textures = true
     // shingle, soft-white deck/soffit, wall-coloured trim). Used both when the
     // roof is unpainted and to fill any individual unpainted slot below.
     const defaultArray = [
-        resolveSlotDefaultMaterial(ROOF_DEFAULT_REFS[0], shading),
+        resolveSlotDefaultMaterial(wallCladdingRef ?? ROOF_DEFAULT_REFS[0], shading),
         resolveSlotDefaultMaterial(ROOF_DEFAULT_REFS[1], shading),
         resolveSlotDefaultMaterial(ROOF_DEFAULT_REFS[2], shading),
         resolveSlotDefaultMaterial(ROOF_DEFAULT_REFS[3], shading),
     ];
-    const topMaterial = createResolvedMaterial(top.material, top.materialPreset, shading);
-    const edgeMaterial = createResolvedMaterial(edge.material, edge.materialPreset, shading);
-    const wallMaterial = createResolvedMaterial(wall.material, wall.materialPreset, shading);
+    const resolve = (spec) => createResolvedMaterial(spec.material, spec.materialPreset, sceneMaterials, shading);
+    const topMaterial = resolve(top);
+    const edgeMaterial = resolve(edge);
+    const wallMaterial = resolve(wall);
     if (!(topMaterial || edgeMaterial || wallMaterial)) {
         roofMaterialArrayCache.set(cacheKey, defaultArray);
         return defaultArray;

package/dist/systems/roof/roof-system.d.ts

@@ -1,6 +1,14 @@
 import { type AnyNode, type RoofSegmentNode } from '@pascal-app/core';
 import * as THREE from 'three';
 import { Brush } from 'three-bvh-csg';
+/**
+ * Roofs whose merged shell is still to build: until it is, the roof shows its segments apart (or
+ * an old shell), and a capture would show that. Only roofs on screen count, a first merge (a
+ * mounted group with no shell yet) included: one never mounted stays queued and would hold every
+ * capture.
+ */
+export declare function getPendingRoofMergeCount(): number;
+export declare function countPendingRoofShells(pending: Iterable<string>, mounted: (id: string) => THREE.Object3D | undefined): number;
 export declare const RoofSystem: () => null;
 /**
  * Four dummy materials used as identity placeholders during CSG. Shared
@@ -36,10 +44,12 @@ export declare function mapRoofGroupMaterialIndex(groupMaterialIndex: number | u
  */
 export declare function clipGeometryBySegmentTrim(geometry: THREE.BufferGeometry | null, segment: RoofSegmentNode): THREE.BufferGeometry | null;
 /**
- * Generate complete hollow-shell geometry for a roof segment.
- * Ports the prototype's CSG approach using three-bvh-csg.
+ * `fascia`: build the segment's fascia boards into its deck. Only the roof
+ * renderer asks; a dormer, a chimney or a sibling's clip takes the bare shell.
  */
-export declare function getRoofSegmentBrushes(node: RoofSegmentNode): RoofSegmentBrushSet | null;
+export declare function getRoofSegmentBrushes(node: RoofSegmentNode, options?: {
+    fascia?: boolean;
+}): RoofSegmentBrushSet | null;
 export declare function generateRoofSegmentGeometry(node: RoofSegmentNode, nodes?: Record<string, AnyNode>): THREE.BufferGeometry;
 export declare function remapRoofShellFaces(geometry: THREE.BufferGeometry, node: RoofSegmentNode): void;
 export type SurfaceFrame = {

package/dist/systems/roof/roof-system.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"roof-system.d.ts","sourceRoot":"","sources":["../../../src/systems/roof/roof-system.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAoBZ,KAAK,eAAe,EAQrB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAY,KAAK,EAA0B,MAAM,eAAe,CAAA;AAkMvE,eAAO,MAAM,UAAU,YAwItB,CAAA;AAgbD;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC7B,KAAK,CAAC,iBAAiB;IACvB,KAAK,CAAC,iBAAiB;IACvB,KAAK,CAAC,iBAAiB;IACvB,KAAK,CAAC,iBAAiB;CAMxB,CAAA;AAID,eAAO,MAAM,wBAAwB,IAAI,CAAA;AAEzC,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,KAAK,CAAA;IACf,QAAQ,EAAE,KAAK,CAAA;IACf,SAAS,EAAE,KAAK,CAAA;IAChB,UAAU,EAAE,KAAK,CAAA;IACjB,UAAU,EAAE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAA;CACxC,CAAA;AA0FD,wBAAgB,yBAAyB,CACvC,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,YAAY,EAAE,KAAK,CAAC,QAAQ,EAAE,EAC9B,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,GACtC,MAAM,CAuBR;AAoWD;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,IAAI,EACrC,OAAO,EAAE,eAAe,GACvB,KAAK,CAAC,cAAc,GAAG,IAAI,CAyB7B;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,eAAe,GAAG,mBAAmB,GAAG,IAAI,CA8TvF;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,eAAe,EACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,KAAK,CAAC,cAAc,CA2GtB;AAuyCD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,eAAe,QA0ExF;AA+qBD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAA;IACpB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAA;CACtB,CAAA;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,eAAe,EACxB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,GACT,YAAY,CAqLd"}
+{"version":3,"file":"roof-system.d.ts","sourceRoot":"","sources":["../../../src/systems/roof/roof-system.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAoBZ,KAAK,eAAe,EAQrB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAY,KAAK,EAA0B,MAAM,eAAe,CAAA;AAqIvE;;;;;GAKG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAIjD;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,EACzB,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,KAAK,CAAC,QAAQ,GAAG,SAAS,GAClD,MAAM,CAIR;AA+DD,eAAO,MAAM,UAAU,YAwItB,CAAA;AAgbD;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC7B,KAAK,CAAC,iBAAiB;IACvB,KAAK,CAAC,iBAAiB;IACvB,KAAK,CAAC,iBAAiB;IACvB,KAAK,CAAC,iBAAiB;CAMxB,CAAA;AAID,eAAO,MAAM,wBAAwB,IAAI,CAAA;AAEzC,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,KAAK,CAAA;IACf,QAAQ,EAAE,KAAK,CAAA;IACf,SAAS,EAAE,KAAK,CAAA;IAChB,UAAU,EAAE,KAAK,CAAA;IACjB,UAAU,EAAE,KAAK,CAAC,cAAc,GAAG,IAAI,CAAA;CACxC,CAAA;AA4FD,wBAAgB,yBAAyB,CACvC,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,YAAY,EAAE,KAAK,CAAC,QAAQ,EAAE,EAC9B,UAAU,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,GACtC,MAAM,CAuBR;AAuXD;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,KAAK,CAAC,cAAc,GAAG,IAAI,EACrC,OAAO,EAAE,eAAe,GACvB,KAAK,CAAC,cAAc,GAAG,IAAI,CAyB7B;AAoHD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,eAAe,EACrB,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACjC,mBAAmB,GAAG,IAAI,CAyV5B;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,eAAe,EACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,KAAK,CAAC,cAAc,CA6GtB;AAuyCD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,eAAe,QA0ExF;AAirBD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAA;IACpB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAA;CACtB,CAAA;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,eAAe,EACxB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,GACT,YAAY,CAqLd"}