@pascal-app/viewer 1.0.7 → 1.1.0

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

@@ -9,6 +9,7 @@ import { applyWorldScaleBoxUVs } from '../../lib/box-uv';
 import { ensureRenderableGeometryAttributes, subtractCsgBrush } from '../../lib/csg-utils';
 import useViewer from '../../store/use-viewer';
 import { isRevealAssembling } from '../construction-reveal/construction-reveal';
+import { setGeometryFailure, useGeometryStatus } from '../geometry/geometry-status';
 import { ROOF_GABLE_LEFT_MATERIAL_INDEX, ROOF_GABLE_RIGHT_MATERIAL_INDEX, ROOF_HEEL_MATERIAL_INDEX, } from './roof-material-slots';
 function csgGeometry(brush) {
     return brush.geometry;
@@ -372,7 +373,13 @@ export const RoofSystem = ({ geometryAdapter } = {}) => {
             // 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, framing);
+            try {
+                updateMergedRoofGeometry(node, group, nodes, framing);
+            }
+            catch (error) {
+                setGeometryFailure(node.id, 'build-failed');
+                console.error('Roof rebuild failed:', error);
+            }
             roofsProcessed++;
             pendingRoofUpdates.delete(id);
         }
@@ -383,7 +390,19 @@ export const RoofSystem = ({ geometryAdapter } = {}) => {
 // GEOMETRY GENERATION
 // ============================================================================
 function updateRoofSegmentGeometry(node, mesh, nodes, adapter, framing = false) {
-    const newGeo = generateRoofSegmentGeometry(node, nodes, { framing });
+    let newGeo;
+    try {
+        newGeo = generateRoofSegmentGeometry(node, nodes, { framing });
+    }
+    catch (error) {
+        setGeometryFailure(node.id, 'build-failed');
+        console.error('Roof segment rebuild failed:', error);
+        return;
+    }
+    if (useGeometryStatus.getState().failures.has(node.id)) {
+        newGeo.dispose();
+        return;
+    }
     mesh.geometry.dispose();
     mesh.geometry = newGeo;
     computeGeometryBoundsTree(newGeo);
@@ -405,69 +424,70 @@ function subtractAccessoryCuts(brushes, segment, nodes) {
     let workingShin = brushes.shinSlab;
     let workingDeck = brushes.deckSlab;
     let workingWall = brushes.wallBrush;
-    for (const childElemId of segment.children ?? []) {
-        const storedChild = nodes[childElemId];
-        if (!storedChild)
-            continue;
-        const childElem = getEffectiveNode(storedChild);
-        const meta = typeof childElem.metadata === 'object' && childElem.metadata !== null
-            ? childElem.metadata
-            : undefined;
-        if (meta?.isTransient)
-            continue;
-        const childDef = nodeRegistry.get(childElem.type);
-        const buildCut = childDef?.capabilities?.roofAccessory?.buildCut;
-        if (!buildCut)
-            continue;
-        const cutGeo = buildCut(childElem, segment);
-        if (!cutGeo)
-            continue;
-        // Wrap the kind-emitted geometry in a Brush. Kinds return raw
-        // shapes; the viewer welds (mandatory after rotations leave
-        // duplicated verts), attaches a single material group, and
-        // builds the bounds tree — keeping kind code free of
-        // three-bvh-csg / three-mesh-bvh imports.
-        const welded = mergeVertices(cutGeo, 1e-4);
-        cutGeo.dispose();
-        const idxCount = welded.getIndex()?.count ?? 0;
-        if (idxCount === 0) {
-            welded.dispose();
-            continue;
-        }
-        welded.clearGroups();
-        welded.addGroup(0, idxCount, 0);
-        welded.computeVertexNormals();
-        ensureRenderableGeometryAttributes(welded);
-        computeGeometryBoundsTree(welded);
-        const cut = new Brush(welded, dummyMats[0]);
-        cut.updateMatrixWorld();
-        const cutScope = childDef?.capabilities?.roofAccessory?.cutScope ?? 'all';
-        try {
-            if (cutScope !== 'wall') {
-                const nextShin = csgEvaluator.evaluate(workingShin, cut, SUBTRACTION);
-                workingShin.geometry.dispose();
-                prepareBrushForCSG(nextShin);
-                workingShin = nextShin;
-                const nextDeck = csgEvaluator.evaluate(workingDeck, cut, SUBTRACTION);
-                workingDeck.geometry.dispose();
-                prepareBrushForCSG(nextDeck);
-                workingDeck = nextDeck;
+    try {
+        for (const childElemId of segment.children ?? []) {
+            const storedChild = nodes[childElemId];
+            if (!storedChild)
+                continue;
+            const childElem = getEffectiveNode(storedChild);
+            const meta = typeof childElem.metadata === 'object' && childElem.metadata !== null
+                ? childElem.metadata
+                : undefined;
+            if (meta?.isTransient)
+                continue;
+            const childDef = nodeRegistry.get(childElem.type);
+            const buildCut = childDef?.capabilities?.roofAccessory?.buildCut;
+            if (!buildCut)
+                continue;
+            const cutGeo = buildCut(childElem, segment);
+            if (!cutGeo)
+                continue;
+            // Wrap the kind-emitted geometry in a Brush. Kinds return raw
+            // shapes; the viewer welds (mandatory after rotations leave
+            // duplicated verts), attaches a single material group, and
+            // builds the bounds tree — keeping kind code free of
+            // three-bvh-csg / three-mesh-bvh imports.
+            const welded = mergeVertices(cutGeo, 1e-4);
+            cutGeo.dispose();
+            const idxCount = welded.getIndex()?.count ?? 0;
+            if (idxCount === 0) {
+                welded.dispose();
+                continue;
+            }
+            welded.clearGroups();
+            welded.addGroup(0, idxCount, 0);
+            welded.computeVertexNormals();
+            ensureRenderableGeometryAttributes(welded);
+            computeGeometryBoundsTree(welded);
+            const cut = new Brush(welded, dummyMats[0]);
+            cut.updateMatrixWorld();
+            const cutScope = childDef?.capabilities?.roofAccessory?.cutScope ?? 'all';
+            try {
+                if (cutScope !== 'wall') {
+                    const nextShin = csgEvaluator.evaluate(workingShin, cut, SUBTRACTION);
+                    workingShin.geometry.dispose();
+                    prepareBrushForCSG(nextShin);
+                    workingShin = nextShin;
+                    const nextDeck = csgEvaluator.evaluate(workingDeck, cut, SUBTRACTION);
+                    workingDeck.geometry.dispose();
+                    prepareBrushForCSG(nextDeck);
+                    workingDeck = nextDeck;
+                }
+                const nextWall = csgEvaluator.evaluate(workingWall, cut, SUBTRACTION);
+                workingWall.geometry.dispose();
+                prepareBrushForCSG(nextWall);
+                workingWall = nextWall;
+            }
+            finally {
+                cut.geometry.dispose();
             }
-            const nextWall = csgEvaluator.evaluate(workingWall, cut, SUBTRACTION);
-            workingWall.geometry.dispose();
-            prepareBrushForCSG(nextWall);
-            workingWall = nextWall;
-        }
-        catch (e) {
-            console.error(`[${childElem.type}] cut CSG failed:`, e);
-        }
-        finally {
-            cut.geometry.dispose();
         }
     }
-    brushes.shinSlab = workingShin;
-    brushes.deckSlab = workingDeck;
-    brushes.wallBrush = workingWall;
+    finally {
+        brushes.shinSlab = workingShin;
+        brushes.deckSlab = workingDeck;
+        brushes.wallBrush = workingWall;
+    }
 }
 function getMergedRoofSegmentBrushes(roofNode, segment, nodes, framing) {
     const segmentId = segment.id;
@@ -486,7 +506,13 @@ function getMergedRoofSegmentBrushes(roofNode, segment, nodes, framing) {
         mergedRoofSegmentGeometryCache.delete(segmentId);
         return null;
     }
-    subtractAccessoryCuts(brushes, segment, nodes);
+    try {
+        subtractAccessoryCuts(brushes, segment, nodes);
+    }
+    catch (error) {
+        disposeRoofSegmentBrushSet(brushes);
+        throw error;
+    }
     _matrix.compose(_position.set(segment.position[0], segment.position[1], segment.position[2]), _quaternion.setFromAxisAngle(_yAxis, segment.rotation), _scale);
     const applyTransform = (brush) => {
         csgGeometry(brush).applyMatrix4(_matrix);
@@ -547,6 +573,7 @@ function updateMergedRoofGeometry(roofNode, group, nodes, framing) {
         // Not BoxGeometry: its 6 groups against the merged mesh's 4-material array
         // crash GLTFExporter (materials[4] → undefined) when the roof bakes.
         mergedMesh.geometry = createDegenerateRoofPlaceholder();
+        setGeometryFailure(roofNode.id, null);
         return;
     }
     let totalShinSlab = null;
@@ -643,6 +670,7 @@ function updateMergedRoofGeometry(roofNode, group, nodes, framing) {
                     console.warn('[RoofSystem] Skipping merged roof geometry with invalid attributes', roofNode.id);
                     warnedMergedRoofNaNIds.add(roofNode.id);
                 }
+                setGeometryFailure(roofNode.id, 'invalid-geometry');
                 resultGeo.dispose();
                 if (combined !== shinDeck)
                     shinDeck.geometry.dispose();
@@ -691,10 +719,12 @@ function updateMergedRoofGeometry(roofNode, group, nodes, framing) {
             ensureRenderableGeometryAttributes(finalGeo);
             mergedMesh.geometry.dispose();
             mergedMesh.geometry = finalGeo;
+            setGeometryFailure(roofNode.id, null);
             if (combined !== shinDeck)
                 shinDeck.geometry.dispose();
         }
         catch (e) {
+            setGeometryFailure(roofNode.id, 'build-failed');
             console.error('Merged roof CSG failed:', e);
         }
         totalShinSlab.geometry.dispose();
@@ -712,6 +742,7 @@ function updateMergedRoofGeometry(roofNode, group, nodes, framing) {
             ensureRenderableGeometryAttributes(finalGeo);
             mergedMesh.geometry.dispose();
             mergedMesh.geometry = finalGeo;
+            setGeometryFailure(roofNode.id, null);
         }
         for (const geometry of directSegmentGeometries) {
             if (geometry !== finalGeo)
@@ -1932,6 +1963,7 @@ export function generateRoofSegmentGeometry(node, nodes, options = {}) {
         }
         result.computeVertexNormals();
         ensureRenderableGeometryAttributes(result);
+        setGeometryFailure(node.id, null);
         return result;
     }
     const brushes = withSegmentUvMatrix(segmentWorldMatrix, () => getRoofSegmentBrushes(node, {
@@ -1939,11 +1971,17 @@ export function generateRoofSegmentGeometry(node, nodes, options = {}) {
         framing: options.framing ? roofFramingDepth(node) : 0,
     }));
     if (!brushes) {
-        // Fallback: simple box
+        setGeometryFailure(node.id, 'build-failed');
         return new THREE.BoxGeometry(node.width, node.wallHeight, node.depth);
     }
     if (nodes) {
-        subtractAccessoryCuts(brushes, node, nodes);
+        try {
+            subtractAccessoryCuts(brushes, node, nodes);
+        }
+        catch (error) {
+            disposeRoofSegmentBrushSet(brushes);
+            throw error;
+        }
     }
     const { deckSlab, shinSlab, wallBrush, innerBrush, rakeBoards } = brushes;
     let resultGeo = new THREE.BufferGeometry();
@@ -1968,8 +2006,11 @@ export function generateRoofSegmentGeometry(node, nodes, options = {}) {
         resultGeo = csgGeometry(combined);
         if (geometryHasInvalidAttributes(resultGeo)) {
             resultGeo.dispose();
+            setGeometryFailure(node.id, 'invalid-geometry');
             resultGeo = csgGeometry(wallBrush).clone();
         }
+        else
+            setGeometryFailure(node.id, null);
         const resultMaterials = csgMaterials(combined);
         const matToIndex = new Map([
             [dummyMats[0], 0],
@@ -1989,6 +2030,7 @@ export function generateRoofSegmentGeometry(node, nodes, options = {}) {
             shinDeck.geometry.dispose();
     }
     catch (e) {
+        setGeometryFailure(node.id, 'build-failed');
         console.error('Roof CSG failed:', e);
         resultGeo = csgGeometry(wallBrush).clone();
     }

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

@@ -55,6 +55,17 @@ export declare function markWallsForZoneFinishChanges(): void;
  */
 export declare function wallGeometryChildren(node: WallNode, nodes: Readonly<Record<string, AnyNode>>): AnyNode[];
 type WallTerrainBottomSampler = (x: number, z: number) => number | null;
+/** The wall's top in wall-local coordinates: `height` at the start, rising `slope` per metre of x. */
+type WallTopLine = {
+    height: number;
+    slope: number;
+};
+/**
+ * Wall-local Y of the sloped top at `x`. Mitered corners sample `x` outside
+ * [0, L], where the line can fall below the wall base; the top never drops
+ * under {@link MIN_WALL_END_HEIGHT} (or the flat height, if lower).
+ */
+export declare function wallTopYAt(wallTop: WallTopLine, x: number): number;
 export declare function generateExtrudedWall(wallNode: WallNode, childrenNodes: AnyNode[], miterData: WallMiterData, slabElevation?: number, baseElevation?: number, baseSegments?: readonly WallSlabSupportSegment[], storeyHeight?: number, terrainBottomAt?: WallTerrainBottomSampler, faceBase?: {
     a: readonly WallSlabSupportSegment[];
     b: readonly WallSlabSupportSegment[];

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

@@ -1 +1 @@
-{"version":3,"file":"wall-system.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-system.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"wall-system.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-system.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,SAAS,EAuCd,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,QAAQ,EAEb,KAAK,sBAAsB,EAK5B,MAAM,kBAAkB,CAAA;AAGzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAY,KAAK,EAAwC,MAAM,eAAe,CAAA;AAqBrF,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAyChE,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,SAAS,KAAK,EAAE,GAAG;IACjE,MAAM,EAAE,KAAK,GAAG,IAAI,CAAA;IACpB,eAAe,EAAE,KAAK,EAAE,CAAA;IACxB,YAAY,EAAE,MAAM,CAAA;CACrB,CA4FA;AAiJD;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,gBAAgB,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,GAAG,GAAG,GAAG,EAAE,eAAe,EAAE,CAAC,GAAG,IAAI,CAAA;IACrD,6FAA6F;IAC7F,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;IACvB,wFAAwF;IACxF,UAAU,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAClD,CAAA;AAoUD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,EACjC,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,MAAM,GAChB,OAAO,CAET;AAED,2EAA2E;AAC3E,wBAAgB,0BAA0B,IAAI,MAAM,CAEnD;AAID,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,CAAC,EAAE,EAAE,SAAS,KAAK,OAAO,CAAA;CACnC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,eAAe,CAAC,EAAE,CAChB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,OAAO,EAAE,0BAA0B,KAChC;QAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC;QAAC,cAAc,EAAE,OAAO,EAAE,CAAA;KAAE,CAAA;IAC/D,aAAa,CAAC,EAAE,CACd,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,KAAK,CAAC,cAAc,EAC9B,QAAQ,EAAE,SAAS,OAAO,EAAE,KACzB,KAAK,CAAC,cAAc,CAAA;IACzB,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,cAAc,KAAK,IAAI,CAAA;CACnG,CAAA;AAED,eAAO,MAAM,UAAU,yBAAyB;IAAE,eAAe,CAAC,EAAE,mBAAmB,CAAA;CAAE,SAexF,CAAA;AAED,wBAAgB,iBAAiB,CAAC,eAAe,CAAC,EAAE,mBAAmB,QAatE;AAyCD;;;;GAIG;AACH,wBAAgB,6BAA6B,IAAI,IAAI,CAoCpD;AAmZD;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACvC,OAAO,EAAE,CAUX;AA8ED,KAAK,wBAAwB,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAA;AA4OvE,sGAAsG;AACtG,KAAK,WAAW,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAIlE;AA0BD,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,OAAO,EAAE,EACxB,SAAS,EAAE,aAAa,EACxB,aAAa,SAAI,EACjB,aAAa,SAAgB,EAC7B,YAAY,GAAE,SAAS,sBAAsB,EAE5C,EACD,YAAY,SAAuB,EACnC,eAAe,CAAC,EAAE,wBAAwB,EAC1C,QAAQ,CAAC,EAAE;IAAE,CAAC,EAAE,SAAS,sBAAsB,EAAE,CAAC;IAAC,CAAC,EAAE,SAAS,sBAAsB,EAAE,CAAA;CAAE,EACzF,YAAY,GAAE,gBAAsD,EACpE,UAAU,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAA6B,GACxE,KAAK,CAAC,cAAc,CAwUtB"}

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

@@ -1,4 +1,4 @@
-import { buildWallFinishLayout, containsPoint, cornerPair, DEFAULT_LEVEL_HEIGHT, getAdjacentWallIds, getDoorOpeningSize, getEffectiveNode, getOpeningWallCut, getWallBodyCenterOffset, getWallCurveFrameAt, getWallCurveLength, getWallFaceOffsets, getWallLevelZones, getWallMiterBoundaryPoints, getWallPlaneTop, getWallPlanFootprint, getWallSurfacePolygon, getWallThickness, isCurvedWall, isCutterName, openingHostFacing, pointToKey, resolveCutterHost, resolveLevelId, resolveWallFaceBottom, resolveWallFinish, resolveWallTop, sceneRegistry, spatialGridManager, terrainSupportLift, useLiveNodeOverrides, useLiveTransforms, useScene, WALL_SURFACE_SLOT_DEFAULTS, wallFinishMaterialIndex, zoneHasWallFinish, } from '@pascal-app/core';
+import { buildWallFinishLayout, clampWallEndHeightOffset, containsPoint, cornerPair, DEFAULT_LEVEL_HEIGHT, getAdjacentWallIds, getDoorOpeningSize, getEffectiveNode, getOpeningWallCut, getWallBodyCenterOffset, getWallCurveFrameAt, getWallCurveLength, getWallFaceOffsets, getWallLevelZones, getWallMiterBoundaryPoints, getWallPlaneTop, getWallPlanFootprint, getWallSurfacePolygon, getWallThickness, isCurvedWall, isCutterName, MIN_WALL_END_HEIGHT, openingHostFacing, pointToKey, resolveCutterHost, resolveLevelId, resolveWallFaceBottom, resolveWallFinish, resolveWallTop, sceneRegistry, spatialGridManager, terrainSupportLift, useLiveNodeOverrides, useLiveTransforms, useScene, WALL_SURFACE_SLOT_DEFAULTS, wallFinishMaterialIndex, zoneHasWallFinish, } from '@pascal-app/core';
 import { useFrame } from '@react-three/fiber';
 import { useEffect } from 'react';
 import * as THREE from 'three';
@@ -1227,6 +1227,41 @@ function buildWallFinishContext(wall, layout, faceBase, slabElevation) {
         .sort((left, right) => left.start - right.start);
     return { layout, faceBase: { a: runs(faceBase.a), b: runs(faceBase.b) }, refs, foundation };
 }
+/**
+ * Wall-local Y of the sloped top at `x`. Mitered corners sample `x` outside
+ * [0, L], where the line can fall below the wall base; the top never drops
+ * under {@link MIN_WALL_END_HEIGHT} (or the flat height, if lower).
+ */
+export function wallTopYAt(wallTop, x) {
+    const { height, slope } = wallTop;
+    if (slope === 0)
+        return height;
+    return Math.max(height + slope * x, Math.min(height, MIN_WALL_END_HEIGHT));
+}
+/**
+ * Tilts a wall's top edge along its length so the `end` side sits taller (or
+ * shorter) than the `start` side — e.g. a knee wall following a single-pitch
+ * roof slope — instead of requiring a non-rectangular footprint. Only
+ * vertices sitting exactly at the flat extruded top (`topY`) move.
+ *
+ * Evaluates the linear plane equation `slope * localX` continuously across
+ * all top vertices (including mitered corner vertices extending beyond [0, L])
+ * so the extruded top face remains a single coplanar surface without corner
+ * creases or triangulation folds — except where {@link wallTopYAt} holds an
+ * extended miter vertex above the base.
+ */
+function applyWallEndHeightSlope(geometry, wallTop) {
+    const { height: topY, slope } = wallTop;
+    if (slope === 0)
+        return;
+    const position = geometry.getAttribute('position');
+    for (let i = 0; i < position.count; i++) {
+        if (Math.abs(position.getY(i) - topY) > 1e-4)
+            continue;
+        position.setY(i, wallTopYAt(wallTop, position.getX(i)));
+    }
+    position.needsUpdate = true;
+}
 export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabElevation = 0, baseElevation = slabElevation, baseSegments = [
     { start: 0, end: 1, elevation: baseElevation },
 ], storeyHeight = DEFAULT_LEVEL_HEIGHT, terrainBottomAt, faceBase, finishLayout = buildWallFinishLayout(wallNode, []), sceneNodes = useScene.getState().nodes) {
@@ -1236,6 +1271,7 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
     const level = sceneNodes[levelId];
     const authoredStoreyHeight = level?.type === 'level' ? (level.height ?? null) : null;
     const topElevation = resolveWallTop(wallNode, storeyHeight, slabElevation, authoredStoreyHeight);
+    const effectiveWallHeight = topElevation - slabElevation;
     const faceDatum = faceBase;
     if (faceBase)
         faceBase = {
@@ -1266,6 +1302,10 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
     if (L < 1e-9) {
         return new THREE.BufferGeometry();
     }
+    const wallTop = {
+        height: effectiveWallHeight,
+        slope: clampWallEndHeightOffset(wallNode.endHeightOffset, effectiveWallHeight) / L,
+    };
     const boundaryPoints = getWallMiterBoundaryPoints(wallNode, miterData);
     const polyPoints = isCurvedWall(wallNode)
         ? getWallSurfacePolygon(wallNode, 24, insetCurvedWallBoundaryPointsFor3D(wallNode, boundaryPoints, miterData) ?? undefined)
@@ -1312,10 +1352,10 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
         depth: height,
         bevelEnabled: false,
     });
-    // Rotate so extrusion direction (Z) becomes height direction (Y)
     geometry.rotateX(-Math.PI / 2);
     if (Math.abs(localBottom) > 1e-9)
         geometry.translate(0, localBottom, 0);
+    applyWallEndHeightSlope(geometry, wallTop);
     geometry.computeVertexNormals();
     assignWallMaterialGroups(geometry, wallNode, boundaryEdges, finish);
     ensureRenderableGeometryAttributes(geometry);
@@ -1431,7 +1471,7 @@ export function generateExtrudedWall(wallNode, childrenNodes, miterData, slabEle
     }
     const cutoutBrushes = [
         ...baseProfileCutouts,
-        ...collectCutoutBrushes(wallNode, childrenNodes, thickness, faceDatum, slabElevation, sceneNodes, baseSegments),
+        ...collectCutoutBrushes(wallNode, childrenNodes, thickness, wallTop, faceDatum, slabElevation, sceneNodes, baseSegments),
     ];
     if (cutoutBrushes.length === 0) {
         const splitGeometry = finishWallFaces(splitGeometryAtPlanes(geometry, finishPlanes.y, finishPlanes.x), wallNode, boundaryEdges, finish);
@@ -1527,7 +1567,7 @@ function authoredCutoutBrush(cutoutMesh, wallMatrixInverse, wallThickness, wallN
     computeGeometryBoundsTree(geometry);
     return new Brush(geometry);
 }
-function collectCutoutBrushes(wallNode, childrenNodes, wallThickness, faceBase, elevation = 0, sceneNodes = useScene.getState().nodes, baseSegments = [{ start: 0, end: 1, elevation }]) {
+function collectCutoutBrushes(wallNode, childrenNodes, wallThickness, wallTop, faceBase, elevation = 0, sceneNodes = useScene.getState().nodes, baseSegments = [{ start: 0, end: 1, elevation }]) {
     const brushes = [];
     const wallMesh = sceneRegistry.nodes.get(wallNode.id);
     if (!wallMesh)
@@ -1584,7 +1624,7 @@ function collectCutoutBrushes(wallNode, childrenNodes, wallThickness, faceBase,
                         child.position[1] + cut.datum - elevation,
                         child.position[2],
                     ],
-                }, wallThickness, getWallBodyCenterOffset(wallNode), cut.bottom - elevation, child.type === 'window' ? cornerPair(sceneNodes, child)?.end : undefined));
+                }, wallThickness, getWallBodyCenterOffset(wallNode), cut.bottom - elevation, child.type === 'window' ? cornerPair(sceneNodes, child)?.end : undefined, wallTop));
                 continue;
             }
             if (cut.band.length < 3)
@@ -1595,8 +1635,9 @@ function collectCutoutBrushes(wallNode, childrenNodes, wallThickness, faceBase,
                 return new THREE.Vector2(dx * Math.cos(angle) + dz * Math.sin(angle), dx * Math.sin(angle) - dz * Math.cos(angle));
             });
             const padding = getOpeningCutoutBottomPadding(child, cut.bottom - elevation);
+            const top = Math.min(cut.top - elevation, Math.min(...points.map((point) => wallTopYAt(wallTop, point.x))));
             const geometry = new THREE.ExtrudeGeometry(new THREE.Shape(points), {
-                depth: cut.top - cut.bottom + padding,
+                depth: top - (cut.bottom - elevation) + padding,
                 bevelEnabled: false,
             });
             geometry.rotateX(-Math.PI / 2);
@@ -1681,18 +1722,23 @@ function collectCutoutBrushes(wallNode, childrenNodes, wallThickness, faceBase,
  * cut only takes this wall's own geometry, so running past it touches nothing else.
  */
 const CORNER_CUT_REACH = 6;
-function createOpeningCutoutBrush(opening, wallThickness, centerOffset, cutBottom, cornerEnd) {
+function createOpeningCutoutBrush(opening, wallThickness, centerOffset, cutBottom, cornerEnd, wallTop) {
     const size = getDoorOpeningSize(opening);
     const centerX = opening.position[0] - size.leafOffsetX * openingHostFacing(opening);
     const halfWidth = size.width / 2;
     const bottom = cutBottom ?? opening.position[1] - opening.height / 2;
     const bottomPadding = getOpeningCutoutBottomPadding(opening, bottom);
     const reach = CORNER_CUT_REACH * wallThickness;
+    const left = centerX - halfWidth;
+    const right = centerX + halfWidth;
+    const openingTop = opening.position[1] - opening.height / 2 + size.height;
     const geometry = buildOpeningCutoutGeometry(opening, {
-        left: centerX - halfWidth - (cornerEnd === 'start' ? reach : 0),
-        right: centerX + halfWidth + (cornerEnd === 'end' ? reach : 0),
+        left: left - (cornerEnd === 'start' ? reach : 0),
+        right: right + (cornerEnd === 'end' ? reach : 0),
         bottom: bottom - bottomPadding,
-        top: opening.position[1] - opening.height / 2 + size.height,
+        top: wallTop
+            ? Math.min(openingTop, wallTopYAt(wallTop, wallTop.slope > 0 ? left : right))
+            : openingTop,
     }, wallThickness * 2, wallThickness);
     if (centerOffset !== 0)
         geometry.translate(0, 0, centerOffset);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pascal-app/viewer",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "3D viewer component for Pascal building editor",
   "type": "module",
   "main": "./dist/index.js",
@@ -33,7 +33,7 @@
     "prepublishOnly": "npm run build"
   },
   "peerDependencies": {
-    "@pascal-app/core": "^1.0.7",
+    "@pascal-app/core": "^1.1.0",
     "@react-three/drei": "^10",
     "@react-three/fiber": "^9",
     "react": "^18 || ^19",
@@ -46,7 +46,7 @@
     "zustand": "^5"
   },
   "devDependencies": {
-    "@pascal-app/core": "^1.0.7",
+    "@pascal-app/core": "^1.1.0",
     "@pascal/typescript-config": "*",
     "@react-three/test-renderer": "^9.1.1",
     "@types/node": "^26",