@pascal-app/nodes 1.0.0-beta.5 → 1.0.0

package/dist/door/tool.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { DoorNode, emitter, isCurvedWall, sceneRegistry, spatialGridManager, useScene, WallNode as WallNodeSchema, } from '@pascal-app/core';
-import { calculateCursorRotation, calculateItemRotation, EDITOR_LAYER, getSideFromNormal, isMagneticSnapActive, isValidWallSideFace, triggerSFX, useAlignmentGuides, useEditor, useFacingPose, usePlacementPreview, } from '@pascal-app/editor';
+import { DoorNode, emitter, holdHiddenWallPointerEvents, isCurvedWall, sceneRegistry, spatialGridManager, useScene, WallNode as WallNodeSchema, } from '@pascal-app/core';
+import { calculateItemRotation, EDITOR_LAYER, getSideFromNormal, isMagneticSnapActive, isValidWallSideFace, triggerSFX, useAlignmentGuides, useEditor, useFacingPose, usePlacementPreview, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { BoxGeometry, EdgesGeometry, Vector3 } from 'three';
@@ -210,7 +210,7 @@ const DoorTool = () => {
                 applySnap,
             });
             const { clampedX, clampedY } = clampToWall(wall, localX, width, height);
-            const valid = !hasWallChildOverlap(wall.id, clampedX, clampedY, width, height, ignoreId);
+            const valid = !hasWallChildOverlap(wall.id, useScene.getState().nodes, clampedX, clampedY, width, height, ignoreId);
             return { clampedX, clampedY, valid };
         };
         // Shared create/update path for the wall draft — used by the direct
