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

package/dist/cabinet/flame-index.d.ts

@@ -0,0 +1,3 @@
+import type { Object3D } from 'three';
+export declare function collectCabinetFlameObjects(root: Object3D): Object3D[];
+//# sourceMappingURL=flame-index.d.ts.map

package/dist/cabinet/flame-index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"flame-index.d.ts","sourceRoot":"","sources":["../../src/cabinet/flame-index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAUrC,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAMrE"}

package/dist/cabinet/flame-index.js

@@ -0,0 +1,13 @@
+function isFlameObject(object) {
+    return Boolean(object.userData.cabinetFlameJet ||
+        object.userData.cabinetFlamePulse ||
+        object.userData.cabinetFlameMaterialPulse);
+}
+export function collectCabinetFlameObjects(root) {
+    const objects = [];
+    root.traverse((object) => {
+        if (isFlameObject(object))
+            objects.push(object);
+    });
+    return objects;
+}

package/dist/cabinet/system.d.ts

@@ -1,4 +1,6 @@
 import { type SceneApi } from '@pascal-app/core';
+import type { Object3D } from 'three';
+export declare function animateCabinetFlames(objects: Object3D[], elapsedTime: number, updateTubes: boolean): void;
 /**
  * Poses door hinges / drawer slides stamped with `userData.cabinetPose`
  * directly, so `operationState` changes never trigger a geometry rebuild

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

@@ -1 +1 @@
-{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/cabinet/system.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAoC,KAAK,QAAQ,EAAiB,MAAM,kBAAkB,CAAA;AAmDjG;;;;;;GAMG;AACH,QAAA,MAAM,sBAAsB,GAAI,cAAc;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,SAkEnE,CAAA;AAED,eAAe,sBAAsB,CAAA"}
+{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/cabinet/system.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAoC,KAAK,QAAQ,EAAiB,MAAM,kBAAkB,CAAA;AAGjG,OAAO,KAAK,EAAmC,QAAQ,EAAE,MAAM,OAAO,CAAA;AAgBtE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,QAAQ,EAAE,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,OAAO,QAgCrB;AAED;;;;;;GAMG;AACH,QAAA,MAAM,sBAAsB,GAAI,cAAc;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,SAuFnE,CAAA;AAED,eAAe,sBAAsB,CAAA"}

package/dist/cabinet/system.js

@@ -5,22 +5,23 @@ import { useRef } from 'react';
 import { poseCabinetMovingParts } from './animation';
 import { updateCooktopFlameTube } from './cooktop-flame';
 import { bumpCabinetRunsNear, cabinetRunFootprint, cabinetRunNeighborSignature, } from './definition';
+import { collectCabinetFlameObjects } from './flame-index';
 function materialWithOpacity(material) {
     if (!material)
         return null;
     return Array.isArray(material) ? (material[0] ?? null) : material;
 }
-function animateCabinetFlames(root, elapsedTime, updateTubes) {
-    root.traverse((obj) => {
+export function animateCabinetFlames(objects, elapsedTime, updateTubes) {
+    for (const obj of objects) {
         const jet = obj.userData.cabinetFlameJet;
         if (jet) {
             if (!updateTubes)
-                return;
+                continue;
             const mesh = obj;
             const position = mesh.geometry.getAttribute('position');
             updateCooktopFlameTube(position.array, elapsedTime, jet.seed, jet.burnerR);
             position.needsUpdate = true;
-            return;
+            continue;
         }
         const pulse = obj.userData.cabinetFlamePulse;
         if (pulse) {
@@ -28,14 +29,14 @@ function animateCabinetFlames(root, elapsedTime, updateTubes) {
         }
         const materialPulse = obj.userData.cabinetFlameMaterialPulse;
         if (!materialPulse)
-            return;
+            continue;
         const material = materialWithOpacity(obj.material);
         if (!material || !('opacity' in material))
-            return;
+            continue;
         material.opacity =
             materialPulse.base +
                 materialPulse.amplitude * Math.sin(elapsedTime * 2.3 + materialPulse.phase);
-    });
+    }
 }
 /**
  * Poses door hinges / drawer slides stamped with `userData.cabinetPose`
@@ -47,6 +48,7 @@ function animateCabinetFlames(root, elapsedTime, updateTubes) {
 const CabinetAnimationSystem = ({ sceneApi }) => {
     const appliedRef = useRef(new Map());
     const lastTubeUpdateRef = useRef(0);
+    const flameObjectsRef = useRef(new Map());
     // Last-seen neighbor-affecting signature per run. A run whose countertop
     // overhang trims against sibling runs never sees a neighbor's move in its
     // own geometryKey, so when a run's signature changes here we bump the
@@ -107,9 +109,27 @@ const CabinetAnimationSystem = ({ sceneApi }) => {
                     poseCabinetMovingParts(obj, value);
                     applied.set(id, value);
                 }
-                animateCabinetFlames(obj, clock.elapsedTime, updateTubes);
+                let flameEntry = flameObjectsRef.current.get(id);
+                const childrenChanged = !flameEntry ||
+                    flameEntry.children.length !== obj.children.length ||
+                    flameEntry.children.some((child, index) => child !== obj.children[index]);
+                if (flameEntry?.root !== obj || childrenChanged) {
+                    flameEntry = {
+                        root: obj,
+                        children: [...obj.children],
+                        objects: collectCabinetFlameObjects(obj),
+                    };
+                    flameObjectsRef.current.set(id, flameEntry);
+                }
+                if (flameEntry.objects.length > 0) {
+                    animateCabinetFlames(flameEntry.objects, clock.elapsedTime, updateTubes);
+                }
             }
         }
+        for (const id of flameObjectsRef.current.keys()) {
+            if (!sceneRegistry.nodes.has(id))
+                flameObjectsRef.current.delete(id);
+        }
     }, 2);
     return null;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/cabinet/tool.tsx"],"names":[],"mappings":"AA+PA,QAAA,MAAM,WAAW,0CA29BhB,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/cabinet/tool.tsx"],"names":[],"mappings":"AA+PA,QAAA,MAAM,WAAW,0CA49BhB,CAAA;AAED,eAAe,WAAW,CAAA"}

package/dist/cabinet/tool.js

@@ -122,6 +122,7 @@ function wallHitFromWallEvent(event) {
 const CabinetTool = () => {
     const activeLevelId = useViewer((s) => s.selection.levelId);
     const unit = useViewer((s) => s.unit);
+    const metricNotation = useViewer((s) => s.metricNotation);
     const [placement, setPlacement] = useState(null);
     const [draftSegments, setDraftSegments] = useState([]);
     const [yaw, setYaw] = useState(0);
@@ -917,7 +918,7 @@ const CabinetTool = () => {
         visualPosition[1],
         placementBoxPlanPosition[2],
     ];
-    return (_jsxs(LevelOffsetGroup, { children: [placement.guide && _jsx(WallSnapGuide, { blocked: !placement.valid, guide: placement.guide }), _jsx(PlacementBox, { dimensions: placementBoxDimensions, measurements: { unit }, position: placementBoxPosition, rotationY: placementRotationY, valid: placement.valid }), draftSegments.map((segment, segmentIndex) => (_jsx("group", { position: segment.anchor.position, rotation: [0, segment.anchor.yaw, 0], children: segment.stretch.modules.map((module, index) => (_jsx("group", { position: [module.x, 0, 0], scale: [module.width / previewNode.width, 1, 1], children: _jsx("primitive", { object: ghostForIndex(draftModuleOffsets[segmentIndex] + index) }) }, `${segmentIndex}-${index}`))) }, `draft-${segmentIndex}`))), _jsx("group", { ref: activeGhostRef, position: visualPosition, rotation: [0, placementRotationY, 0], children: stretch ? (stretch.modules.map((module, index) => (_jsx("group", { position: [module.x, 0, 0], scale: [module.width / previewNode.width, 1, 1], children: _jsx("primitive", { object: ghostForIndex(activeStretchGhostOffset + index) }) }, index)))) : (_jsx("primitive", { object: ghost })) }), placementLabel ? (_jsx(Html, { center: true, position: [
+    return (_jsxs(LevelOffsetGroup, { children: [placement.guide && _jsx(WallSnapGuide, { blocked: !placement.valid, guide: placement.guide }), _jsx(PlacementBox, { dimensions: placementBoxDimensions, measurements: { unit, metricNotation }, position: placementBoxPosition, rotationY: placementRotationY, valid: placement.valid }), draftSegments.map((segment, segmentIndex) => (_jsx("group", { position: segment.anchor.position, rotation: [0, segment.anchor.yaw, 0], children: segment.stretch.modules.map((module, index) => (_jsx("group", { position: [module.x, 0, 0], scale: [module.width / previewNode.width, 1, 1], children: _jsx("primitive", { object: ghostForIndex(draftModuleOffsets[segmentIndex] + index) }) }, `${segmentIndex}-${index}`))) }, `draft-${segmentIndex}`))), _jsx("group", { ref: activeGhostRef, position: visualPosition, rotation: [0, placementRotationY, 0], children: stretch ? (stretch.modules.map((module, index) => (_jsx("group", { position: [module.x, 0, 0], scale: [module.width / previewNode.width, 1, 1], children: _jsx("primitive", { object: ghostForIndex(activeStretchGhostOffset + index) }) }, index)))) : (_jsx("primitive", { object: ghost })) }), placementLabel ? (_jsx(Html, { center: true, position: [
                     labelPosition[0],
                     previewNode.plinthHeight + previewNode.carcassHeight + 0.35,
                     labelPosition[2],

package/dist/ceiling/panel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel.d.ts","sourceRoot":"","sources":["../../src/ceiling/panel.tsx"],"names":[],"mappings":"AA2BA;;;;;;;GAOG;AACH,wBAAgB,YAAY,uCA0V3B;AAED,eAAe,YAAY,CAAA"}
+{"version":3,"file":"panel.d.ts","sourceRoot":"","sources":["../../src/ceiling/panel.tsx"],"names":[],"mappings":"AA2BA;;;;;;;GAOG;AACH,wBAAgB,YAAY,uCA6W3B;AAED,eAAe,YAAY,CAAA"}

package/dist/ceiling/panel.js

@@ -16,6 +16,7 @@ import { useCallback, useEffect, useRef } from 'react';
 export function CeilingPanel() {
     const selectedId = useViewer((s) => s.selection.selectedIds[0]);
     const unit = useViewer((s) => s.unit);
+    const metricNotation = useViewer((s) => s.metricNotation);
     const setSelection = useViewer((s) => s.setSelection);
     const editingHole = useEditingHole();
     const setMovingNode = useEditor((s) => s.setMovingNode);
@@ -30,7 +31,7 @@ export function CeilingPanel() {
         const parent = node?.parentId ? s.nodes[node.parentId] : undefined;
         return parent?.type === 'level'
             ? getCeilingClampBound(parent.id, s.nodes, node?.polygon ?? [])
-            : 6;
+            : Number.POSITIVE_INFINITY;
     });
     // Effective height: the stored custom height, or — for follows-mode
     // ceilings (absent `height`) — the live level-top bound. Primitive
@@ -184,7 +185,12 @@ export function CeilingPanel() {
     return (_jsxs(PanelWrapper, { icon: "/icons/ceiling.webp", onClose: handleClose, title: node.name || 'Ceiling', width: 320, children: [_jsxs(PanelSection, { title: "Height", children: [_jsx(SegmentedControl, { onChange: handleTopModeChange, options: [
                             { label: 'Follows level', value: 'storey' },
                             { label: 'Custom height', value: 'custom' },
-                        ], value: isFollows ? 'storey' : 'custom' }), isFollows ? (_jsxs("div", { className: "px-1 text-[11px] text-muted-foreground", children: ["Currently ", formatLinearMeasurement(resolvedHeight, unit)] })) : (_jsx(SliderControl, { label: "Height", max: Math.min(6, maxHeight), min: 0, onChange: handleHeightChange, precision: 3, step: 0.01, unit: "m", value: Math.round((node.height ?? resolvedHeight) * 1000) / 1000 })), _jsx("div", { className: "mt-2 grid grid-cols-3 gap-1.5 px-1 pb-1", children: heightPresets.map((preset) => (_jsx(ActionButton, { label: preset.label, onClick: () => handleHeightChange(preset.height) }, preset.label))) })] }), _jsx(PanelSection, { title: "Info", children: _jsxs("div", { className: "flex items-center justify-between px-2 py-1 text-muted-foreground text-sm", children: [_jsx("span", { children: "Area" }), _jsxs("span", { className: "font-mono text-white", children: [area.toFixed(2), " m\u00B2"] })] }) }), _jsxs(PanelSection, { title: "Holes", children: [node.holes && node.holes.length > 0 ? (_jsx("div", { className: "flex flex-col gap-1 pb-2", children: node.holes.map((hole, index) => {
+                        ], value: isFollows ? 'storey' : 'custom' }), isFollows ? (_jsxs("div", { className: "px-1 text-[11px] text-muted-foreground", children: ["Currently ", formatLinearMeasurement(resolvedHeight, unit, metricNotation)] })) : (_jsx(SliderControl, { label: "Height", max: Math.min(20, maxHeight), min: 0, onChange: handleHeightChange, precision: 3, step: 0.01, unit: "m", value: Math.round((node.height ?? resolvedHeight) * 1000) / 1000 })), _jsx("div", { className: "mt-2 grid grid-cols-3 gap-1.5 px-1 pb-1", children: heightPresets.map((preset) => {
+                            const fits = preset.height <= maxHeight;
+                            return (_jsx(ActionButton, { className: fits ? undefined : 'cursor-not-allowed opacity-40', disabled: !fits, label: preset.label, onClick: () => handleHeightChange(preset.height), title: fits
+                                    ? undefined
+                                    : `Taller than this level (${formatLinearMeasurement(maxHeight, unit, metricNotation)} available). Raise the level height first.` }, preset.label));
+                        }) }), Number.isFinite(maxHeight) && (_jsxs("div", { className: "px-1 pb-1 text-[11px] text-muted-foreground", children: ["Limited by the level to ", formatLinearMeasurement(maxHeight, unit, metricNotation), " \u2014 raise the level height for a taller ceiling."] }))] }), _jsx(PanelSection, { title: "Info", children: _jsxs("div", { className: "flex items-center justify-between px-2 py-1 text-muted-foreground text-sm", children: [_jsx("span", { children: "Area" }), _jsxs("span", { className: "font-mono text-white", children: [area.toFixed(2), " m\u00B2"] })] }) }), _jsxs(PanelSection, { title: "Holes", children: [node.holes && node.holes.length > 0 ? (_jsx("div", { className: "flex flex-col gap-1 pb-2", children: node.holes.map((hole, index) => {
                             const holeArea = calculateArea(hole);
                             const isEditing = editingHole?.nodeId === selectedId && editingHole?.holeIndex === index;
                             const source = node.holeMetadata?.[index]?.source ?? 'manual';

package/dist/ceiling/parametrics.js

@@ -9,7 +9,7 @@ export const ceilingParametrics = {
     groups: [
         {
             label: 'Dimensions',
-            fields: [{ key: 'height', kind: 'number', unit: 'm', min: 1.5, max: 6, step: 0.05 }],
+            fields: [{ key: 'height', kind: 'number', unit: 'm', min: 1.5, max: 20, step: 0.05 }],
         },
     ],
     customPanel: () => import('./panel'),

package/dist/column/panel.js

@@ -313,7 +313,7 @@ export default function ColumnPanel() {
                             if (!event.target.value)
                                 return;
                             handleUpdate(proportionUpdates(node, event.target.value));
-                        }, value: "", children: [_jsx("option", { value: "", children: "Apply proportion..." }), COLUMN_PROPORTION_OPTIONS.map((option) => (_jsx("option", { value: option.value, children: option.label }, option.value)))] })), _jsx(SliderControl, { label: "Height", max: 6, min: 0.8, onChange: (value) => handleUpdate({ height: value }), precision: 2, step: 0.05, unit: "m", value: node.height }), isBraceSupport ? (_jsxs(_Fragment, { children: [(supportStyle === 'a-frame' ||
+                        }, value: "", children: [_jsx("option", { value: "", children: "Apply proportion..." }), COLUMN_PROPORTION_OPTIONS.map((option) => (_jsx("option", { value: option.value, children: option.label }, option.value)))] })), _jsx(SliderControl, { label: "Height", max: 20, min: 0.8, onChange: (value) => handleUpdate({ height: value }), precision: 2, step: 0.05, unit: "m", value: node.height }), isBraceSupport ? (_jsxs(_Fragment, { children: [(supportStyle === 'a-frame' ||
                                 supportStyle === 'x-brace' ||
                                 supportStyle === 'k-brace' ||
                                 supportStyle === 'single-strut' ||

package/dist/column/parametrics.js

@@ -11,7 +11,7 @@ export const columnParametrics = {
         {
             label: 'Dimensions',
             fields: [
-                { key: 'height', kind: 'number', unit: 'm', min: 0.5, max: 6, step: 0.05 },
+                { key: 'height', kind: 'number', unit: 'm', min: 0.5, max: 20, step: 0.05 },
                 { key: 'width', kind: 'number', unit: 'm', min: 0.1, max: 2, step: 0.01 },
                 { key: 'depth', kind: 'number', unit: 'm', min: 0.1, max: 2, step: 0.01 },
             ],

package/dist/dormer/placement-guides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placement-guides.d.ts","sourceRoot":"","sources":["../../src/dormer/placement-guides.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AA0CvD,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;AAgBpC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,OAAO,EACP,MAAM,EACN,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,IAAI,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,+BAiGA"}
+{"version":3,"file":"placement-guides.d.ts","sourceRoot":"","sources":["../../src/dormer/placement-guides.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AA0CvD,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;AAgBpC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,OAAO,EACP,MAAM,EACN,KAAK,EACL,KAAK,EACL,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,IAAI,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,+BAkGA"}

package/dist/dormer/placement-guides.js

@@ -52,6 +52,7 @@ const alignMaterial = new LineBasicNodeMaterial({
  */
 export function DormerPlacementGuides({ segment, center, width, depth, rotation, movingId, }) {
     const unit = useViewer((s) => s.unit);
+    const metricNotation = useViewer((s) => s.metricNotation);
     const [cx, , cz] = center;
     const faceBounds = getRoofSurfaceFaceBoundsAt(segment, cx, cz);
     const halfW = Math.max(0, width) / 2;
@@ -139,13 +140,13 @@ export function DormerPlacementGuides({ segment, center, width, depth, rotation,
         }
     }
     guides.push(...siblingSpacing.guides);
-    return (_jsx(_Fragment, { children: guides.map((g) => (_jsx(Guide, { guide: g, unit: unit }, g.id))) }));
+    return (_jsx(_Fragment, { children: guides.map((g) => (_jsx(Guide, { guide: g, metricNotation: metricNotation, unit: unit }, g.id))) }));
 }
