@pascal-app/nodes 1.0.3 → 1.0.5

package/dist/roof/roof-level-target.d.ts

@@ -0,0 +1,75 @@
+import { type AnyNode, type AnyNodeId, type LevelNode, type RoofNode, type RoofSegmentNode, type SceneApi } from '@pascal-app/core';
+/**
+ * Where a roof drawn by hand goes, by core's rule for every roof writer (`planRoofLevel`): on the
+ * level directly above the storey whose walls carry it, which over the top storey is the
+ * building's roof level, created or declared in the same undo step as the roof.
+ */
+export type RoofLevelTarget = {
+    levelId: LevelNode['id'];
+    create: {
+        node: AnyNode;
+        parentId?: AnyNodeId;
+    }[];
+    update: {
+        id: AnyNodeId;
+        data: Partial<AnyNode>;
+    }[];
+    /** The scene with the target written, to resolve the roof's elevation against. */
+    nodes: Readonly<Record<AnyNodeId, AnyNode>>;
+};
+/** A roof drawn by hand, in the plan of the level it was drawn on: its footprint and form. */
+export type DrawnRoof = {
+    center: [number, number];
+    /** Along plan x and z (a cone: its diameter both ways). */
+    width: number;
+    depth: number;
+    roofType: string;
+};
+/** The target of a roof carried by `storeyId`'s walls, `roofHeight` its rise over its eaves. */
+export declare function roofLevelTarget(nodes: Readonly<Record<AnyNodeId, AnyNode>>, storeyId: LevelNode['id'], roofHeight: number): RoofLevelTarget;
+/**
+ * The target of a roof drawn on the armed level: over that storey (`overStorey`), the level above
+ * its walls; else the level itself (a porch on its posts, an empty upper level or the roof level,
+ * already above what it covers).
+ */
+export declare function drawnRoofLevelTarget(nodes: Readonly<Record<AnyNodeId, AnyNode>>, levelId: LevelNode['id'], roofHeight: number, drawn: DrawnRoof): RoofLevelTarget;
+/**
+ * How a roof drawn on the armed level stands: lifted onto the roof level over the armed storey, on
+ * that storey's walls, following their height as a roof over a room does; anywhere else (a lower
+ * wing's storey above, an empty level) on the level plane it was drawn on.
+ */
+export declare function drawnRoofSupport(target: RoofLevelTarget, armedLevelId: string): NonNullable<RoofNode['support']>;
+/** A roof's eave on the wall tops under it, read with the roof written into the target's scene. */
+export declare function seatedRoofElevation(target: RoofLevelTarget, roof: RoofNode, segments: RoofSegmentNode[]): number;
+/** How far above the armed level a target sits (m), to draw the roof's ghost where it lands. */
+export declare function roofLevelTargetOffset(target: RoofLevelTarget, armedLevelId: string): number;
+/** Writes a roof's nodes with its target level, in one step when the scene can. */
+export declare function writeRoofNodes(sceneApi: SceneApi, target: RoofLevelTarget, ops: {
+    node: AnyNode;
+    parentId?: AnyNodeId;
+}[]): void;
+/**
+ * A roof edit written through the seat every roof writer runs (`seatRoofs`): a segment added to a
+ * roof held by a storey that puts it on that storey's walls takes the roof to the level above them,
+ * in the same store call.
+ */
+export declare function writeSeatedRoofEdit(sceneApi: SceneApi, edit: {
+    create?: {
+        node: AnyNode;
+        parentId?: AnyNodeId;
+    }[];
+    update?: {
+        id: AnyNodeId;
+        data: Partial<AnyNode>;
+    }[];
+}): void;
+/**
+ * A roof edit from the plan or an inspector (a move, a turn, a resize, a field), committed through
+ * the seat (`seatRoofs`) in one store call: an edit that puts a storey-held roof on its walls takes
+ * it to the level above them, and the selection follows `selectId` there.
+ */
+export declare function commitSeatedRoofEdit(update: {
+    id: AnyNodeId;
+    data: Partial<AnyNode>;
+}[], selectId: AnyNodeId): void;
+//# sourceMappingURL=roof-level-target.d.ts.map