@@ -350,7 +350,13 @@ const DoorTool = () => {
             const side = sideFlip ? (faceSide === 'front' ? 'back' : 'front') : faceSide;
             const flipOffset = sideFlip ? Math.PI : 0;
             const itemRotation = calculateItemRotation(event.normal) + flipOffset;
-            const cursorRotation = calculateCursorRotation(event.normal, event.node.start, event.node.end) + flipOffset;
+            const cursorRotation = 
+            // World yaw of a wall CHILD (-wallAngle + itemRotation, which already
+            // carries the flip) — `calculateCursorRotation` was π off, pointing
+            // the facing triangle at the far side of the wall (see
+            // MoveDoorTool.applyPreview).
+            itemRotation -
+                Math.atan2(event.node.end[1] - event.node.start[1], event.node.end[0] - event.node.start[0]);
             applyWallTarget({
                 wall: event.node,
                 rawLocalX: event.localPosition[0],
@@ -577,12 +583,18 @@ const DoorTool = () => {
         emitter.on('grid:move', onGridFreeFollow);
         emitter.on('tool:cancel', onCancel);
         window.addEventListener('keydown', onKeyDown);
+        // Placement tracks the cursor through wall events; keep walls hidden by
+        // the wall-mode pass (X-ray 'down' mode) pointer-targetable while the
+        // tool is active so a new door still snaps onto them (see the wall
+        // renderer's pointer transparency).
+        const releaseHiddenWallHold = holdHiddenWallPointerEvents();
         return () => {
             destroyDraft();
             hideCursor();
             clearPlacementPreview();
             useAlignmentGuides.getState().clear();
             clearOpeningGuides3D();
+            releaseHiddenWallHold();
             useScene.temporal.getState().resume();
             emitter.off('wall:enter', onWallHover);
             emitter.off('wall:move', onWallHover);

package/dist/dormer/csg-geometry.d.ts

@@ -1,4 +1,4 @@
-import { type DormerNode, type RoofSegmentNode } from '@pascal-app/core';
+import { type DormerNode, type RoofSegmentNode, type WindowNode } from '@pascal-app/core';
 import * as THREE from 'three';
 export declare const DORMER_GABLE_MATERIAL_INDEX = 4;
 /**
@@ -7,46 +7,10 @@ export declare const DORMER_GABLE_MATERIAL_INDEX = 4;
  * the live preview during slider drags so we don't re-run CSG on every
  * pointer move. Also used by the placement / move-tool ghost.
  *
- * Builds a rectangular body + simple roof in dormer-mesh-local. For
- * `flat` dormers the roof triangle is skipped. Other roof types use
- * the gable approximation — it's a rough silhouette by design.
- *
  * The wall sits at material slot 0 and the roof at slot 3 so it picks
  * up the same material array the renderer passes for the CSG output.
  */
 export declare function buildDormerFallbackGeometry(dormer: DormerNode): THREE.BufferGeometry;
-export declare function createDormerArchShape(w: number, h: number, archHeight: number): THREE.Shape;
-export declare function normalizeDormerCornerRadii(radii: [number, number, number, number], w: number, h: number): [number, number, number, number];
-export declare function createDormerRoundedShape(w: number, h: number, radii: [number, number, number, number]): THREE.Shape;
-/**
- * Which gable faces of a dormer have a visible window opening.
- * "front" = mesh-local +Z, "back" = mesh-local −Z (after the +π/2 yaw
- * bake for non-shed roofs).
- *
- * Each face centre is lifted into segment-local X *and* Z (the yaw
- * matters, and on hip hosts the end slopes fall along X) and compared
- * against the host's canonical per-type surface line via
- * `getRoofSegmentSurfaceY`, which extrapolates past the structural
- * eave instead of plateauing at the wall top — a face hanging in free
- * air past the eave keeps dropping. Gates both the CSG window-cut
- * decision (`generateDormerGeometry`) and the live render
- * (window-assembly.tsx).
- */
-export declare function getDormerExposedFaces(dormer: DormerNode, hostSegment: RoofSegmentNode): {
-    front: boolean;
-    back: boolean;
-};
-/**
- * Computed dimensions for the window opening on a dormer's gable face.
- * The skirt (the wall extension below the eave used for CSG-trim) is
- * `DORMER_DROP_BELOW` tall, so the window sits within that band.
- */
-export declare function getDormerSkirtWindowDims(dormer: DormerNode): {
-    width: number;
-    height: number;
-    centerY: number;
-    offsetX: number;
-};
 /**
  * Build the trimmed dormer geometry hosted on a roof segment. The
  * dormer's own walls+roof are generated via `getRoofSegmentBrushes`
@@ -54,7 +18,7 @@ export declare function getDormerSkirtWindowDims(dormer: DormerNode): {
  * CSG-subtracted in dormer-mesh-local space. Window openings are then
  * subtracted on each exposed gable face.
  */
-export declare function generateDormerGeometry(dormer: DormerNode, hostSegment: RoofSegmentNode): THREE.BufferGeometry;
+export declare function generateDormerGeometry(dormer: DormerNode, hostSegment: RoofSegmentNode, hostedWindows?: readonly WindowNode[]): THREE.BufferGeometry;
 /**
  * Build the dormer cut shape in dormer-mesh-local coordinates. The
  * returned geometry is centered at X=Z=0 and spans Y ∈ [-skirt, peak]
@@ -64,10 +28,10 @@ export declare function generateDormerGeometry(dormer: DormerNode, hostSegment:
  * Shapes per roof type:
  * - **flat**:                a plain box (top flush with the eave; the
  *                            dormer body has no roof above wallH).
- * - **shed**:                trapezoid in YZ, extruded along X. Eave
- *                            at z=+d/2 (y=wallH), peak at z=-d/2
- *                            (y=wallH+roofH) — matches the slope
- *                            direction the dormer body uses.
+ * - **shed**:                trapezoid in YZ, extruded along X. The
+ *                            base shape is high at z=-d/2; the caller
+ *                            flips it when the configured high side is
+ *                            the front.
  * - **gable / gambrel**:     pentagon (rectangle + symmetric triangle)
  *                            in XY, extruded along Z. Ridge runs
  *                            along Z (mesh-Z = virtualSegment-X after

package/dist/dormer/csg-geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csg-geometry.d.ts","sourceRoot":"","sources":["../../src/dormer/csg-geometry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EAIf,KAAK,eAAe,EACrB,MAAM,kBAAkB,CAAA;AAezB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAW9B,eAAO,MAAM,2BAA2B,IAAI,CAAA;AAK5C;;;;;;;;;;;;GAYG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,UAAU,GAAG,KAAK,CAAC,cAAc,CA4CpF;AAED,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,KAAK,CAAC,KAAK,CAoB3F;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACvC,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,GACR,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAWlC;AAED,wBAAgB,wBAAwB,CACtC,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GACtC,KAAK,CAAC,KAAK,CAqBb;AA8CD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,eAAe,GAC3B;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CA0BnC;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,UAAU,GAAG;IAC5D,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAChB,CAUA;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,eAAe,GAC3B,KAAK,CAAC,cAAc,CA0OtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,EAChC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,KAAK,CAAC,cAAc,CAmMtB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,GAAG,KAAK,CAAC,cAAc,GAAG,IAAI,CA0DlF"}
+{"version":3,"file":"csg-geometry.d.ts","sourceRoot":"","sources":["../../src/dormer/csg-geometry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EAKf,KAAK,eAAe,EACpB,KAAK,UAAU,EAChB,MAAM,kBAAkB,CAAA;AAgBzB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAW9B,eAAO,MAAM,2BAA2B,IAAI,CAAA;AAK5C;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,UAAU,GAAG,KAAK,CAAC,cAAc,CAEpF;AAiBD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,eAAe,EAC5B,aAAa,GAAE,SAAS,UAAU,EAAO,GACxC,KAAK,CAAC,cAAc,CAsOtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,EAChC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GACZ,KAAK,CAAC,cAAc,CAmMtB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,GAAG,KAAK,CAAC,cAAc,GAAG,IAAI,CA6DlF"}

package/dist/dormer/csg-geometry.js

@@ -1,7 +1,7 @@
-import { getPitchFromActiveRoofHeight, getRoofSegmentSurfaceY, ROOF_SHAPE_DEFAULTS, } from '@pascal-app/core';
-import { ADDITION, Brush, computeGeometryBoundsTree, csgEvaluator, csgGeometry, csgMaterials, getRoofSegmentBrushes, mapRoofGroupMaterialIndex, prepareBrushForCSG, remapRoofShellFaces, roofCsgDummyMats, SUBTRACTION, } from '@pascal-app/viewer';
+import { dormerWallFacePointToDormer, getDormerWallFaceFrame, getPitchFromActiveRoofHeight, ROOF_SHAPE_DEFAULTS, } from '@pascal-app/core';
+import { ADDITION, Brush, buildOpeningCutoutGeometry, computeGeometryBoundsTree, csgEvaluator, csgGeometry, csgMaterials, getRoofSegmentBrushes, mapRoofGroupMaterialIndex, prepareBrushForCSG, remapRoofShellFaces, roofCsgDummyMats, SUBTRACTION, } from '@pascal-app/viewer';
 import * as THREE from 'three';
-import { mergeGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
+import { buildDormerShellGeometry, getDormerBodyYaw } from './geometry';
 // Legacy default for the hung-wall (skirt) height. Used as a fallback
 // when `dormer.wallSkirtHeight` is undefined (e.g. old saved scenes).
 const DORMER_DROP_BELOW = 2;
@@ -17,194 +17,20 @@ const _scale = new THREE.Vector3(1, 1, 1);
  * the live preview during slider drags so we don't re-run CSG on every
  * pointer move. Also used by the placement / move-tool ghost.
  *
- * Builds a rectangular body + simple roof in dormer-mesh-local. For
- * `flat` dormers the roof triangle is skipped. Other roof types use
- * the gable approximation — it's a rough silhouette by design.
- *
  * The wall sits at material slot 0 and the roof at slot 3 so it picks
  * up the same material array the renderer passes for the CSG output.
  */
 export function buildDormerFallbackGeometry(dormer) {
-    const w = Math.max(0.05, dormer.width);
-    const d = Math.max(0.05, dormer.depth);
-    const wallH = Math.max(0.05, dormer.height);
-    const roofH = Math.max(0, dormer.roofHeight);
-    const skirt = dormerSkirtHeight(dormer);
-    const isFlat = dormer.roofType === 'flat' || roofH === 0;
-    // Body box: foot at y = -skirt, top at y = wallH.
-    // BoxGeometry is indexed; ExtrudeGeometry below is not. mergeGeometries
-    // refuses mixed input ("index attribute exists among all geometries,
-    // or in none of them") — drop the body's index so both inputs match.
-    const indexedBody = new THREE.BoxGeometry(w, wallH + skirt, d);
-    indexedBody.translate(0, (wallH - skirt) / 2, 0);
-    const body = indexedBody.toNonIndexed();
-    indexedBody.dispose();
-    const bVtx = body.getAttribute('position').count;
-    body.clearGroups();
-    body.addGroup(0, bVtx, 0);
-    if (isFlat) {
-        if (!body.getAttribute('normal'))
-            body.computeVertexNormals();
-        return body;
-    }
-    // Roof: extruded triangle from eave (y = wallH) to peak (y = wallH + roofH).
-    // Apex points along +Y, base spans the width. Extrude along Z (depth).
-    const roofShape = new THREE.Shape();
-    roofShape.moveTo(-w / 2, 0);
-    roofShape.lineTo(w / 2, 0);
-    roofShape.lineTo(0, roofH);
-    roofShape.lineTo(-w / 2, 0);
-    const roof = new THREE.ExtrudeGeometry(roofShape, { depth: d, bevelEnabled: false });
-    roof.translate(0, wallH, -d / 2);
-    const rVtx = roof.getAttribute('position').count;
-    roof.clearGroups();
-    roof.addGroup(0, rVtx, 3);
-    const merged = mergeGeometries([body, roof], true) ?? body;
-    body.dispose();
-    roof.dispose();
-    if (!merged.getAttribute('normal'))
-        merged.computeVertexNormals();
-    return merged;
-}
-export function createDormerArchShape(w, h, archHeight) {
-    const hw = w / 2;
-    const hh = h / 2;
-    const clampedArch = Math.min(Math.max(archHeight, 0.01), Math.max(h, 0.01));
-    const springY = hh - clampedArch;
-    const segments = 32;
-    const shape = new THREE.Shape();
-    shape.moveTo(-hw, -hh);
-    shape.lineTo(hw, -hh);
-    shape.lineTo(hw, springY);
-    for (let i = 1; i <= segments; i++) {
-        const x = hw + (-hw - hw) * (i / segments);
-        const t = Math.min(Math.abs(x) / hw, 1);
-        const y = springY + clampedArch * Math.sqrt(Math.max(1 - t * t, 0));
-        shape.lineTo(x, y);
-    }
-    shape.lineTo(-hw, -hh);
-    shape.closePath();
-    return shape;
-}
-export function normalizeDormerCornerRadii(radii, w, h) {
-    const r = radii.map((v) => Math.max(v, 0));
-    const scale = Math.min(1, Math.max(w, 0) / Math.max(r[0] + r[1], 1e-6), Math.max(w, 0) / Math.max(r[3] + r[2], 1e-6), Math.max(h, 0) / Math.max(r[0] + r[3], 1e-6), Math.max(h, 0) / Math.max(r[1] + r[2], 1e-6));
-    if (scale >= 1)
-        return r;
-    return r.map((v) => v * scale);
-}
-export function createDormerRoundedShape(w, h, radii) {
-    const hw = w / 2;
-    const hh = h / 2;
-    const [tl, tr, br, bl] = normalizeDormerCornerRadii(radii, w, h);
-    const shape = new THREE.Shape();
-    shape.moveTo(-hw + bl, -hh);
-    shape.lineTo(hw - br, -hh);
-    if (br > 0)
-        shape.absarc(hw - br, -hh + br, br, -Math.PI / 2, 0, false);
-    else
-        shape.lineTo(hw, -hh);
-    shape.lineTo(hw, hh - tr);
-    if (tr > 0)
-        shape.absarc(hw - tr, hh - tr, tr, 0, Math.PI / 2, false);
-    else
-        shape.lineTo(hw, hh);
-    shape.lineTo(-hw + tl, hh);
-    if (tl > 0)
-        shape.absarc(-hw + tl, hh - tl, tl, Math.PI / 2, Math.PI, false);
-    else
-        shape.lineTo(-hw, hh);
-    shape.lineTo(-hw, -hh + bl);
-    if (bl > 0)
-        shape.absarc(-hw + bl, -hh + bl, bl, Math.PI, (3 * Math.PI) / 2, false);
-    else
-        shape.lineTo(-hw, -hh);
-    shape.closePath();
-    return shape;
+    return buildDormerShellGeometry(dormer);
 }
-function resolveDormerRadii(dormer, w, h) {
-    return normalizeDormerCornerRadii(dormer.windowCornerRadii, w, h);
-}
-function createDormerWindowCutGeometry(dormer, w, h, depth) {
-    const shape = dormer.windowShape ?? 'rectangle';
-    if (shape === 'arch') {
-        const s = createDormerArchShape(w, h, dormer.windowArchHeight ?? 0.35);
-        const geo = new THREE.ExtrudeGeometry(s, { depth, bevelEnabled: false, curveSegments: 24 });
-        geo.translate(0, 0, -depth / 2);
-        return geo;
-    }
-    if (shape === 'rounded') {
-        const radii = resolveDormerRadii(dormer, w, h);
-        const s = createDormerRoundedShape(w, h, radii);
-        const geo = new THREE.ExtrudeGeometry(s, { depth, bevelEnabled: false, curveSegments: 24 });
-        geo.translate(0, 0, -depth / 2);
-        return geo;
-    }
-    return new THREE.BoxGeometry(w, h, depth);
-}
-// Exposure datum: a face shows its window when the window CENTER clears
-// the host's structural surface line (≥ half the window visible).
-// Gating on the window BOTTOM suppressed the default window on the
-// default 40° roof (break-even ≈ 36.7° pitch) and across the whole
-// lower-slope/overhang band. A partially buried window reads as a
-// window meeting the roof line: the host shingle shell occludes the
-// buried frame from outside (the dormer roof cut only clears the inner
-// cavity, 5cm short of the gable face), and the glass panes span the
-// full opening so the wall cut never reads as a see-through hole. The
-// margin only absorbs float noise at the grazing boundary — suppress
-// only when the window is truly unplaceable.
-const WINDOW_CENTER_MIN_CLEARANCE = 0.01;
-/**
- * Which gable faces of a dormer have a visible window opening.
- * "front" = mesh-local +Z, "back" = mesh-local −Z (after the +π/2 yaw
- * bake for non-shed roofs).
- *
- * Each face centre is lifted into segment-local X *and* Z (the yaw
- * matters, and on hip hosts the end slopes fall along X) and compared
- * against the host's canonical per-type surface line via
- * `getRoofSegmentSurfaceY`, which extrapolates past the structural
- * eave instead of plateauing at the wall top — a face hanging in free
- * air past the eave keeps dropping. Gates both the CSG window-cut
- * decision (`generateDormerGeometry`) and the live render
- * (window-assembly.tsx).
- */
-export function getDormerExposedFaces(dormer, hostSegment) {
-    const halfDepth = dormer.depth / 2;
-    const dormerX = dormer.position[0] ?? 0;
-    const dormerY = dormer.position[1] ?? 0;
-    const dormerZ = dormer.position[2] ?? 0;
-    const rot = dormer.rotation ?? 0;
-    // Gable-face centres in segment-local X/Z (accounts for dormer yaw).
-    const faceDX = halfDepth * Math.sin(rot);
-    const faceDZ = halfDepth * Math.cos(rot);
-    // Window centre in segment-local Y. Mirrors `getDormerSkirtWindowDims`
-    // so both functions read the same window position: dormer-local Y=0
-    // sits at `dormer.position[1]` and the window centre sits in the
-    // skirt at -(skirtH / 2) + windowOffsetY.
-    const skirtH = dormerSkirtHeight(dormer);
-    const windowCenterSegY = dormerY - skirtH / 2 + (dormer.windowOffsetY ?? 0);
-    const clears = (faceX, faceZ) => windowCenterSegY - getRoofSegmentSurfaceY(hostSegment, faceX, faceZ) >
-        WINDOW_CENTER_MIN_CLEARANCE;
-    return {
-        front: clears(dormerX + faceDX, dormerZ + faceDZ),
-        back: clears(dormerX - faceDX, dormerZ - faceDZ),
-    };
-}
-/**
- * Computed dimensions for the window opening on a dormer's gable face.
- * The skirt (the wall extension below the eave used for CSG-trim) is
- * `DORMER_DROP_BELOW` tall, so the window sits within that band.
- */
-export function getDormerSkirtWindowDims(dormer) {
-    const skirtH = dormerSkirtHeight(dormer);
-    const maxW = Math.max(dormer.width - 0.1, 0.1);
-    const maxH = Math.max(skirtH - 0.1, 0.1);
-    const width = Math.min(Math.max(dormer.windowWidth ?? 1.2, 0.1), maxW);
-    const height = Math.min(Math.max(dormer.windowHeight ?? 1.2, 0.1), maxH);
-    const offsetX = dormer.windowOffsetX ?? 0;
-    const offsetY = dormer.windowOffsetY ?? 0;
-    const centerY = -(skirtH / 2) + offsetY;
-    return { width, height, centerY, offsetX };
+function createHostedWindowCutGeometry(window) {
+    const depth = 0.4;
+    return buildOpeningCutoutGeometry(window, {
+        left: -window.width / 2,
+        right: window.width / 2,
+        bottom: -window.height / 2,
+        top: window.height / 2,
+    }, depth, 0.05);
 }
 /**
  * Build the trimmed dormer geometry hosted on a roof segment. The
@@ -213,9 +39,9 @@ export function getDormerSkirtWindowDims(dormer) {
  * CSG-subtracted in dormer-mesh-local space. Window openings are then
  * subtracted on each exposed gable face.
  */
-export function generateDormerGeometry(dormer, hostSegment) {
+export function generateDormerGeometry(dormer, hostSegment, hostedWindows = []) {
     const isShed = dormer.roofType === 'shed';
-    const yawBake = isShed ? 0 : Math.PI / 2;
+    const yawBake = getDormerBodyYaw(dormer);
     const segWidth = isShed ? dormer.width : dormer.depth;
     const segDepth = isShed ? dormer.depth : dormer.width;
     const skirt = dormerSkirtHeight(dormer);
@@ -228,7 +54,7 @@ export function generateDormerGeometry(dormer, hostSegment) {
         type: 'roof-segment',
         parentId: null,
         visible: true,
-        metadata: null,
+        metadata: {},
         children: [],
         position: [0, 0, 0],
         rotation: 0,
@@ -270,6 +96,9 @@ export function generateDormerGeometry(dormer, hostSegment) {
         deckThickness: 0.04,
         overhang: 0.08,
         shingleThickness: 0.02,
+        managedByParent: false,
+        wallShell: 'auto',
+        shedInsetEndPanels: false,
     };
     const dormerBrushes = getRoofSegmentBrushes(virtualSegment);
     if (!dormerBrushes) {
@@ -332,14 +161,14 @@ export function generateDormerGeometry(dormer, hostSegment) {
             hostSolid = null;
             dormerSolid = trimmed;
         }
-        // Cut window openings on exposed gable faces.
-        const exposed = getDormerExposedFaces(dormer, hostSegment);
-        const skirtWin = getDormerSkirtWindowDims(dormer);
-        const gableHalfZ = dormer.depth / 2;
-        const cutDepth = 0.4;
-        const cutFace = (zSign) => {
-            const cutGeo = createDormerWindowCutGeometry(dormer, skirtWin.width, skirtWin.height, cutDepth);
-            cutGeo.translate(skirtWin.offsetX, skirtWin.centerY, zSign * gableHalfZ);
+        // Cut hosted window openings in dormer-local face coordinates.
+        const cutWindow = (window) => {
+            const face = window.dormerFace ?? 'front';
+            const frame = getDormerWallFaceFrame(dormer, face);
+            const center = dormerWallFacePointToDormer(dormer, face, window.position);
+            const cutGeo = createHostedWindowCutGeometry(window);
+            cutGeo.rotateY(frame.yaw);
+            cutGeo.translate(center[0], center[1], center[2]);
             if (!cutGeo.getIndex()) {
                 const posCount = cutGeo.getAttribute('position').count;
                 const idx = new Uint32Array(posCount);
@@ -359,10 +188,8 @@ export function generateDormerGeometry(dormer, hostSegment) {
             brush.geometry.dispose();
             dormerSolid = result;
         };
-        if (exposed.front)
-            cutFace(+1);
-        if (exposed.back)
-            cutFace(-1);
+        for (const window of hostedWindows)
+            cutWindow(window);
         resultGeo = csgGeometry(dormerSolid);
         const resultMaterials = csgMaterials(dormerSolid);
         const matToIndex = new Map([
@@ -414,10 +241,10 @@ export function generateDormerGeometry(dormer, hostSegment) {
  * Shapes per roof type:
  * - **flat**:                a plain box (top flush with the eave; the
  *                            dormer body has no roof above wallH).
- * - **shed**:                trapezoid in YZ, extruded along X. Eave
- *                            at z=+d/2 (y=wallH), peak at z=-d/2
- *                            (y=wallH+roofH) — matches the slope
- *                            direction the dormer body uses.
+ * - **shed**:                trapezoid in YZ, extruded along X. The
+ *                            base shape is high at z=-d/2; the caller
+ *                            flips it when the configured high side is
+ *                            the front.
  * - **gable / gambrel**:     pentagon (rectangle + symmetric triangle)
  *                            in XY, extruded along Z. Ridge runs
  *                            along Z (mesh-Z = virtualSegment-X after
@@ -675,10 +502,12 @@ export function buildDormerRoofCut(dormer) {
     //   - hip / dutch / mansard:  pyramid (narrows on all 4 sides)
     //   - gable / gambrel:        pentagon (narrows along width axis)
     const geo = buildDormerCutShape(dormer.roofType, innerW, innerD, skirt, wallH, roofH);
-    // Yaw in the geometry's own (un-translated) frame so the cut aligns
-    // with the dormer's footprint after rotation.
-    if (Math.abs(dormer.rotation) > 1e-4) {
-        geo.rotateY(dormer.rotation);
+    // Yaw in the geometry's own (un-translated) frame so the cut follows
+    // both the shed pitch direction and the dormer's footprint rotation.
+    const shedDirectionYaw = dormer.roofType === 'shed' && dormer.shedHighSide === 'front' ? Math.PI : 0;
+    const cutYaw = shedDirectionYaw + dormer.rotation;
+    if (Math.abs(cutYaw) > 1e-4) {
+        geo.rotateY(cutYaw);
     }
     // Translate into segment-local. position[1] becomes the dormer's
     // local Y = 0 (the wall foot / eave line); the shape's foot at

package/dist/dormer/definition.d.ts

@@ -2,19 +2,11 @@ import { type NodeDefinition } from '@pascal-app/core';
 import { DormerNode } from './schema';
 /**
  * Dormer — a small house-shaped protrusion sitting on top of a roof
- * segment. The window opening is inlined into the dormer's schema
- * (window* fields drive parametric geometry on the front face), not
- * a hosted child node — so `relations.hosts` stays unset.
+ * segment. Windows are hosted child nodes; the legacy window* fields remain
+ * in the schema only so scene migration can preserve older dormers.
  *
- * **Scope of this port — stub.** Schema is complete (every field from
- * the archive, including the four per-surface material slots and the
- * full window-opening field set). Geometry renders a simple house
- * silhouette (box body + triangular gable roof) for all `roofType`
- * variants — the archive's variant-specific dormer roof shapes,
- * window opening + frame, sill, and the CSG trim where the dormer
- * meets the host roof are deferred. Per-surface paints (`topMaterial`,
- * `sideMaterial`, `wallMaterial`) resolve via the shared helper from
- * core but only roof / wall surfaces are emitted by the stub geometry.
+ * The renderer cuts each hosted window from the dormer shell and mounts
+ * the regular WindowNode renderer in the selected wall-face frame.
  */
 export declare const dormerDefinition: NodeDefinition<typeof DormerNode>;
 //# sourceMappingURL=definition.d.ts.map

package/dist/dormer/definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/dormer/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,cAAc,EAGpB,MAAM,kBAAkB,CAAA;AAKzB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAmarC;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,OAAO,UAAU,CAwE9D,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/dormer/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAA;AAKzB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAqPrC;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,OAAO,UAAU,CA8E9D,CAAA"}