-function Guide({ guide, unit }) {
+function Guide({ guide, metricNotation, unit, }) {
     if (guide.kind === 'badge') {
-        return _jsx(GuideBadge, { at: guide.at, pill: `= ${formatMeasurement(guide.value, unit)}` });
+        return (_jsx(GuideBadge, { at: guide.at, pill: `= ${formatMeasurement(guide.value, unit, metricNotation)}` }));
     }
-    return (_jsx(GuideLine, { from: guide.from, kind: guide.kind, pill: guide.value === undefined ? undefined : formatMeasurement(guide.value, unit), to: guide.to }));
+    return (_jsx(GuideLine, { from: guide.from, kind: guide.kind, pill: guide.value === undefined ? undefined : formatMeasurement(guide.value, unit, metricNotation), to: guide.to }));
 }
 function GuideBadge({ at, pill }) {
     return (_jsx(Html, { center: true, position: at, style: { pointerEvents: 'none', userSelect: 'none' }, zIndexRange: [20, 0], children: _jsx("div", { className: "whitespace-nowrap rounded-[3px] px-[5px] py-[2px] font-semibold font-sans text-[11px] text-white", style: { backgroundColor: BADGE_BG }, children: pill }) }));

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

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/elevator/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,cAAc,EAEpB,MAAM,kBAAkB,CAAA;AAKzB,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAsJvC;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,OAAO,YAAY,CA2GlE,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/elevator/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,cAAc,EAEpB,MAAM,kBAAkB,CAAA;AAKzB,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAsJvC;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,cAAc,CAAC,OAAO,YAAY,CA8GlE,CAAA"}

package/dist/elevator/definition.js

@@ -218,6 +218,8 @@ export const elevatorDefinition = {
     },
     parametrics: elevatorParametrics,
     handles: elevatorHandles,
+    // No dirty consumer rebuilds this kind — see NodeDefinition.dirtyTracking.
+    dirtyTracking: false,
     renderer: {
         kind: 'parametric',
         module: () => import('./renderer'),

package/dist/fence/curve-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"curve-tool.d.ts","sourceRoot":"","sources":["../../src/fence/curve-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,SAAS,EAUf,MAAM,kBAAkB,CAAA;AAYzB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAsIxD,CAAA;AAED,eAAe,cAAc,CAAA"}
+{"version":3,"file":"curve-tool.d.ts","sourceRoot":"","sources":["../../src/fence/curve-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,SAAS,EAQf,MAAM,kBAAkB,CAAA;AAYzB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAyIxD,CAAA;AAED,eAAe,cAAc,CAAA"}

package/dist/fence/curve-tool.js

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { emitter, getClampedWallCurveOffset, getMaxWallCurveOffset, getWallChordFrame, getWallMidpointHandlePoint, normalizeWallCurveOffset, pauseSceneHistory, resumeSceneHistory, useScene, } from '@pascal-app/core';
+import { acquireSceneHistoryPause, emitter, getClampedWallCurveOffset, getMaxWallCurveOffset, getWallChordFrame, getWallMidpointHandlePoint, normalizeWallCurveOffset, useScene, } from '@pascal-app/core';
 import { CursorSphere, getSegmentGridStep, markToolCancelConsumed, snapScalarToGrid, triggerSFX, useInteractionScope, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { useCallback, useEffect, useRef, useState } from 'react';
@@ -36,8 +36,8 @@ export const CurveFenceTool = ({ node }) => {
         const originalCurveOffset = originalCurveOffsetRef.current;
         const chord = getWallChordFrame(node);
         const maxCurveOffset = getMaxWallCurveOffset(node);
-        pauseSceneHistory(useScene);
-        let wasCommitted = false;
+        let releaseHistory = acquireSceneHistoryPause(useScene);
+        let wasFinalized = false;
         const applyPreview = (curveOffset) => {
             if (previewOffsetRef.current === curveOffset) {
                 return;
@@ -76,21 +76,23 @@ export const CurveFenceTool = ({ node }) => {
             applyPreview(nextCurveOffset);
         };
         const onGridClick = (event) => {
+            if (wasFinalized)
+                return;
             if (Date.now() - activatedAtRef.current < 150) {
                 event.nativeEvent?.stopPropagation?.();
                 return;
             }
             const curveOffset = previewOffsetRef.current;
-            wasCommitted = true;
+            wasFinalized = true;
             if (curveOffset !== originalCurveOffset) {
                 // Restore original baseline while paused so the next resume+update
                 // registers as a single tracked change (undo reverts to original).
                 useScene.getState().updateNode(nodeId, { curveOffset: originalCurveOffset });
                 useScene.getState().markDirty(nodeId);
-                resumeSceneHistory(useScene);
+                releaseHistory();
                 useScene.getState().updateNode(nodeId, { curveOffset });
                 useScene.getState().markDirty(nodeId);
-                pauseSceneHistory(useScene);
+                releaseHistory = acquireSceneHistoryPause(useScene);
             }
             triggerSFX('sfx:item-place');
             useViewer.getState().setSelection({ selectedIds: [nodeId] });
@@ -98,9 +100,12 @@ export const CurveFenceTool = ({ node }) => {
             event.nativeEvent?.stopPropagation?.();
         };
         const onCancel = () => {
+            if (wasFinalized)
+                return;
             restoreOriginal();
+            wasFinalized = true;
             useViewer.getState().setSelection({ selectedIds: [nodeId] });
-            resumeSceneHistory(useScene);
+            releaseHistory();
             markToolCancelConsumed();
             exitCurveMode();
         };
@@ -108,10 +113,10 @@ export const CurveFenceTool = ({ node }) => {
         emitter.on('grid:click', onGridClick);
         emitter.on('tool:cancel', onCancel);
         return () => {
-            if (!wasCommitted) {
+            if (!wasFinalized) {
                 restoreOriginal();
             }
-            resumeSceneHistory(useScene);
+            releaseHistory();
             emitter.off('grid:move', onGridMove);
             emitter.off('grid:click', onGridClick);
             emitter.off('tool:cancel', onCancel);

package/dist/fence/move-control-point-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"move-control-point-tool.d.ts","sourceRoot":"","sources":["../../src/fence/move-control-point-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,SAAS,EAMf,MAAM,kBAAkB,CAAA;AAazB,eAAO,MAAM,yBAAyB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC/C,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAC5C,CAoGA,CAAA;AAED,eAAe,yBAAyB,CAAA"}
+{"version":3,"file":"move-control-point-tool.d.ts","sourceRoot":"","sources":["../../src/fence/move-control-point-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,SAAS,EAIf,MAAM,kBAAkB,CAAA;AAazB,eAAO,MAAM,yBAAyB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC/C,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAC5C,CAuGA,CAAA;AAED,eAAe,yBAAyB,CAAA"}

package/dist/fence/move-control-point-tool.js

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { emitter, pauseSceneHistory, resumeSceneHistory, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
+import { acquireSceneHistoryPause, emitter, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
 import { CursorSphere, getSegmentGridStep, isGridSnapActive, markToolCancelConsumed, snapScalarToGrid, triggerSFX, useInteractionScope, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { useEffect, useState } from 'react';
@@ -15,8 +15,8 @@ export const MoveFenceControlPointTool = ({ target }) => {
         originalPoint[1],
     ]);
     useEffect(() => {
-        pauseSceneHistory(useScene);
-        let committed = false;
+        const releaseHistory = acquireSceneHistoryPause(useScene);
+        let finalized = false;
         let lastPoint = [originalPoint[0], originalPoint[1]];
         const buildPatch = (point) => {
             const nextPath = originalPath.map((pathPoint, pathIndex) => pathIndex === index ? point : pathPoint);
@@ -59,8 +59,10 @@ export const MoveFenceControlPointTool = ({ target }) => {
             }
         };
         const onGridClick = (event) => {
-            committed = true;
-            resumeSceneHistory(useScene);
+            if (finalized)
+                return;
+            finalized = true;
+            releaseHistory();
             useScene.getState().updateNode(fenceId, buildPatch(lastPoint));
             useLiveNodeOverrides.getState().clear(fenceId);
             useScene.getState().markDirty(fenceId);
@@ -68,8 +70,11 @@ export const MoveFenceControlPointTool = ({ target }) => {
             event.nativeEvent?.stopPropagation?.();
         };
         const onCancel = () => {
+            if (finalized)
+                return;
             restore();
-            resumeSceneHistory(useScene);
+            finalized = true;
+            releaseHistory();
             markToolCancelConsumed();
             exit(false);
         };
@@ -77,9 +82,9 @@ export const MoveFenceControlPointTool = ({ target }) => {
         emitter.on('grid:click', onGridClick);
         emitter.on('tool:cancel', onCancel);
         return () => {
-            if (!committed) {
+            if (!finalized) {
                 restore();
-                resumeSceneHistory(useScene);
+                releaseHistory();
             }
             emitter.off('grid:move', onGridMove);
             emitter.off('grid:click', onGridClick);

package/dist/fence/move-tangent-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"move-tangent-tool.d.ts","sourceRoot":"","sources":["../../src/fence/move-tangent-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,SAAS,EAMf,MAAM,kBAAkB,CAAA;AAezB,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC1C,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,CAAA;CAChE,CAqGA,CAAA;AAED,eAAe,oBAAoB,CAAA"}
+{"version":3,"file":"move-tangent-tool.d.ts","sourceRoot":"","sources":["../../src/fence/move-tangent-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,SAAS,EAIf,MAAM,kBAAkB,CAAA;AAezB,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC;IAC1C,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,CAAA;CAChE,CAwGA,CAAA;AAED,eAAe,oBAAoB,CAAA"}

package/dist/fence/move-tangent-tool.js

@@ -1,6 +1,6 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { emitter, pauseSceneHistory, resumeSceneHistory, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
+import { acquireSceneHistoryPause, emitter, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
 import { CursorSphere, getSegmentGridStep, isGridSnapActive, markToolCancelConsumed, snapScalarToGrid, triggerSFX, useInteractionScope, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { useEffect, useState } from 'react';
@@ -11,8 +11,8 @@ export const MoveFenceTangentTool = ({ target }) => {
     const anchor = target.fence.path?.[index] ?? target.fence.start;
     const [cursor, setCursor] = useState([anchor[0], 0, anchor[1]]);
     useEffect(() => {
-        pauseSceneHistory(useScene);
-        let committed = false;
+        const releaseHistory = acquireSceneHistoryPause(useScene);
+        let finalized = false;
         const originalTangents = (target.fence.tangents ?? []).map((t) => (t ? [t[0], t[1]] : null));
         let lastTangents = originalTangents;
         const writeTangent = (vector) => {
@@ -54,9 +54,11 @@ export const MoveFenceTangentTool = ({ target }) => {
             writeTangent([armX / TANGENT_HANDLE_ARM_SCALE, armZ / TANGENT_HANDLE_ARM_SCALE]);
         };
         const onGridClick = (event) => {
-            committed = true;
+            if (finalized)
+                return;
+            finalized = true;
             const finalTangents = lastTangents;
-            resumeSceneHistory(useScene);
+            releaseHistory();
             useScene.getState().updateNode(fenceId, { tangents: finalTangents });
             useLiveNodeOverrides.getState().clear(fenceId);
             useScene.getState().markDirty(fenceId);
@@ -65,8 +67,11 @@ export const MoveFenceTangentTool = ({ target }) => {
             event.nativeEvent?.stopPropagation?.();
         };
         const onCancel = () => {
+            if (finalized)
+                return;
             restore();
-            resumeSceneHistory(useScene);
+            finalized = true;
+            releaseHistory();
             markToolCancelConsumed();
             exit(false);
         };
@@ -74,9 +79,9 @@ export const MoveFenceTangentTool = ({ target }) => {
         emitter.on('grid:click', onGridClick);
         emitter.on('tool:cancel', onCancel);
         return () => {
-            if (!committed) {
+            if (!finalized) {
                 restore();
-                resumeSceneHistory(useScene);
+                releaseHistory();
             }
             emitter.off('grid:move', onGridMove);
             emitter.off('grid:click', onGridClick);

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

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/fence/tool.tsx"],"names":[],"mappings":"AAycA,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAM7B,CAAA;AAweD,eAAe,SAAS,CAAA"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/fence/tool.tsx"],"names":[],"mappings":"AA6bA,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAM7B,CAAA;AA0eD,eAAe,SAAS,CAAA"}

package/dist/fence/tool.js

@@ -5,7 +5,7 @@ import { CursorSphere, clearPlacementSurface, createFenceOnCurrentLevel, createS
 import { getSceneTheme, useViewer } from '@pascal-app/viewer';
 import { useThree } from '@react-three/fiber';
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { BoxGeometry, BufferGeometry, DoubleSide, Vector3, } from 'three';
+import { BufferGeometry, DoubleSide, Vector3 } from 'three';
 import { DraftAngleArc, DraftAxisGuides, DraftMeasurementLabel, getNearestAxisAngleLabel, } from '../shared/draft-axis-guides';
 const FENCE_PREVIEW_HEIGHT = 1.8;
 const FENCE_PREVIEW_THICKNESS = 0.08;
@@ -216,14 +216,14 @@ function getDraftAngleLabels(start, end, segments, baseY, previewHeight, preview
     }
     return labels;
 }
-function getDraftMeasurementState(start, end, segments, unit, baseY, previewHeight, previewThickness) {
+function getDraftMeasurementState(start, end, segments, unit, metricNotation, baseY, previewHeight, previewThickness) {
     const dx = end[0] - start[0];
     const dz = end[1] - start[1];
     const length = Math.hypot(dx, dz);
     if (length < 0.01)
         return null;
     return {
-        lengthLabel: formatLinearMeasurement(length, unit),
+        lengthLabel: formatLinearMeasurement(length, unit, metricNotation),
         lengthPosition: [
             (start[0] + end[0]) / 2,
             baseY + previewHeight + DRAFT_LABEL_Y_OFFSET,
@@ -259,14 +259,10 @@ function updateFencePreview(mesh, start, end, previewHeight, previewThickness) {
     }
     mesh.visible = true;
     direction.normalize();
-    const geometry = new BoxGeometry(length, previewHeight, previewThickness);
     const angle = Math.atan2(direction.z, direction.x);
     mesh.position.set((start.x + end.x) / 2, start.y + previewHeight / 2, (start.z + end.z) / 2);
     mesh.rotation.y = -angle;
-    if (mesh.geometry) {
-        mesh.geometry.dispose();
-    }
-    mesh.geometry = geometry;
+    mesh.scale.set(length, previewHeight, previewThickness);
 }
 function getCurrentLevelElements() {
     const currentLevelId = useViewer.getState().selection.levelId;
@@ -291,6 +287,7 @@ export const FenceTool = () => {
 };
 const StraightFenceTool = () => {
     const unit = useViewer((state) => state.unit);
+    const metricNotation = useViewer((state) => state.metricNotation);
     const isDark = useViewer((state) => getSceneTheme(state.sceneTheme).appearance === 'dark');
     // A placed preset seeds `toolDefaults.fence` before the tool mounts, so
     // the draft preview is drawn at the preset's height / thickness rather
@@ -406,7 +403,7 @@ const StraightFenceTool = () => {
                 }
                 previousFenceEnd = currentFenceEnd;
                 updateFencePreview(previewRef.current, startingPoint.current, endingPoint.current, previewHeightRef.current, previewThicknessRef.current);
-                setDraftMeasurement(getDraftMeasurementState([startingPoint.current.x, startingPoint.current.z], snappedLocal, getReferenceSegments(walls, fences), unit, startingPoint.current.y, previewHeightRef.current, previewThicknessRef.current));
+                setDraftMeasurement(getDraftMeasurementState([startingPoint.current.x, startingPoint.current.z], snappedLocal, getReferenceSegments(walls, fences), unit, metricNotation, startingPoint.current.y, previewHeightRef.current, previewThicknessRef.current));
             }
             else {
                 const snappedPoint = alignPoint(snapFenceDraftPoint({
@@ -523,8 +520,8 @@ const StraightFenceTool = () => {
             draftPreview.setFenceDraftStart(null);
             draftPreview.setFenceDraftEnd(null);
         };
-    }, [unit]);
-    return (_jsxs("group", { children: [_jsx(DraftAxisGuides, { guide: axisGuide, labelColor: measurementColor, labelShadowColor: measurementShadowColor }), _jsx(CursorSphere, { height: previewHeight, ref: cursorRef }), _jsxs("mesh", { layers: EDITOR_LAYER, ref: previewRef, renderOrder: 1, visible: false, children: [_jsx("shapeGeometry", {}), _jsx("meshBasicMaterial", { color: "#ffffff", depthTest: false, depthWrite: false, opacity: 0.45, side: DoubleSide, transparent: true })] }), draftMeasurement && (_jsxs(_Fragment, { children: [_jsx(DraftMeasurementLabel, { color: measurementColor, label: draftMeasurement.lengthLabel, position: draftMeasurement.lengthPosition, shadowColor: measurementShadowColor }), draftMeasurement.angleLabels.map((angleLabel) => (_jsxs("group", { children: [_jsx(DraftAngleArc, { arc: angleLabel.arc, color: measurementColor }), _jsx(DraftMeasurementLabel, { color: measurementColor, label: angleLabel.label, position: angleLabel.position, shadowColor: measurementShadowColor })] }, angleLabel.id)))] }))] }));
+    }, [unit, metricNotation]);
+    return (_jsxs("group", { children: [_jsx(DraftAxisGuides, { guide: axisGuide, labelColor: measurementColor, labelShadowColor: measurementShadowColor }), _jsx(CursorSphere, { height: previewHeight, ref: cursorRef }), _jsxs("mesh", { layers: EDITOR_LAYER, ref: previewRef, renderOrder: 1, visible: false, children: [_jsx("boxGeometry", {}), _jsx("meshBasicMaterial", { color: "#ffffff", depthTest: false, depthWrite: false, opacity: 0.45, side: DoubleSide, transparent: true })] }), draftMeasurement && (_jsxs(_Fragment, { children: [_jsx(DraftMeasurementLabel, { color: measurementColor, label: draftMeasurement.lengthLabel, position: draftMeasurement.lengthPosition, shadowColor: measurementShadowColor }), draftMeasurement.angleLabels.map((angleLabel) => (_jsxs("group", { children: [_jsx(DraftAngleArc, { arc: angleLabel.arc, color: measurementColor }), _jsx(DraftMeasurementLabel, { color: measurementColor, label: angleLabel.label, position: angleLabel.position, shadowColor: measurementShadowColor })] }, angleLabel.id)))] }))] }));
 };
 const SPLINE_PREVIEW_COLOR = '#8381ed';
 const SPLINE_PREVIEW_SEGMENTS = 40;

package/dist/measurement/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/measurement/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,eAAe,EAWrB,MAAM,kBAAkB,CAAA;AAezB,OAAO,EAML,KAAK,QAAQ,EAKd,MAAM,OAAO,CAAA;AA4Qd,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAO/E;AAED,eAAO,MAAM,mBAAmB,GAAI,UAAU;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,gCAyItE,CAAA;AAED,eAAe,mBAAmB,CAAA"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/measurement/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,eAAe,EAWrB,MAAM,kBAAkB,CAAA;AAezB,OAAO,EAML,KAAK,QAAQ,EAKd,MAAM,OAAO,CAAA;AAiRd,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAO/E;AAED,eAAO,MAAM,mBAAmB,GAAI,UAAU;IAAE,IAAI,EAAE,eAAe,CAAA;CAAE,gCA0ItE,CAAA;AAED,eAAe,mBAAmB,CAAA"}

package/dist/measurement/renderer.js

@@ -197,9 +197,9 @@ function buildRenderData(measurement) {
         markerPoints,
     };
 }
-function formatMeasurement(measurement, unit) {
+function formatMeasurement(measurement, unit, metricNotation) {
     if (measurement.kind === 'distance') {
-        return formatLinearMeasurement(measurementDistance(...measurement.points), unit);
+        return formatLinearMeasurement(measurementDistance(...measurement.points), unit, metricNotation);
     }
     if (measurement.kind === 'angle') {
         return formatAngleRadians(measurementAngle(...measurement.points));
@@ -208,7 +208,7 @@ function formatMeasurement(measurement, unit) {
         return `A ${formatAreaLabel(measurementArea(measurement.base), unit)}`;
     }
     if (measurement.kind === 'perimeter') {
-        return `P ${formatLinearMeasurement(measurementPerimeter(measurement.base), unit)}`;
+        return `P ${formatLinearMeasurement(measurementPerimeter(measurement.base), unit, metricNotation)}`;
     }
     return `V ${formatVolumeLabel(measurementPrismVolume(measurement.base, measurement.extrusion), unit)}`;
 }
@@ -229,6 +229,7 @@ export const MeasurementRenderer = ({ node }) => {
     const handlers = useNodeEvents(node, 'measurement');
     const showMeasurements = useViewer((state) => state.showMeasurements);
     const unit = useViewer((state) => state.unit);
+    const metricNotation = useViewer((state) => state.metricNotation);
     const active = useViewer((state) => state.hoveredId === node.id || state.selection.selectedIds.some((id) => id === node.id));
     const ownOverride = useLiveNodeOverrides((state) => state.overrides.get(node.id));
     const effectiveNode = useMemo(() => (ownOverride ? { ...node, ...ownOverride } : node), [node, ownOverride]);
@@ -244,9 +245,9 @@ export const MeasurementRenderer = ({ node }) => {
     });
     const data = buildRenderData(resolved.payload);
     const label = useMemo(() => {
-        const value = formatMeasurement(resolved.payload, unit);
+        const value = formatMeasurement(resolved.payload, unit, metricNotation);
         return resolved.dangling.length > 0 ? `Unlinked · ${value}` : value;
-    }, [resolved, unit]);
+    }, [metricNotation, resolved, unit]);
     const color = measurementPresentationColor(resolved.dangling.length > 0, active);
     const lineMaterial = useMemo(() => new LineBasicNodeMaterial({
         color,

package/dist/measurement/surface-query.js

@@ -1,5 +1,5 @@
 import { measurementDistance, measurementFeatureLength, sceneRegistry, useScene, } from '@pascal-app/core';
-import { SCENE_LAYER, ZONE_LAYER } from '@pascal-app/viewer';
+import { setSurfaceRaycastLayers, ZONE_LAYER } from '@pascal-app/viewer';
 import { Matrix3, Matrix4, Quaternion, Raycaster, Vector2, Vector3, } from 'three';
 import { matchMeasurementFeatureForNode } from './resolve';
 const AXIS_SNAP_DISTANCE_PX = 16;
@@ -405,7 +405,7 @@ function collectMeasurementAxisSurfaceIntersections(context, levelObject, anchor
     const origin = levelObject.localToWorld(new Vector3(...anchor));
     const levelRotation = levelObject.getWorldQuaternion(new Quaternion());
     const inverseLevelRotation = levelRotation.clone().invert();
-    raycaster.layers.set(SCENE_LAYER);
+    setSurfaceRaycastLayers(raycaster.layers);
     raycaster.near = 0;
     raycaster.far = maxDistance;
     const intersections = [];
@@ -452,9 +452,9 @@ export function createMeasurementSurfaceQuerySession(scene, options = {}) {
     const verificationRaycaster = new Raycaster();
     const axisRaycaster = new Raycaster();
     const pointer = new Vector2();
-    pointerRaycaster.layers.set(SCENE_LAYER);
-    verificationRaycaster.layers.set(SCENE_LAYER);
-    axisRaycaster.layers.set(SCENE_LAYER);
+    setSurfaceRaycastLayers(pointerRaycaster.layers);
+    setSurfaceRaycastLayers(verificationRaycaster.layers);
+    setSurfaceRaycastLayers(axisRaycaster.layers);
     if (options.includeZoneLayer)
         pointerRaycaster.layers.enable(ZONE_LAYER);
     let context = null;