package/dist/roof/roof-level-target.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"roof-level-target.d.ts","sourceRoot":"","sources":["../../src/roof/roof-level-target.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,SAAS,EAGd,KAAK,SAAS,EAEd,KAAK,QAAQ,EACb,KAAK,eAAe,EAEpB,KAAK,QAAQ,EAId,MAAM,kBAAkB,CAAA;AAIzB;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;IACxB,MAAM,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;KAAE,EAAE,CAAA;IACjD,MAAM,EAAE;QAAE,EAAE,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,EAAE,CAAA;IACnD,kFAAkF;IAClF,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;CAC5C,CAAA;AAED,8FAA8F;AAC9F,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxB,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAuBD,gGAAgG;AAChG,wBAAgB,eAAe,CAC7B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,EAC3C,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,EACzB,UAAU,EAAE,MAAM,GACjB,eAAe,CAgBjB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,EAC3C,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,EACxB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,SAAS,GACf,eAAe,CAIjB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,MAAM,GACnB,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAIlC;AAED,mGAAmG;AACnG,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,eAAe,EAAE,GAC1B,MAAM,CAQR;AAED,gGAAgG;AAChG,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAG3F;AAED,mFAAmF;AACnF,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,GAC7C,IAAI,CAYN;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE;IACJ,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;KAAE,EAAE,CAAA;IAClD,MAAM,CAAC,EAAE;QAAE,EAAE,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,EAAE,CAAA;CACrD,GACA,IAAI,CASN;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAE,EAAE,EACnD,QAAQ,EAAE,SAAS,GAClB,IAAI,CASN"}

package/dist/roof/roof-level-target.js

