@pascal-app/viewer 1.0.4 → 1.0.5

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

@@ -1,4 +1,4 @@
-import { getConicalRoofCoverage, getDutchEndSlopeFaces, getDutchRoofShapeMetrics, getEffectiveNode, getRoofModuleFaces, getRoofPlanBounds, getRoofSegmentSurfaceY, getRoofShapeInsets, getRoofShapeRatios, getSegmentSlopeFrame, hasSegmentMaterialOverride, isBandedShedSegment, nodeRegistry, normalizeRoofSegmentTrim, pointInPolygon2D, ROOF_SHAPE_DEFAULTS, roofOverlapEntryOwns, roofPlanBoundsOverlap, sceneRegistry, unionPolygons, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
+import { getBarrelRoofFaces, getBarrelRoofSolidPieces, getConicalRoofCoverage, getDutchEndSlopeFaces, getDutchRoofShapeMetrics, getEffectiveNode, getGlazedRoofFaces, getGlazedRoofPieceFaces, getGlazedRoofPieces, getRoofModuleFaces, getRoofPlanBounds, getRoofSegmentDeckReach, getRoofSegmentSurfaceY, getRoofShapeInsets, getRoofShapeRatios, getSegmentSlopeFrame, hasSegmentMaterialOverride, isBandedShedSegment, isGlazedRoofSegment, isIndependentRoofSegment, nodeRegistry, normalizeRoofSegmentTrim, pointInPolygon2D, ROOF_SHAPE_DEFAULTS, roofOverlapEntryOwns, roofPlanBoundsOverlap, sceneRegistry, unionPolygons, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
 import { useFrame } from '@react-three/fiber';
 import * as THREE from 'three';
 import { mergeGeometries, mergeVertices } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
@@ -6,6 +6,7 @@ import { ADDITION, Brush, Evaluator, SUBTRACTION } from 'three-bvh-csg';
 import { computeBoundsTree } from 'three-mesh-bvh';
 import { applyWorldScaleBoxUVs } from '../../lib/box-uv';
 import { ensureRenderableGeometryAttributes, subtractCsgBrush } from '../../lib/csg-utils';
+import { isRevealAssembling } from '../construction-reveal/construction-reveal';
 function csgGeometry(brush) {
     return brush.geometry;
 }
@@ -20,7 +21,7 @@ csgEvaluator.attributes = ['position', 'normal', 'uv', 'uv2'];
 function computeGeometryBoundsTree(geometry) {
     ;
     geometry.computeBoundsTree = computeBoundsTree;
-    geometry.computeBoundsTree({ maxLeafSize: 10 });
+    geometry.computeBoundsTree({ targetLeafSize: 10 });
 }
 function prepareBrushForCSG(brush) {
     ensureRenderableGeometryAttributes(brush.geometry);
@@ -108,10 +109,31 @@ function createDegenerateRoofPlaceholder() {
 }
 // Pending merged-roof updates carried across frames (for throttling)
 const pendingRoofUpdates = new Set();
+const pendingIndependentSegments = new Set();
 const previousRoofPlanBounds = new Map();
 const warnedMergedRoofNaNIds = new Set();
 const MAX_ROOFS_PER_FRAME = 1;
 const MAX_SEGMENTS_PER_FRAME = 3;
+/** What each roof's shell was last merged from: its node and its segments, as the store held them. */
+const mergedFrom = new Map();
+function rememberMergedInputs(roof, nodes) {
+    const inputs = new Map();
+    for (const id of [roof.id, ...(roof.children ?? [])]) {
+        const node = nodes[id];
+        if (node)
+            inputs.set(id, node);
+    }
+    mergedFrom.set(roof.id, inputs);
+}
+/** Whether nothing a roof's shell is made of has changed since it was merged. */
+function mergedFromStillHolds(roofId, nodes) {
+    const inputs = mergedFrom.get(roofId);
+    const roof = nodes[roofId];
+    if (!inputs || roof?.type !== 'roof')
+        return false;
+    const ids = [roofId, ...(roof.children ?? [])];
+    return ids.length === inputs.size && ids.every((id) => inputs.get(id) === nodes[id]);
+}
 /**
  * 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
@@ -119,7 +141,7 @@ const MAX_SEGMENTS_PER_FRAME = 3;
  * capture.
  */
 export function getPendingRoofMergeCount() {
-    return countPendingRoofShells(pendingRoofUpdates, (id) => sceneRegistry.nodes.get(id));
+    return countPendingRoofShells([...pendingRoofUpdates, ...pendingIndependentSegments], (id) => sceneRegistry.nodes.get(id));
 }
 export function countPendingRoofShells(pending, mounted) {
     let count = 0;
@@ -128,7 +150,19 @@ export function countPendingRoofShells(pending, mounted) {
             count++;
     return count;
 }
-function queueSiblingRoofUpdates(roofId, nodes) {
+function queueSiblingRoofUpdates(roofId, nodes, changedSegmentId) {
+    const queueIndependent = (roof) => {
+        for (const id of roof.children) {
+            const segment = nodes[id];
+            if (segment?.type === 'roof-segment' &&
+                segment.id !== changedSegmentId &&
+                isIndependentRoofSegment(getEffectiveNode(segment)))
+                pendingIndependentSegments.add(segment.id);
+        }
+    };
+    const currentRoof = nodes[roofId];
+    if (currentRoof?.type === 'roof')
+        queueIndependent(currentRoof);
     pendingRoofUpdates.add(roofId);
     const roof = nodes[roofId]?.type === 'roof' ? getEffectiveNode(nodes[roofId]) : undefined;
     if (roof?.type !== 'roof' || !roof.parentId)
@@ -186,13 +220,11 @@ function queueSiblingRoofUpdates(roofId, nodes) {
         if ((currentBounds && roofPlanBoundsOverlap(currentBounds, siblingBounds)) ||
             (oldBounds && roofPlanBoundsOverlap(oldBounds, siblingBounds))) {
             pendingRoofUpdates.add(sibling.id);
+            queueIndependent(sibling);
         }
     }
 }
-// ============================================================================
-// ROOF SYSTEM
-// ============================================================================
-export const RoofSystem = () => {
+export const RoofSystem = ({ geometryAdapter } = {}) => {
     const dirtyNodes = useScene((state) => state.dirtyNodes);
     const clearDirty = useScene((state) => state.clearDirty);
     const rootNodeIds = useScene((state) => state.rootNodeIds);
@@ -205,23 +237,30 @@ export const RoofSystem = () => {
         // Clear stale pending updates when the scene is unloaded
         if (rootNodeIds.length === 0) {
             pendingRoofUpdates.clear();
+            pendingIndependentSegments.clear();
             previousRoofPlanBounds.clear();
             warnedMergedRoofNaNIds.clear();
+            mergedFrom.clear();
             for (const cached of mergedRoofSegmentGeometryCache.values()) {
                 disposeCachedMergedRoofSegmentGeometrySet(cached);
             }
             mergedRoofSegmentGeometryCache.clear();
             return;
         }
-        if (dirtyNodes.size === 0 && pendingRoofUpdates.size === 0)
+        if (dirtyNodes.size === 0 &&
+            pendingRoofUpdates.size === 0 &&
+            pendingIndependentSegments.size === 0)
             return;
         const nodes = useScene.getState().nodes;
         // --- Pass 1: Process dirty roof-segments (throttled) ---
         let segmentsProcessed = 0;
-        dirtyNodes.forEach((id) => {
+        new Set([...dirtyNodes, ...pendingIndependentSegments]).forEach((id) => {
+            const independentCascade = pendingIndependentSegments.has(id) && !dirtyNodes.has(id);
             const node = nodes[id];
-            if (!node)
+            if (!node) {
+                pendingIndependentSegments.delete(id);
                 return;
+            }
             // Cutting roof accessories cascade their dirty mark to the host
             // segment's parent roof so the merged shell re-CSGs with the new
             // cut. Non-cutting accessories (vents, panels, gutters, etc.) sit on
@@ -236,6 +275,8 @@ export const RoofSystem = () => {
                 const seg = segId ? nodes[segId] : undefined;
                 if (roofAccessory.buildCut && seg?.parentId) {
                     pendingRoofUpdates.add(seg.parentId);
+                    if (isIndependentRoofSegment(seg))
+                        useScene.getState().markDirty(seg.id);
                 }
                 clearDirty(id);
                 return;
@@ -261,7 +302,7 @@ export const RoofSystem = () => {
                     const revealOnly = mesh.parent?.name === 'segments-wrapper' &&
                         mesh.parent?.parent?.getObjectByName('merged-roof')?.visible === true;
                     if (isVisible && !revealOnly && segmentsProcessed < MAX_SEGMENTS_PER_FRAME) {
-                        updateRoofSegmentGeometry(effectiveSegment, mesh, nodes);
+                        updateRoofSegmentGeometry(effectiveSegment, mesh, nodes, geometryAdapter);
                         segmentsProcessed++;
                     }
                     else if (isVisible && !revealOnly) {
@@ -284,9 +325,12 @@ export const RoofSystem = () => {
                 else {
                     clearDirty(id);
                 }
-                // Queue the parent roof for a merged geometry update
-                if (effectiveSegment.parentId) {
-                    queueSiblingRoofUpdates(effectiveSegment.parentId, nodes);
+                pendingIndependentSegments.delete(id);
+                const parentId = effectiveSegment.parentId;
+                if (parentId &&
+                    !independentCascade &&
+                    !(isRevealAssembling(parentId) && mergedFromStillHolds(parentId, nodes))) {
+                    queueSiblingRoofUpdates(parentId, nodes, id);
                 }
             }
             else if (node.type === 'roof') {
@@ -302,6 +346,7 @@ export const RoofSystem = () => {
             const node = nodes[id];
             if (node?.type !== 'roof') {
                 pendingRoofUpdates.delete(id);
+                mergedFrom.delete(id);
                 continue;
             }
             const group = sceneRegistry.nodes.get(id);
@@ -310,11 +355,11 @@ export const RoofSystem = () => {
             const mergedMesh = group.getObjectByName('merged-roof');
             if (!mergedMesh)
                 continue;
-            if (mergedMesh.visible !== false) {
-                // Only rebuild when visible — RoofEditSystem re-triggers via markDirty on edit mode exit
-                updateMergedRoofGeometry(node, group, nodes);
-                roofsProcessed++;
-            }
+            // Built even while hidden: a roof assembling from its segments (construction
+            // reveal) hides its shell, and must show it whole the moment it is captured.
+            rememberMergedInputs(node, nodes);
+            updateMergedRoofGeometry(node, group, nodes);
+            roofsProcessed++;
             pendingRoofUpdates.delete(id);
         }
     }, 5); // Priority 5: run after all other systems have settled
@@ -323,13 +368,14 @@ export const RoofSystem = () => {
 // ============================================================================
 // GEOMETRY GENERATION
 // ============================================================================
-function updateRoofSegmentGeometry(node, mesh, nodes) {
+function updateRoofSegmentGeometry(node, mesh, nodes, adapter) {
     const newGeo = generateRoofSegmentGeometry(node, nodes);
     mesh.geometry.dispose();
     mesh.geometry = newGeo;
     computeGeometryBoundsTree(newGeo);
     mesh.position.set(node.position[0], node.position[1], node.position[2]);
     mesh.rotation.y = node.rotation;
+    adapter?.syncGeometry(node, mesh);
 }
 /**
  * Subtract every hosted accessory cut (`capabilities.roofAccessory.
@@ -477,7 +523,7 @@ function updateMergedRoofGeometry(roofNode, group, nodes) {
         const scn = nodes[id];
         return scn ? getEffectiveNode(scn) : undefined;
     })
-        .filter((n) => n !== undefined && !hasSegmentMaterialOverride(n));
+        .filter((n) => n !== undefined && !hasSegmentMaterialOverride(n) && !isIndependentRoofSegment(n));
     if (children.length === 0) {
         mergedMesh.geometry.dispose();
         // Not BoxGeometry: its 6 groups against the merged mesh's 4-material array
@@ -1015,7 +1061,12 @@ function buildSegmentTrimCutBrushes(segment) {
         return [];
     }
     const { activeRh } = getSegmentSlopeFrame(segment);
-    const extra = segment.wallThickness + segment.overhang + segment.deckThickness + segment.shingleThickness + 2;
+    const extra = segment.wallThickness +
+        segment.overhang +
+        (segment.gableOverhang ?? 0) +
+        segment.deckThickness +
+        segment.shingleThickness +
+        2;
     const minX = -segment.width / 2 - extra;
     const maxX = segment.width / 2 + extra;
     const minZ = -segment.depth / 2 - extra;
@@ -1109,6 +1160,9 @@ export function clipGeometryBySegmentTrim(geometry, segment) {
             prepareBrushForCSG(brush);
             const next = csgEvaluator.evaluate(brush, cut, SUBTRACTION);
             const trimmed = csgGeometry(next).clone();
+            const materialIndices = new Map(dummyMats.map((material, index) => [material, index]));
+            for (const group of trimmed.groups)
+                group.materialIndex = mapRoofGroupMaterialIndex(group.materialIndex, csgMaterials(next), materialIndices);
             currentGeometry.dispose();
             next.geometry.dispose();
             ensureRenderableGeometryAttributes(trimmed);
@@ -1145,13 +1199,16 @@ const FASCIA_MATERIAL_INDEX = 2;
  * trims, cuts and sibling roofs clip them like the deck. Gable, hip, shed
  * and flat; null for the other forms.
  */
-function buildFasciaBoards(node, deckExt, eaveTopY, tanTheta) {
+function buildFasciaBoards(node, reach, eaveTopY, tanTheta) {
     const { roofType, width, depth } = node;
-    const { thickness: bt, height: bh } = FASCIA_BOARD;
+    const bt = node.fasciaDepth ?? FASCIA_BOARD.thickness;
+    const bh = node.fasciaHeight ?? FASCIA_BOARD.height;
+    // A flat roof's boards sized on purpose reach its top, over the membrane's edge: a coping band.
+    const flatTopY = node.fasciaHeight !== undefined ? eaveTopY + node.shingleThickness : eaveTopY;
     const out = bt / 2 - FASCIA_EMBED;
-    const halfD = depth / 2 + deckExt;
+    const halfD = depth / 2 + reach.z;
     const zE = halfD + out;
-    const xE = width / 2 + deckExt + out;
+    const xE = width / 2 + reach.x + out;
     // the eave boards run through the corners to the rake / side boards'
     // outer faces (a lapped return, no notch at the corner)
     const xL = xE + bt / 2;
@@ -1201,11 +1258,12 @@ function buildFasciaBoards(node, deckExt, eaveTopY, tanTheta) {
         }
     }
     else if (roofType === 'hip' || roofType === 'flat') {
+        const y = roofType === 'flat' ? flatTopY : eaveTopY;
         for (const sz of [-1, 1])
-            board([-xL, eaveTopY, sz * zE], [xL, eaveTopY, sz * zE], [0, 1]);
+            board([-xL, y, sz * zE], [xL, y, sz * zE], [0, 1]);
         // the side boards butt the eave boards' backs
         for (const sx of [-1, 1])
-            board([sx * xE, eaveTopY, -zE + bt / 2], [sx * xE, eaveTopY, zE - bt / 2], [1, 0]);
+            board([sx * xE, y, -zE + bt / 2], [sx * xE, y, zE - bt / 2], [1, 0]);
     }
     else if (roofType === 'shed') {
         // the low eave at +z, the slope rising to −z
@@ -1240,7 +1298,7 @@ function wearsFascia(node, parentRoof) {
  * renderer asks; a dormer, a chimney or a sibling's clip takes the bare shell.
  */
 export function getRoofSegmentBrushes(node, options = {}) {
-    const { roofType, width, depth, wallHeight, wallThickness, deckThickness, overhang, shingleThickness, } = node;
+    const { roofType, width, depth, wallHeight, wallThickness, deckThickness, shingleThickness } = node;
     const conicalCoverage = getConicalRoofCoverage(node);
     const { activeRh, tanTheta, cosTheta, sinTheta } = getSegmentSlopeFrame(node);
     const shapeRatios = getRoofShapeRatios({
@@ -1257,8 +1315,9 @@ export function getRoofSegmentBrushes(node, options = {}) {
     // same ratio). A hardcoded 0.25 desyncs the gablet from the parameter.
     const baseI = Math.min(width, depth) * node.dutchHipWidthRatio;
     const plateSeated = wallHeight <= 0;
-    const getVol = (wExt, vOffset, baseY, matIndex, isVoid, materialRule, onPlate = false) => {
-        const wV = Math.max(0.01, width + 2 * wExt);
+    // `xExt`: how far the volume reaches along x, where a gable's rakes are; the eaves' `wExt` else.
+    const getVol = (wExt, vOffset, baseY, matIndex, isVoid, materialRule, onPlate = false, xExt = wExt) => {
+        const wV = Math.max(0.01, width + 2 * xExt);
         const dV = Math.max(0.01, depth + 2 * wExt);
         const autoDrop = wExt * tanTheta;
         // Floor every prism at 5 cm so CSG never sees a degenerate volume — by
@@ -1301,25 +1360,25 @@ export function getRoofSegmentBrushes(node, options = {}) {
     };
     const wallGeo = getVol(wallThickness / 2, 0, 0, 0, false, undefined, true);
     const innerGeo = getVol(-wallThickness / 2, 0, -5, 2, false, undefined, true);
-    const horizontalOverhang = overhang * cosTheta;
-    const deckExt = wallThickness / 2 + horizontalOverhang;
+    const reach = getRoofSegmentDeckReach(node);
+    const deckExt = reach.z;
     // A shed's deck and shingle edges take the wall/trim slot, unless it wears
     // fascia boards: then they are fascia like a gable's, in the deck slot.
     const shedEdgesInTrimSlot = roofType === 'shed' && !options.fascia;
     const shedRoofSideMaterialRule = shedEdgesInTrimSlot
         ? (normal) => (normal.y > SHINGLE_SURFACE_EPSILON ? 3 : ROOF_EDGE_MATERIAL_INDEX)
         : undefined;
-    const deckTopGeo = getVol(deckExt, verticalRt, 0, 1, false, shedRoofSideMaterialRule);
-    const deckBotGeo = getVol(deckExt, 0, -5, 0, true);
+    const deckTopGeo = getVol(deckExt, verticalRt, 0, 1, false, shedRoofSideMaterialRule, false, reach.x);
+    const deckBotGeo = getVol(deckExt, 0, -5, 0, true, undefined, false, reach.x);
     // the deck's top edge at its outer plane, as `getVol` puts it
     const deckEaveDrop = deckExt * tanTheta;
     const deckEaveTopY = plateSeated && deckEaveDrop > 0
         ? wallHeight - deckEaveDrop + verticalRt
         : Math.max(0.05, wallHeight - deckEaveDrop + verticalRt);
-    const fasciaGeo = options.fascia ? buildFasciaBoards(node, deckExt, deckEaveTopY, tanTheta) : null;
+    const fasciaGeo = options.fascia ? buildFasciaBoards(node, reach, deckEaveTopY, tanTheta) : null;
     const stSin = shingleThickness * sinTheta;
     const stCos = shingleThickness * cosTheta;
-    const shinBotW = Math.max(0.01, width + 2 * deckExt);
+    const shinBotW = Math.max(0.01, width + 2 * reach.x);
     const shinBotD = Math.max(0.01, depth + 2 * deckExt);
     const deckDrop = deckExt * tanTheta;
     const shinBotWh = wallHeight - deckDrop + verticalRt;
@@ -1453,7 +1512,7 @@ export function getRoofSegmentBrushes(node, options = {}) {
     const deckTopBrush = toBrush(deckTopGeo);
     const deckBotBrush = toBrush(deckBotGeo);
     if (deckBotBrush) {
-        const wV = Math.max(0.01, width + 2 * deckExt);
+        const wV = Math.max(0.01, width + 2 * reach.x);
         const dV = Math.max(0.01, depth + 2 * deckExt);
         deckBotBrush.scale.set(1 + eps / wV, 1, 1 + eps / dV);
         deckBotBrush.updateMatrixWorld();
@@ -1532,13 +1591,90 @@ export function getRoofSegmentBrushes(node, options = {}) {
     rakeBoards?.dispose();
     return null;
 }
+function buildIndependentRoofSegmentGeometry(node, nodes) {
+    if (!isIndependentRoofSegment(node))
+        return null;
+    const pieces = isGlazedRoofSegment(node)
+        ? getGlazedRoofPieces(node)
+        : getBarrelRoofSolidPieces(node);
+    const build = (pieces) => {
+        const parts = pieces.map((piece) => createGeometryFromFaces(getGlazedRoofPieceFaces(piece).map((face) => face.map(({ x, y, z }) => new THREE.Vector3(x, y, z))), piece.slot));
+        const geometry = (parts.length ? mergeGeometries(parts, true) : null) ?? new THREE.BufferGeometry();
+        geometry.groups.forEach((group, index) => {
+            group.materialIndex = parts[index]?.groups[0]?.materialIndex ?? 0;
+        });
+        for (const part of parts)
+            part.dispose();
+        ensureRenderableGeometryAttributes(geometry);
+        return geometry;
+    };
+    let covering = build(pieces.filter((piece) => piece.face.normal[1] > 0));
+    let walls = build(pieces.filter((piece) => piece.face.normal[1] <= 0));
+    const subtract = (geometry, cutter) => {
+        if (!geometry.getAttribute('position')?.count)
+            return geometry;
+        const brush = new Brush(geometry, dummyMats);
+        prepareBrushForCSG(brush);
+        const result = csgEvaluator.evaluate(brush, cutter, SUBTRACTION);
+        const next = result.geometry.clone();
+        const indices = new Map(dummyMats.map((material, index) => [material, index]));
+        for (const group of next.groups)
+            group.materialIndex = mapRoofGroupMaterialIndex(group.materialIndex, csgMaterials(result), indices);
+        result.geometry.dispose();
+        geometry.dispose();
+        return next;
+    };
+    for (const id of node.children ?? []) {
+        const stored = nodes?.[id];
+        if (!stored)
+            continue;
+        const child = getEffectiveNode(stored);
+        if (child.metadata?.isTransient)
+            continue;
+        const capability = nodeRegistry.get(child.type)?.capabilities.roofAccessory;
+        const cutGeometry = capability?.buildCut?.(child, node);
+        if (!cutGeometry)
+            continue;
+        const cutter = new Brush(cutGeometry, dummyMats[0]);
+        try {
+            prepareBrushForCSG(cutter);
+            if (capability?.cutScope !== 'wall')
+                covering = subtract(covering, cutter);
+            walls = subtract(walls, cutter);
+        }
+        finally {
+            cutGeometry.dispose();
+        }
+    }
+    const parts = [covering, walls]
+        .filter((part) => part.getAttribute('position')?.count)
+        .map((part) => (part.index ? part.toNonIndexed() : part.clone()));
+    let geometry = (parts.length ? mergeGeometries(parts, false) : null) ?? new THREE.BufferGeometry();
+    let offset = 0;
+    for (const part of parts) {
+        for (const group of part.groups)
+            geometry.addGroup(offset + group.start, group.count, group.materialIndex);
+        offset += part.getAttribute('position').count;
+        part.dispose();
+    }
+    covering.dispose();
+    walls.dispose();
+    geometry = clipGeometryBySegmentTrim(geometry, node) ?? geometry;
+    ensureRenderableGeometryAttributes(geometry);
+    return geometry;
+}
 export function generateRoofSegmentGeometry(node, nodes) {
     const parentNode = node.parentId ? nodes?.[node.parentId] : undefined;
     const parentRoof = parentNode?.type === 'roof' ? parentNode : undefined;
     const parentRoofPosition = parentRoof?.position;
     const parentRoofRotation = parentRoof?.rotation ?? 0;
     const segmentWorldMatrix = composeSegmentWorldMatrix(parentRoofPosition, parentRoofRotation, node.position, node.rotation ?? 0);
-    const directSegmentGeometry = withSegmentUvMatrix(segmentWorldMatrix, () => buildCustomShedGeometry(node, nodes) ?? buildDirectConicalSectorGeometry(node));
+    const directSegmentGeometry = withSegmentUvMatrix(segmentWorldMatrix, () => {
+        const independent = buildIndependentRoofSegmentGeometry(node, nodes);
+        if (independent)
+            return independent;
+        return buildCustomShedGeometry(node, nodes) ?? buildDirectConicalSectorGeometry(node);
+    });
     if (directSegmentGeometry) {
         let result = addShedInsetEndPanels(directSegmentGeometry, [node], false);
         if (nodes) {
@@ -1617,7 +1753,7 @@ export function generateRoofSegmentGeometry(node, nodes) {
     ensureRenderableGeometryAttributes(resultGeo);
     return resultGeo;
 }
-function clipDirectRoofGeometryAgainstSiblings(geometry, node, nodes, space) {
+export function clipDirectRoofGeometryAgainstSiblings(geometry, node, nodes, space) {
     const siblingInterior = buildOccludingRoofInterior(node, nodes, space);
     if (!siblingInterior)
         return geometry;
@@ -3171,7 +3307,21 @@ function pushRoofUv(uvs, point, normal) {
  * to the true roof surface even on multi-slope roofs (gambrel/mansard/dutch).
  */
 export function getRoofOuterSurfaceFrameAtPoint(segment, lx, lz) {
-    const { roofType, width, depth, wallHeight, wallThickness, deckThickness, overhang, shingleThickness, } = segment;
+    if (isGlazedRoofSegment(segment) || segment.roofType === 'barrel') {
+        const face = (isGlazedRoofSegment(segment) ? getGlazedRoofFaces(segment) : getBarrelRoofFaces(segment)).find((face) => face.normal[1] > 0 &&
+            lx >= face.origin[0] &&
+            lx <= face.origin[0] + face.width &&
+            (lz - face.origin[2]) / face.v[2] >= -1e-6 &&
+            (lz - face.origin[2]) / face.v[2] <= face.length + 1e-6);
+        if (face) {
+            const v = (lz - face.origin[2]) / face.v[2];
+            return {
+                point: new THREE.Vector3(lx, face.origin[1] + face.v[1] * v, lz),
+                normal: new THREE.Vector3(...face.normal),
+            };
+        }
+    }
+    const { roofType, width, depth, wallHeight, deckThickness, shingleThickness } = segment;
     const { activeRh, tanTheta, cosTheta, sinTheta } = getSegmentSlopeFrame(segment);
     if (roofType === 'flat' || activeRh === 0) {
         return {
@@ -3180,11 +3330,11 @@ export function getRoofOuterSurfaceFrameAtPoint(segment, lx, lz) {
         };
     }
     const verticalRt = deckThickness / cosTheta;
-    const horizontalOverhang = overhang * cosTheta;
-    const deckExt = wallThickness / 2 + horizontalOverhang;
+    const reach = getRoofSegmentDeckReach(segment);
+    const deckExt = reach.z;
     const stSin = shingleThickness * sinTheta;
     const stCos = shingleThickness * cosTheta;
-    const shinBotW = Math.max(0.01, width + 2 * deckExt);
+    const shinBotW = Math.max(0.01, width + 2 * reach.x);
     const shinBotD = Math.max(0.01, depth + 2 * deckExt);
     const deckDrop = deckExt * tanTheta;
     const shinBotWh = wallHeight - deckDrop + verticalRt;

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

@@ -1,5 +1,5 @@
-import { type WallNode } from '@pascal-app/core';
-import { type Camera, type Material, Matrix4, type Mesh, Vector3 } from 'three';
+import { useScene, type WallNode } from '@pascal-app/core';
+import { type Camera, type Material, Matrix4, type Mesh, type Object3D, Vector3 } from 'three';
 import useViewer, { type WallMode } from '../../store/use-viewer';
 import { type WallMaterialVariant } from './wall-material-variant';
 import { type WallMaterialsResolver } from './wall-materials';
@@ -26,7 +26,22 @@ type CachedWall = {
 export declare const WALL_FACING_HYSTERESIS = 0.001;
 export declare function wallHiddenFromFacing(node: Pick<WallNode, 'frontSide' | 'backSide'>, mode: WallMode, negativeFacing: boolean): boolean;
 export declare function wallFacingNegative(dot: number, previous: boolean | undefined): boolean;
-export type WallCutoutViewerState = Pick<ReturnType<typeof useViewer.getState>, 'wallMode' | 'shading' | 'textures' | 'colorPreset' | 'sceneTheme' | 'selection' | 'previewSelectedIds' | 'hoveredId' | 'hoverHighlightMode'>;
+export type WallCutoutViewerState = Pick<ReturnType<typeof useViewer.getState>, 'wallMode' | 'shading' | 'textures' | 'colorPreset' | 'sceneTheme' | 'selection' | 'previewSelectedIds' | 'hoveredId' | 'hoverHighlightMode'> & {
+    nodesRevealing?: readonly string[];
+};
+/**
+ * The walls the cutaway must leave in view because something on them is playing: a wall that is
+ * moving in, going out or being edited, a wall that hosts an opening that is, and the walls under a
+ * node that is (a facade part). The person's wall mode is not touched: these are stamped visible
+ * for as long as they play, and the next frame after hides them again as the view wants.
+ */
+export declare function wallsInPlay(nodes: ReturnType<typeof useScene.getState>['nodes'], revealing: readonly string[]): Set<string>;
+/**
+ * The visible variant of a mesh's materials, kept on the object by the system that cuts it away, for
+ * whoever must draw a copy of the mesh while the cutaway hides it (a deleted wall's ghost). Not in
+ * `userData`: `Object3D.clone` copies that through JSON, which would serialize every material.
+ */
+export declare const visibleMaterialsOf: WeakMap<Object3D<import("three").Object3DEventMap>, Material<import("three").MaterialEventMap>[]>;
 export type WallCutoutViewerStore = {
     getState: () => WallCutoutViewerState;
 };
@@ -35,6 +50,8 @@ export declare class WallCutoutCache {
     private readonly materialResolver;
     readonly walls: Map<string, CachedWall>;
     readonly rebuilt: Set<string>;
+    /** Walls whose palette waits for a preview to give back their groups (see `mayAssign`). */
+    private readonly deferred;
     private viewer;
     private nodes;
     private materials;
@@ -51,6 +68,9 @@ export declare class WallCutoutCache {
     private highlightKey;
     private transformed;
     private overrides;
+    /** The reveal's list the walls in play were read from, and the walls it named. */
+    private revealing;
+    private inPlay;
     constructor(viewerStore?: WallCutoutViewerStore, materialResolver?: WallMaterialsResolver);
     subscribeLiveTransforms(): () => void;
     update(camera: Camera, time: number): void;
@@ -62,6 +82,15 @@ export declare class WallCutoutCache {
     private refreshAppearance;
     private refreshNormal;
     private apply;
+    /**
+     * A paint preview spread over several walls (a room, all matching) regroups
+     * each wall's faces onto its own longer array, but only the hovered wall is
+     * known here as a preview's owner. A palette that cannot draw the groups the
+     * mesh wears now waits for the preview's restore to put them back: the mesh
+     * would otherwise keep groups with no material, and every raycast over it
+     * throws on `material.side`.
+     */
+    private mayAssign;
 }
 export {};
 //# sourceMappingURL=wall-cutout-cache.d.ts.map

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

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