@@ -0,0 +1,119 @@
+import { getLevelElevations, isRoofLevel, planRoofLevel, resolveRoofElevation, seatRoofs, standsOverStorey, useScene, } from '@pascal-app/core';
+import { applySceneChanges } from '@pascal-app/core/agent-operations';
+import { selectPlacedNode } from '@pascal-app/editor';
+/** Whether a roof drawn on a walled level stands over that storey (core's `standsOverStorey`). */
+function overStorey(nodes, levelId, drawn) {
+    const level = nodes[levelId];
+    if (level?.type !== 'level' || !level.children.some((id) => nodes[id]?.type === 'wall'))
+        return false;
+    return standsOverStorey(nodes, levelId, {
+        cx: drawn.center[0],
+        cz: drawn.center[1],
+        yaw: 0,
+        hw: drawn.width / 2,
+        hd: drawn.depth / 2,
+        reach: { x: 0, z: 0 },
+        roofType: drawn.roofType,
+        peak: 0,
+    });
+}
+/** The target of a roof carried by `storeyId`'s walls, `roofHeight` its rise over its eaves. */
+export function roofLevelTarget(nodes, storeyId, roofHeight) {
+    const plan = planRoofLevel(nodes, storeyId, roofHeight);
+    const create = plan.kind === 'roof' && plan.create
+        ? [{ node: plan.create, parentId: (plan.create.parentId ?? undefined) }]
+        : [];
+    const update = (plan.kind === 'roof' ? plan.update : []).map(({ id, data }) => ({
+        id: id,
+        data: data,
+    }));
+    return {
+        levelId: plan.levelId,
+        create,
+        update,
+        nodes: create.length || update.length ? applySceneChanges(nodes, { create, update }) : nodes,
+    };
+}
+/**
+ * The target of a roof drawn on the armed level: over that storey (`overStorey`), the level above
+ * its walls; else the level itself (a porch on its posts, an empty upper level or the roof level,
+ * already above what it covers).
+ */
+export function drawnRoofLevelTarget(nodes, levelId, roofHeight, drawn) {
+    return overStorey(nodes, levelId, drawn)
+        ? roofLevelTarget(nodes, levelId, roofHeight)
+        : { levelId, create: [], update: [], nodes };
+}
+/**
+ * How a roof drawn on the armed level stands: lifted onto the roof level over the armed storey, on
+ * that storey's walls, following their height as a roof over a room does; anywhere else (a lower
+ * wing's storey above, an empty level) on the level plane it was drawn on.
+ */
+export function drawnRoofSupport(target, armedLevelId) {
+    return target.levelId !== armedLevelId && isRoofLevel(target.nodes[target.levelId])
+        ? { kind: 'walls' }
+        : { kind: 'level' };
+}
+/** A roof's eave on the wall tops under it, read with the roof written into the target's scene. */
+export function seatedRoofElevation(target, roof, segments) {
+    const seated = applySceneChanges(target.nodes, {
+        create: [
+            { node: roof, parentId: target.levelId },
+            ...segments.map((segment) => ({ node: segment, parentId: roof.id })),
+        ],
+    });
+    return resolveRoofElevation(seated[roof.id], seated);
+}
+/** How far above the armed level a target sits (m), to draw the roof's ghost where it lands. */
+export function roofLevelTargetOffset(target, armedLevelId) {
+    const elevations = getLevelElevations(target.nodes);
+    return (elevations.get(target.levelId)?.baseY ?? 0) - (elevations.get(armedLevelId)?.baseY ?? 0);
+}
+/** Writes a roof's nodes with its target level, in one step when the scene can. */
+export function writeRoofNodes(sceneApi, target, ops) {
+    const create = [...target.create, ...ops];
+    if (sceneApi.applyChanges) {
+        sceneApi.applyChanges({ create, update: target.update });
+        return;
+    }
+    for (const { id, data } of target.update)
+        sceneApi.update(id, data);
+    if (sceneApi.createMany) {
+        sceneApi.createMany(create);
+        return;
+    }
+    for (const op of create)
+        sceneApi.upsert(op.node, op.parentId);
+}
+/**
+ * A roof edit written through the seat every roof writer runs (`seatRoofs`): a segment added to a
+ * roof held by a storey that puts it on that storey's walls takes the roof to the level above them,
+ * in the same store call.
+ */
+export function writeSeatedRoofEdit(sceneApi, edit) {
+    const { changes } = seatRoofs(sceneApi.nodes(), edit);
+    if (sceneApi.applyChanges) {
+        sceneApi.applyChanges(changes);
+        return;
+    }
+    // creates first: a roof the seat moves goes to a Roof level the seat creates
+    for (const op of changes.create ?? [])
+        sceneApi.upsert(op.node, op.parentId);
+    for (const { id, data } of changes.update ?? [])
+        sceneApi.update(id, data);
+}
+/**
+ * A roof edit from the plan or an inspector (a move, a turn, a resize, a field), committed through
+ * the seat (`seatRoofs`) in one store call: an edit that puts a storey-held roof on its walls takes
+ * it to the level above them, and the selection follows `selectId` there.
+ */
+export function commitSeatedRoofEdit(update, selectId) {
+    const scene = useScene.getState();
+    const { changes, notes } = seatRoofs(scene.nodes, { update });
+    if (!notes.length) {
+        scene.updateNodes(update);
+        return;
+    }
+    scene.applyNodeChanges(changes);
+    selectPlacedNode(selectId);
+}

package/dist/roof/roof-placement-mode.d.ts

@@ -6,12 +6,13 @@ type RoofPlacementModeState = {
     setConical: (conical: boolean) => void;
 };
 declare const useRoofPlacementMode: import("zustand").UseBoundStore<import("zustand").StoreApi<RoofPlacementModeState>>;
+declare const subscribeToRoofKind: (onChange: () => void) => () => void;
 export declare const conicalRoofToolHintVisibility: {
-    subscribe: (onChange: () => void) => () => void;
+    subscribe: typeof subscribeToRoofKind;
     value: () => boolean;
 };
 export declare const standardRoofToolHintVisibility: {
-    subscribe: (onChange: () => void) => () => void;
+    subscribe: typeof subscribeToRoofKind;
     value: () => boolean;
 };
 export default useRoofPlacementMode;

package/dist/roof/roof-placement-mode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"roof-placement-mode.d.ts","sourceRoot":"","sources":["../../src/roof/roof-placement-mode.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAA;AAI1D,KAAK,sBAAsB,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,iBAAiB,CAAA;IACvB,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CACvC,CAAA;AAED,QAAA,MAAM,oBAAoB,qFAQvB,CAAA;AAOH,eAAO,MAAM,6BAA6B;0BALH,MAAM,IAAI;;CAQhD,CAAA;AAED,eAAO,MAAM,8BAA8B;0BAVJ,MAAM,IAAI;;CAahD,CAAA;AAED,eAAe,oBAAoB,CAAA"}
+{"version":3,"file":"roof-placement-mode.d.ts","sourceRoot":"","sources":["../../src/roof/roof-placement-mode.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAA;AAI1D,KAAK,sBAAsB,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,iBAAiB,CAAA;IACvB,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CACvC,CAAA;AAED,QAAA,MAAM,oBAAoB,qFAQvB,CAAA;AAEH,QAAA,MAAM,mBAAmB,aAAc,MAAM,IAAI,eAG7C,CAAA;AAEJ,eAAO,MAAM,6BAA6B;IACxC,SAAS;IACT,KAAK;CACN,CAAA;AAED,eAAO,MAAM,8BAA8B;IACzC,SAAS;IACT,KAAK;CACN,CAAA;eAEc,oBAAoB"}

package/dist/roof/system.d.ts

@@ -1,3 +1,2 @@
-import { RoofSystem } from '@pascal-app/viewer';
-export default RoofSystem;
+export default function RoofSystems(): import("react").JSX.Element;
 //# sourceMappingURL=system.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/roof/system.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,eAAe,UAAU,CAAA"}
+{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/roof/system.tsx"],"names":[],"mappings":"AAKA,MAAM,CAAC,OAAO,UAAU,WAAW,gCAElC"}

package/dist/roof/system.js

@@ -1,3 +1,7 @@
 'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { RoofSystem } from '@pascal-app/viewer';
-export default RoofSystem;
+import { glazedRoofGeometryAdapter } from './glazed-geometry.js';
+export default function RoofSystems() {
+    return _jsx(RoofSystem, { geometryAdapter: glazedRoofGeometryAdapter });
+}

package/dist/roof/tool.d.ts

@@ -1,10 +1,10 @@
 import { type AnyNode, type LevelNode, type RoofFootprintTarget, type SceneApi } from '@pascal-app/core';
-import { type RoofPlacementMode } from './roof-placement-mode';
+import { type RoofPlacementMode } from './roof-placement-mode.js';
 /**
  * Creates a roof group with one default gable segment
  */
-export declare const commitRoofPlacement: (sceneApi: SceneApi, levelId: LevelNode["id"], corner1: [number, number, number], corner2: [number, number, number], selectedIds: string[], quarterTurn: boolean, placementMode: RoofPlacementMode) => AnyNode["id"] | null;
-export declare const commitRoofFootprint: (sceneApi: SceneApi, levelId: LevelNode["id"], target: RoofFootprintTarget, quarterTurn: boolean) => AnyNode["id"] | null;
+export declare const commitRoofPlacement: (sceneApi: SceneApi, levelId: LevelNode['id'], corner1: [number, number, number], corner2: [number, number, number], selectedIds: string[], quarterTurn: boolean, placementMode: RoofPlacementMode) => AnyNode['id'] | null;
+export declare const commitRoofFootprint: (sceneApi: SceneApi, levelId: LevelNode['id'], target: RoofFootprintTarget, quarterTurn: boolean) => AnyNode['id'] | null;
 export declare const RoofTool: React.FC;
 export default RoofTool;
 //# sourceMappingURL=tool.d.ts.map

package/dist/roof/tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/roof/tool.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,OAAO,EAWZ,KAAK,SAAS,EACd,KAAK,mBAAmB,EAQxB,KAAK,QAAQ,EAKd,MAAM,kBAAkB,CAAA;AAsCzB,OAA6B,EAAE,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAwHpF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAC9B,UAAU,QAAQ,EAClB,SAAS,SAAS,CAAC,IAAI,CAAC,EACxB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACjC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACjC,aAAa,MAAM,EAAE,EACrB,aAAa,OAAO,EACpB,eAAe,iBAAiB,KAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,IA8JlB,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,UAAU,QAAQ,EAClB,SAAS,SAAS,CAAC,IAAI,CAAC,EACxB,QAAQ,mBAAmB,EAC3B,aAAa,OAAO,KACnB,OAAO,CAAC,IAAI,CAAC,GAAG,IA0ClB,CAAA;AA2LD,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAusB5B,CAAA;AAED,eAAe,QAAQ,CAAA"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/roof/tool.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,OAAO,EAUZ,KAAK,SAAS,EACd,KAAK,mBAAmB,EAQxB,KAAK,QAAQ,EAKd,MAAM,kBAAkB,CAAA;AA+CzB,OAA6B,EAAE,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AA6GpF;;GAEG;AACH,eAAO,MAAM,mBAAmB,aACpB,QAAQ,WACT,SAAS,CAAC,IAAI,CAAC,WACf,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,WACxB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,eACpB,MAAM,EAAE,eACR,OAAO,iBACL,iBAAiB,KAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,IAkMlB,CAAA;AAED,eAAO,MAAM,mBAAmB,aACpB,QAAQ,WACT,SAAS,CAAC,IAAI,CAAC,UAChB,mBAAmB,eACd,OAAO,KACnB,OAAO,CAAC,IAAI,CAAC,GAAG,IAyClB,CAAA;AA2LD,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EA6tB5B,CAAA;eAEc,QAAQ"}

package/dist/roof/tool.js

@@ -1,26 +1,19 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { collectAlignmentAnchors, emitter, findLevelAboveId, getLevelElevations, getWallArcData, getWallBaseElevationForNodes, getWallEffectiveHeightForNodes, isCurvedWall, RoofNode, RoofSegmentNode, RoofType as RoofTypeSchema, resolveBuildingForLevel, resolveLevelId, resolveRoomRoofFootprint, sceneRegistry, wallSegmentAnchors, } from '@pascal-app/core';
+import { collectAlignmentAnchors, emitter, getActiveRoofHeight, getWallArcData, getWallBaseElevationForNodes, getWallEffectiveHeightForNodes, isCurvedWall, RoofNode, RoofSegmentNode, RoofType as RoofTypeSchema, resolveBuildingForLevel, resolveLevelId, resolveRoomRoofFootprint, sceneRegistry, wallSegmentAnchors, } from '@pascal-app/core';
 import { CursorSphere, clearSurfacePlanSnapFeedback, EDITOR_LAYER, isGridSnapActive, isMagneticSnapActive, markToolCancelConsumed, resolveSurfacePlanPointSnap, snapWorldXZForActiveBuilding, triggerSFX, useEditor, useFloorplanDraftPreview, useInteractionScope, useRegistryToolContext, } from '@pascal-app/editor';
 import { generateRoofSegmentGeometry, useViewer } from '@pascal-app/viewer';
 import { useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
 import * as THREE from 'three';
 import { BufferGeometry, DoubleSide, Float32BufferAttribute, Vector3, } from 'three';
-import { createConicalRoofSectorAboveWall } from './conical-roof';
-import { resolveConicalRoofPlacement } from './conical-roof-placement';
-import { isStandardRoofWallEligible, parseRoofFootprintSource, resolveRoofFootprintElevation, resolveRoofFootprintWorldElevation, resolveRoofWallTopWorldElevation, subscribeToConicalRoofWallClicks, } from './roof-footprint';
-import useRoofFootprintSource from './roof-footprint-source';
-import useRoofPlacementMode, {} from './roof-placement-mode';
+import { createConicalRoofSectorAboveWall } from './conical-roof.js';
+import { resolveConicalRoofPlacement } from './conical-roof-placement.js';
+import { isStandardRoofWallEligible, parseRoofFootprintSource, resolveRoofFootprintElevation, resolveRoofFootprintWorldElevation, resolveRoofWallTopWorldElevation, subscribeToConicalRoofWallClicks, } from './roof-footprint.js';
+import useRoofFootprintSource from './roof-footprint-source.js';
+import { drawnRoofLevelTarget, drawnRoofSupport, roofLevelTarget, roofLevelTargetOffset, seatedRoofElevation, writeRoofNodes, writeSeatedRoofEdit, } from './roof-level-target.js';
+import useRoofPlacementMode, {} from './roof-placement-mode.js';
 const DEFAULT_WALL_HEIGHT = 0.5;
 const DEFAULT_PITCH_DEG = 40;
 const GRID_OFFSET = 0.02;
-function createRoofNodes(sceneApi, ops) {
-    if (sceneApi.createMany) {
-        sceneApi.createMany(ops);
-        return;
-    }
-    for (const op of ops)
-        sceneApi.upsert(op.node, op.parentId);
-}
 function placementOptions(mode) {
     return {
         allowRoofSupport: mode !== 'ground',
@@ -122,9 +115,22 @@ export const commitRoofPlacement = (sceneApi, levelId, corner1, corner2, selecte
     if (roofType === 'conical') {
         const diameter = Math.max(footprintWidth, footprintDepth);
         const curbHeight = typeof defaults.wallHeight === 'number' ? defaults.wallHeight : DEFAULT_WALL_HEIGHT;
+        const cone = RoofSegmentNode.parse({
+            pitch: DEFAULT_PITCH_DEG,
+            ...defaults,
+            roofType,
+            width: diameter,
+            depth: diameter,
+        });
+        const target = drawnRoofLevelTarget(nodes, levelId, curbHeight + getActiveRoofHeight(cone), {
+            center: [centerX, centerZ],
+            width: diameter,
+            depth: diameter,
+            roofType,
+        });
         const resolved = resolveConicalRoofPlacement({
-            nodes,
-            levelId,
+            nodes: target.nodes,
+            levelId: target.levelId,
             center: [centerX, centerZ],
             radius: diameter / 2,
             curbHeight,
@@ -150,8 +156,8 @@ export const commitRoofPlacement = (sceneApi, levelId, corner1, corner2, selecte
             support: resolved.support,
             children: [segment.id],
         });
-        createRoofNodes(sceneApi, [
-            { node: roof, parentId: levelId },
+        writeRoofNodes(sceneApi, target, [
+            { node: roof, parentId: target.levelId },
             { node: segment, parentId: roof.id },
         ]);
         triggerSFX('sfx:structure-build');
@@ -190,7 +196,14 @@ export const commitRoofPlacement = (sceneApi, levelId, corner1, corner2, selecte
             localZ = dx * Math.sin(angle) + dz * Math.cos(angle);
         }
         const placement = resolveRoofDraftPlacement(footprintWidth, footprintDepth, quarterTurn, targetRoof.rotation, roofType);
+        const sibling = targetRoof.children
+            .map((id) => nodes[id])
+            .find((node) => node?.type === 'roof-segment');
         const segment = RoofSegmentNode.parse({
+            roofSystem: sibling?.type === 'roof-segment' ? sibling.roofSystem : undefined,
+            glazing: sibling?.type === 'roof-segment' ? sibling.glazing : undefined,
+            barrelRise: sibling?.type === 'roof-segment' ? sibling.barrelRise : undefined,
+            barrelSegments: sibling?.type === 'roof-segment' ? sibling.barrelSegments : undefined,
             wallHeight: DEFAULT_WALL_HEIGHT,
             pitch: DEFAULT_PITCH_DEG,
             roofType: 'gable',
@@ -200,7 +213,9 @@ export const commitRoofPlacement = (sceneApi, levelId, corner1, corner2, selecte
             position: [localX, 0, localZ],
             rotation: placement.rotation,
         });
-        sceneApi.upsert(segment, targetRoofId);
+        writeSeatedRoofEdit(sceneApi, {
+            create: [{ node: segment, parentId: targetRoofId }],
+        });
         triggerSFX('sfx:structure-build');
         return segment.id; // Returns segment ID so it can be selected immediately
     }
@@ -220,18 +235,27 @@ export const commitRoofPlacement = (sceneApi, levelId, corner1, corner2, selecte
         position: [0, 0, 0],
         rotation: placement.rotation,
     });
+    // Drawn over a storey's walls, the roof goes on the level above them.
+    const target = drawnRoofLevelTarget(nodes, levelId, segment.wallHeight + getActiveRoofHeight(segment), { center: [centerX, centerZ], width: footprintWidth, depth: footprintDepth, roofType });
+    const support = drawnRoofSupport(target, levelId);
     // Create the roof container. Segment-shaped params (roofType, pitch, …) are
     // dropped by the RoofNode schema; surface materials in `defaults` carry over.
-    const roof = RoofNode.parse({
+    const placed = RoofNode.parse({
         ...defaults,
         name,
         position: [centerX, 0, centerZ],
-        support: { kind: 'level' },
+        support,
         children: [segment.id],
     });
+    const roof = support.kind === 'walls'
+        ? RoofNode.parse({
+            ...placed,
+            position: [centerX, seatedRoofElevation(target, placed, [segment]), centerZ],
+        })
+        : placed;
     // Create roof first (so segment can be parented to it), then segment
-    createRoofNodes(sceneApi, [
-        { node: roof, parentId: levelId },
+    writeRoofNodes(sceneApi, target, [
+        { node: roof, parentId: target.levelId },
         { node: segment, parentId: roof.id },
     ]);
     triggerSFX('sfx:structure-build');
@@ -257,26 +281,25 @@ export const commitRoofFootprint = (sceneApi, levelId, target, quarterTurn) => {
         position: [0, 0, 0],
         rotation: quarterTurn ? Math.PI / 2 : 0,
     });
-    // A roof belongs to the storey above the walls it covers, whichever level the
-    // tool was armed on; the top floor keeps it on the walls' own level.
+    // A roof belongs to the level above the walls it covers, whichever level the tool was armed
+    // on: over the top floor, the building's roof level.
     const firstWall = target.wallIds.map((id) => nodes[id]).find((node) => node?.type === 'wall');
-    const wallsLevelId = firstWall ? resolveLevelId(firstWall, nodes) : levelId;
-    const parentLevelId = (findLevelAboveId(wallsLevelId, getLevelElevations(nodes)) ??
-        wallsLevelId);
+    const wallsLevelId = (firstWall ? resolveLevelId(firstWall, nodes) : levelId);
+    const level = roofLevelTarget(nodes, wallsLevelId, getActiveRoofHeight(segment));
     const roof = RoofNode.parse({
         ...defaults,
         name: `Roof ${roofCount + 1}`,
         position: [
             target.center[0],
-            resolveRoofFootprintElevation(parentLevelId, target, nodes),
+            resolveRoofFootprintElevation(level.levelId, target, level.nodes),
             target.center[1],
         ],
         rotation: target.rotation,
         support: { kind: 'walls' },
         children: [segment.id],
     });
-    createRoofNodes(sceneApi, [
-        { node: roof, parentId: parentLevelId },
+    writeRoofNodes(sceneApi, level, [
+        { node: roof, parentId: level.levelId },
         { node: segment, parentId: roof.id },
     ]);
     triggerSFX('sfx:structure-build');
@@ -552,9 +575,15 @@ export const RoofTool = () => {
                 const diameter = Math.max(Math.abs(corner2[0] - corner1[0]), Math.abs(corner2[2] - corner1[2]));
                 const defaults = useEditor.getState().toolDefaults.roof;
                 const curbHeight = typeof defaults?.wallHeight === 'number' ? defaults.wallHeight : DEFAULT_WALL_HEIGHT;
+                const target = drawnRoofLevelTarget(sceneApi.nodes(), currentLevelId, 0, {
+                    center: [centerX, centerZ],
+                    width: diameter,
+                    depth: diameter,
+                    roofType,
+                });
                 const placement = resolveConicalRoofPlacement({
-                    nodes: sceneApi.nodes(),
-                    levelId: currentLevelId,
+                    nodes: target.nodes,
+                    levelId: target.levelId,
                     center: [centerX, centerZ],
                     radius: diameter / 2,
                     curbHeight,
@@ -562,7 +591,9 @@ export const RoofTool = () => {
                 });
                 if (placement.valid) {
                     gridY =
-                        placement.position[1] +
+                        corner1[1] +
+                            roofLevelTargetOffset(target, currentLevelId) +
+                            placement.position[1] +
                             (placement.kind === 'roof' ? placement.wallHeight - curbHeight : 0) +
                             GRID_OFFSET;
                 }
@@ -789,18 +820,28 @@ export const RoofTool = () => {
                 centerZ: footprintTarget.center[1],
             }
             : null;
+    // A roof drawn over the armed level's walls lands on the level above them; its ghost does too.
+    const drawTarget = useMemo(() => currentLevelId && footprintSource === 'draw' && previewDimensions
+        ? drawnRoofLevelTarget(nodes, currentLevelId, 0, {
+            center: [previewDimensions.centerX, previewDimensions.centerZ],
+            width: previewDimensions.length,
+            depth: previewDimensions.width,
+            roofType,
+        })
+        : null, [currentLevelId, footprintSource, nodes, previewDimensions, roofType]);
+    const drawLift = drawTarget && currentLevelId ? roofLevelTargetOffset(drawTarget, currentLevelId) : 0;
     const conicalPlacement = useMemo(() => {
-        if (!(currentLevelId && previewDimensions && roofType === 'conical'))
+        if (!(drawTarget && previewDimensions && roofType === 'conical'))
             return null;
         return resolveConicalRoofPlacement({
-            nodes,
-            levelId: currentLevelId,
+            nodes: drawTarget.nodes,
+            levelId: drawTarget.levelId,
             center: [previewDimensions.centerX, previewDimensions.centerZ],
             radius: Math.max(previewDimensions.length, previewDimensions.width) / 2,
             curbHeight: previewWallHeight,
             ...placementOptions(placementMode),
         });
-    }, [currentLevelId, nodes, placementMode, previewDimensions, previewWallHeight, roofType]);
+    }, [drawTarget, placementMode, previewDimensions, previewWallHeight, roofType]);
     const conicalWallGhost = useMemo(() => {
         if (!(roofType === 'conical' && footprintSource === 'walls' && previewedConicalWallId))
             return null;
@@ -840,9 +881,7 @@ export const RoofTool = () => {
             : previewWallHeight;
     const ghostBaseY = footprintSource !== 'draw' && footprintTarget && currentLevelId
         ? resolveRoofFootprintWorldElevation(currentLevelId, footprintTarget, nodes)
-        : conicalPlacement?.valid === true
-            ? conicalPlacement.position[1]
-            : levelY;
+        : levelY + drawLift + (conicalPlacement?.valid === true ? conicalPlacement.position[1] : 0);
     const ghostColor = footprintSource !== 'draw' &&
         footprintTarget &&
         !footprintTarget.rectangular &&

package/dist/roof-segment/definition.d.ts

@@ -1,5 +1,5 @@
 import { type NodeDefinition } from '@pascal-app/core';
-import { RoofSegmentNode } from './schema';
+import { RoofSegmentNode } from './schema.js';
 /**
  * Roof segment — Stage A. Child of a roof node, owns the per-segment
  * polygon + pitch. Geometry is generated by `RoofSystem` (registered

package/dist/roof-segment/definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/roof-segment/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,cAAc,EAGpB,MAAM,kBAAkB,CAAA;AASzB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAoS1C;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CA6ExE,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/roof-segment/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,cAAc,EAGpB,MAAM,kBAAkB,CAAA;AAUzB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAgP1C;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CA8FxE,CAAA"}