@pascal-app/nodes 0.1.1 → 1.0.0-beta.2

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

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/item/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAML,KAAK,QAAQ,EAWd,MAAM,kBAAkB,CAAA;AAkUzB,eAAO,MAAM,YAAY,GAAI,qBAAqB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,gCAqDnE,CAAA;AAwTD,eAAe,YAAY,CAAA"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/item/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAML,KAAK,QAAQ,EAWd,MAAM,kBAAkB,CAAA;AAmZzB,eAAO,MAAM,YAAY,GAAI,qBAAqB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,gCAqDnE,CAAA;AA+CD,eAAO,MAAM,WAAW,GAAI,UAAU;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,gCAUvD,CAAA;AAuRD,eAAe,YAAY,CAAA"}

package/dist/item/renderer.js

@@ -1,12 +1,12 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { deriveSlotId, getScaledDimensions, isSlotMaterialName, itemClipRegistry, LIBRARY_MATERIAL_REF_PREFIX, SCENE_MATERIAL_REF_PREFIX, toLibraryMaterialRef, useInteractive, useLiveNodeOverrides, useRegistry, useScene, } from '@pascal-app/core';
-import { createDefaultMaterial, createSurfaceRoleMaterial, ErrorBoundary, glassMaterial, NodeRenderer, resolveCdnUrl, resolveMaterialRef, useItemLightPool, useNodeEvents, useViewer, } from '@pascal-app/viewer';
+import { configureKtx2Support, createDefaultMaterial, createSurfaceRoleMaterial, ErrorBoundary, glassMaterial, NodeRenderer, resolveCdnUrl, resolveMaterialRef, stampPascalTextureRef, useItemLightPool, useNodeEvents, useViewer, } from '@pascal-app/viewer';
 import { useAnimations } from '@react-three/drei';
 import { Clone } from '@react-three/drei/core/Clone';
-import { useFrame, useLoader } from '@react-three/fiber';
+import { useFrame, useLoader, useThree } from '@react-three/fiber';
 import { Suspense, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { MathUtils } from 'three';
+import { MathUtils, Texture } from 'three';
 import { MeshoptDecoder } from 'three/examples/jsm/libs/meshopt_decoder.module.js';
 import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';
 import { positionLocal, smoothstep, time } from 'three/tsl';
@@ -110,7 +110,8 @@ const BrokenItemFallback = ({ node }) => {
     return (_jsxs("mesh", { "position-y": h / 2, ...handlers, children: [_jsx("boxGeometry", { args: [w, h, d] }), _jsx("primitive", { attach: "material", object: material })] }));
 };
 let itemDracoLoader = null;
-const configureItemModelLoader = (loader) => {
+const configureItemModelLoader = (loader, renderer) => {
+    configureKtx2Support(loader, renderer);
     if (!itemDracoLoader) {
         itemDracoLoader = new DRACOLoader(loader.manager);
         itemDracoLoader.setDecoderPath('https://www.gstatic.com/draco/versioned/decoders/1.5.5/');
@@ -118,7 +119,82 @@ const configureItemModelLoader = (loader) => {
     loader.setDRACOLoader(itemDracoLoader);
     loader.setMeshoptDecoder(MeshoptDecoder);
 };
-const useItemGltf = (url) => useLoader(ItemGLTFLoader, url, configureItemModelLoader);
+const ITEM_TEXTURE_SLOTS = [
+    'map',
+    'normalMap',
+    'roughnessMap',
+    'metalnessMap',
+    'emissiveMap',
+    'aoMap',
+    'alphaMap',
+    'lightMap',
+    'bumpMap',
+    'displacementMap',
+    'clearcoatMap',
+    'clearcoatNormalMap',
+    'clearcoatRoughnessMap',
+    'iridescenceMap',
+    'iridescenceThicknessMap',
+    'transmissionMap',
+    'thicknessMap',
+    'specularIntensityMap',
+    'specularColorMap',
+    'sheenRoughnessMap',
+    'sheenColorMap',
+    'anisotropyMap',
+];
+function getItemTextureImageIndex(gltf, texture) {
+    const association = gltf.parser?.associations.get(texture);
+    const textureIndex = association?.textures;
+    if (!Number.isInteger(textureIndex))
+        return null;
+    const textureDef = gltf.parser.json.textures?.[textureIndex];
+    const imageIndex = textureDef?.extensions?.KHR_texture_basisu?.source ??
+        textureDef?.extensions?.EXT_texture_webp?.source ??
+        textureDef?.extensions?.EXT_texture_avif?.source ??
+        textureDef?.source;
+    return Number.isInteger(imageIndex) && imageIndex >= 0 ? imageIndex : null;
+}
+function stampItemTextureReferences(gltf, src) {
+    if (!gltf.parser?.associations)
+        return;
+    const stamped = new Set();
+    gltf.scene.traverse((object) => {
+        const mesh = object;
+        if (!mesh.isMesh)
+            return;
+        const materials = Array.isArray(mesh.material) ? mesh.material : [mesh.material];
+        for (const material of materials) {
+            const textureMaterial = material;
+            for (const slot of ITEM_TEXTURE_SLOTS) {
+                const texture = textureMaterial[slot];
+                if (!(texture instanceof Texture))
+                    continue;
+                if (stamped.has(texture))
+                    continue;
+                const imageIndex = getItemTextureImageIndex(gltf, texture);
+                if (imageIndex === null)
+                    continue;
+                if (stampPascalTextureRef(texture, {
+                    kind: 'item-glb',
+                    src,
+                    slot,
+                    imageIndex,
+                })) {
+                    stamped.add(texture);
+                }
+            }
+        }
+    });
+}
+const useItemGltf = (url) => {
+    const renderer = useThree((state) => state.gl);
+    const gltf = useLoader(ItemGLTFLoader, url, (loader) => configureItemModelLoader(loader, renderer));
+    return useMemo(() => {
+        stampItemTextureReferences(gltf, url);
+        return gltf;
+    }, [gltf, url]);
+};
 const unavailableAssetConsumers = new Map();
 const unavailableFailureConsumers = new Map();
 const retainUnavailableConsumer = (entries, key) => {
@@ -236,10 +312,23 @@ function getPreviewMaterial(shading) {
 const PreviewModel = ({ node }) => {
     const shading = useViewer((s) => s.shading);
     const isExporting = useViewer((s) => s.isExporting);
+    const [w, h, d] = getScaledDimensions(node);
     // Loading placeholder — must never land in an exported GLB.
     if (isExporting)
         return null;
-    return (_jsx("mesh", { material: getPreviewMaterial(shading), "position-y": node.asset.dimensions[1] / 2, children: _jsx("boxGeometry", { args: [node.asset.dimensions[0], node.asset.dimensions[1], node.asset.dimensions[2]] }) }));
+    return (_jsx("mesh", { material: getPreviewMaterial(shading), "position-y": h / 2, children: _jsx("boxGeometry", { args: [w, h, d] }) }));
+};
+const LoadedItemPreview = ({ node }) => {
+    const gltf = useItemGltf(resolveCdnUrl(node.asset.src) || '');
+    if (getUnavailableItemAsset(gltf))
+        return _jsx(PreviewModel, { node: node });
+    return (_jsx("group", { rotation: node.rotation, scale: node.scale, children: _jsx(Clone, { dispose: null, object: gltf.scene, position: node.asset.offset, rotation: node.asset.rotation, scale: node.asset.scale || [1, 1, 1] }) }));
+};
+export const ItemPreview = ({ node }) => {
+    const url = resolveCdnUrl(node.asset.src) || '';
+    if (!url)
+        return _jsx(PreviewModel, { node: node });
+    return (_jsx(Suspense, { fallback: _jsx(PreviewModel, { node: node }), children: _jsx(ErrorBoundary, { fallback: _jsx(PreviewModel, { node: node }), scope: "item-preview-model", children: _jsx(LoadedItemPreview, { node: node }) }) }));
 };
 const ClearPreviewModel = ({ node }) => {
     const shading = useViewer((s) => s.shading);
@@ -255,7 +344,6 @@ const ClearPreviewModel = ({ node }) => {
     }, [shading]);
     return (_jsx("mesh", { material: material, "position-y": h / 2, children: _jsx("boxGeometry", { args: [w, h, d] }) }));
 };
-const multiplyScales = (a, b) => [a[0] * b[0], a[1] * b[1], a[2] * b[2]];
 const ModelRenderer = ({ node, markSettled }) => {
     const gltf = useItemGltf(resolveCdnUrl(node.asset.src) || '');
     const unavailable = getUnavailableItemAsset(gltf);
@@ -354,7 +442,7 @@ const LoadedModelRenderer = ({ gltf: { scene, nodes, animations }, node, markSet
     }, [node.id, animEffect, animations]);
     // useGLTF caches scenes, and Clone shares child geometry/material references.
     // Undo can unmount one item while another clone of the same asset still needs them.
-    return (_jsxs(_Fragment, { children: [_jsx(Clone, { dispose: null, object: scene, position: node.asset.offset, ref: ref, rotation: node.asset.rotation, scale: multiplyScales(node.asset.scale || [1, 1, 1], node.scale || [1, 1, 1]), ...handlers }), animations.length > 0 && (_jsx(ItemAnimation, { actions: actions, animations: animations, animEffect: animEffect, interactive: interactive ?? null, nodeId: node.id })), lightEffects.map((effect, i) => (_jsx(ItemLightRegistrar, { effect: effect, index: i, interactive: interactive, nodeId: node.id }, i)))] }));
+    return (_jsxs(_Fragment, { children: [_jsx("group", { scale: node.scale, children: _jsx(Clone, { dispose: null, object: scene, position: node.asset.offset, ref: ref, rotation: node.asset.rotation, scale: node.asset.scale || [1, 1, 1], ...handlers }) }), animations.length > 0 && (_jsx(ItemAnimation, { actions: actions, animations: animations, animEffect: animEffect, interactive: interactive ?? null, nodeId: node.id })), lightEffects.map((effect, i) => (_jsx(ItemLightRegistrar, { effect: effect, index: i, interactive: interactive, nodeId: node.id }, i)))] }));
 };
 const ItemAnimation = ({ nodeId, animEffect, interactive, actions, animations, }) => {
     const activeClipRef = useRef(null);

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

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/level/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEpF,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAEpC;;;;GAIG;AACH,eAAO,MAAM,eAAe,EAAE,cAAc,CAAC,OAAO,SAAS,CAoD5D,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/level/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAEpC;;;;GAIG;AACH,eAAO,MAAM,eAAe,EAAE,cAAc,CAAC,OAAO,SAAS,CAwD5D,CAAA"}

package/dist/level/definition.js

@@ -1,4 +1,4 @@
-import { LevelNode as LevelNodeSchema } from '@pascal-app/core';
+import { DEFAULT_LEVEL_HEIGHT, LevelNode as LevelNodeSchema, } from '@pascal-app/core';
 import { levelParametrics } from './parametrics';
 import { LevelNode } from './schema';
 /**
@@ -8,11 +8,15 @@ import { LevelNode } from './schema';
  */
 export const levelDefinition = {
     kind: 'level',
-    schemaVersion: 1,
+    schemaVersion: 2,
     schema: LevelNode,
     category: 'site',
     defaults: () => {
-        const stub = LevelNodeSchema.parse({ id: 'level_default', type: 'level' });
+        const stub = LevelNodeSchema.parse({
+            id: 'level_default',
+            type: 'level',
+            height: DEFAULT_LEVEL_HEIGHT,
+        });
         const { id: _id, type: _type, ...rest } = stub;
         return rest;
     },

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

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/lineset/tool.tsx"],"names":[],"mappings":"AAuFA,QAAA,MAAM,WAAW,0CAuQhB,CAAA;AAgCD,eAAe,WAAW,CAAA"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/lineset/tool.tsx"],"names":[],"mappings":"AAwFA,QAAA,MAAM,WAAW,0CA4QhB,CAAA;AAgCD,eAAe,WAAW,CAAA"}

package/dist/lineset/tool.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { emitter, LinesetNode, useScene } from '@pascal-app/core';
-import { CursorSphere, DimensionPill, EDITOR_LAYER, isAngleSnapActive, isGridSnapActive, isMagneticSnapActive, markToolCancelConsumed, triggerSFX, useEditor, } from '@pascal-app/editor';
+import { CursorSphere, DimensionPill, EDITOR_LAYER, isAngleSnapActive, isGridSnapActive, isMagneticSnapActive, markToolCancelConsumed, triggerSFX, useEditor, usePathDraftPreview, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { Html } from '@react-three/drei';
 import { useEffect, useRef, useState } from 'react';
@@ -77,6 +77,10 @@ const LinesetTool = () => {
     draftRef.current = draftPoints;
     const altAnchorRef = useRef(null);
     const lastClientYRef = useRef(null);
+    useEffect(() => {
+        usePathDraftPreview.getState().setDraft('lineset', draftPoints, cursorPos);
+    }, [cursorPos, draftPoints]);
+    useEffect(() => () => usePathDraftPreview.getState().clear('lineset'), []);
     useEffect(() => {
         if (!activeLevelId)
             return;

package/dist/liquid-line/tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/liquid-line/tool.tsx"],"names":[],"mappings":"AAkQA,QAAA,MAAM,cAAc,0CA2VnB,CAAA;AA8BD,eAAe,cAAc,CAAA"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/liquid-line/tool.tsx"],"names":[],"mappings":"AAmQA,QAAA,MAAM,cAAc,0CAkWnB,CAAA;AA8BD,eAAe,cAAc,CAAA"}

package/dist/liquid-line/tool.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { emitter, LiquidLineNode, useScene, } from '@pascal-app/core';
-import { CursorSphere, DimensionPill, EDITOR_LAYER, isAngleSnapActive, isGridSnapActive, isMagneticSnapActive, markToolCancelConsumed, triggerSFX, useEditor, } from '@pascal-app/editor';
+import { CursorSphere, DimensionPill, EDITOR_LAYER, isAngleSnapActive, isGridSnapActive, isMagneticSnapActive, markToolCancelConsumed, triggerSFX, useEditor, usePathDraftPreview, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { Html } from '@react-three/drei';
 import { useEffect, useRef, useState } from 'react';
@@ -242,6 +242,12 @@ const LiquidLineTool = () => {
     }, [follow]);
     // Leaving the tool clears Follow so re-arming it starts in free-draw.
     useEffect(() => () => useLiquidLineToolOptions.getState().setFollow(false), []);
+    useEffect(() => {
+        usePathDraftPreview
+            .getState()
+            .setDraft('liquid-line', traceGhost ?? draftPoints, traceGhost ? null : cursorPos);
+    }, [cursorPos, draftPoints, traceGhost]);
+    useEffect(() => () => usePathDraftPreview.getState().clear('liquid-line'), []);
     useEffect(() => {
         if (!activeLevelId)
             return;

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

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/measurement/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAGnF,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CA+DxE,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/measurement/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAInF,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CAoExE,CAAA"}

package/dist/measurement/definition.js

@@ -35,6 +35,11 @@ export const measurementDefinition = {
     },
     floorplan: buildMeasurementFloorplan,
     floorplanDependencies: (node) => measurementReferenceNodeIds(node.measurement),
+    extensions: {
+        'pascal:editor/floorplan': {
+            referencedSelectionAnnotationRole: 'measurement',
+        },
+    },
     floorplanAffordances: {
         'move-measurement-vertex': measurementMoveVertexAffordance,
     },

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

@@ -1 +1 @@
-{"version":3,"file":"floorplan.d.ts","sourceRoot":"","sources":["../../src/measurement/floorplan.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EAGtB,KAAK,eAAe,EACpB,KAAK,eAAe,EAOrB,MAAM,kBAAkB,CAAA;AA6BzB,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,eAAe,EACrB,GAAG,EAAE,eAAe,GACnB,iBAAiB,GAAG,IAAI,CA+L1B"}
+{"version":3,"file":"floorplan.d.ts","sourceRoot":"","sources":["../../src/measurement/floorplan.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EAGtB,KAAK,eAAe,EACpB,KAAK,eAAe,EAOrB,MAAM,kBAAkB,CAAA;AA+BzB,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,eAAe,EACrB,GAAG,EAAE,eAAe,GACnB,iBAAiB,GAAG,IAAI,CA4M1B"}

package/dist/measurement/floorplan.js

@@ -1,5 +1,5 @@
 import { measurementAngle, measurementArea, measurementDistance, measurementPerimeter, measurementPrismVolume, } from '@pascal-app/core';
-import { buildMeasurementAngleArcPoints, formatAngleRadians, formatAreaLabel, formatLinearMeasurement, formatVolumeLabel, measurementFloorplanPresentationColor, measurementPolygonLabelAnchor, } from '@pascal-app/editor';
+import { buildMeasurementAngleArcPoints, formatAngleRadians, formatAreaLabel, formatLinearMeasurement, formatVolumeLabel, measurementFloorplanPresentationColor, measurementPolygonLabelAnchor, readFloorplanContext, withFloorplanGeometryMetadata, } from '@pascal-app/editor';
 import { measurementResolvedEditPoints } from './edit';
 import { resolveMeasurementNode } from './resolve';
 const projectPoint = (point) => [point[0], point[2]];
@@ -19,6 +19,7 @@ export function buildMeasurementFloorplan(node, ctx) {
     if (node.visible === false)
         return null;
     const unit = ctx.viewState?.unit ?? 'metric';
+    const metricNotation = readFloorplanContext(ctx).metricNotation;
     const resolved = resolveMeasurementNode(node, (id) => ctx.resolve(id));
     const measurement = resolved.payload;
     const selected = ctx.viewState?.selected || ctx.viewState?.highlighted;
@@ -52,7 +53,7 @@ export function buildMeasurementFloorplan(node, ctx) {
                 },
             ]
             : [];
-        return {
+        return withFloorplanGeometryMetadata({
             kind: 'group',
             children: [
                 { kind: 'line', x1, y1, x2, y2, ...style },
@@ -79,19 +80,19 @@ export function buildMeasurementFloorplan(node, ctx) {
                     appearance: 'outlined',
                     cx: (x1 + x2) / 2,
                     cy: (y1 + y2) / 2,
-                    text: `${statusPrefix}${formatLinearMeasurement(measurementDistance(start, end), unit)}`,
+                    text: `${statusPrefix}${formatLinearMeasurement(measurementDistance(start, end), unit, metricNotation)}`,
                     angle: Math.atan2(y2 - y1, x2 - x1),
                     offsetPx: 14,
                 },
                 ...editHandles,
             ],
-        };
+        }, { annotationRole: 'measurement' });
     }
     if (measurement.kind === 'angle') {
         const [start, vertex, end] = measurement.points;
         const angleArc = buildMeasurementAngleArcPoints(start, vertex, end);
         const labelPoint = angleArc[Math.floor(angleArc.length / 2)] ?? vertex;
-        return {
+        return withFloorplanGeometryMetadata({
             kind: 'group',
             children: [
                 {
@@ -121,14 +122,14 @@ export function buildMeasurementFloorplan(node, ctx) {
                 },
                 ...editHandles,
             ],
-        };
+        }, { annotationRole: 'measurement' });
     }
     if (measurement.kind === 'area' || measurement.kind === 'perimeter') {
         const centroid = measurementPolygonLabelAnchor(measurement.base) ?? measurement.base[0];
         const label = measurement.kind === 'area'
             ? `A ${formatAreaLabel(measurementArea(measurement.base), unit)}`
-            : `P ${formatLinearMeasurement(measurementPerimeter(measurement.base), unit)}`;
-        return {
+            : `P ${formatLinearMeasurement(measurementPerimeter(measurement.base), unit, metricNotation)}`;
+        return withFloorplanGeometryMetadata({
             kind: 'group',
             children: [
                 {
@@ -150,7 +151,7 @@ export function buildMeasurementFloorplan(node, ctx) {
                 },
                 ...editHandles,
             ],
-        };
+        }, { annotationRole: 'measurement' });
     }
     const volume = measurement;
     const top = volume.base.map((point) => add(point, volume.extrusion));
@@ -191,5 +192,5 @@ export function buildMeasurementFloorplan(node, ctx) {
         screenUpright: true,
     });
     children.push(...editHandles);
-    return { kind: 'group', children };
+    return withFloorplanGeometryMetadata({ kind: 'group', children }, { annotationRole: 'measurement' });
 }

package/dist/measurement/index.d.ts

@@ -1,3 +1,3 @@
 export { measurementDefinition } from './definition';
-export { closestMeasurementFeature, detachMeasurementPayload, freeMeasurementPoint, type MeasurementFeatureMatch, matchMeasurementFeatureForNode, measurementDependencyIds, measurementFeaturePoint, measurementFeaturesForNode, type ResolvedMeasurement, type ResolvedMeasurementPayload, remapMeasurementReferences, resolveMeasurementNode, } from './resolve';
+export { closestMeasurementFeature, detachMeasurementPayload, freeMeasurementPoint, type MeasurementFeatureMatch, matchMeasurementFeatureForNode, measurementDependencyIds, measurementFeaturePoint, measurementFeaturesForNode, type ResolvedMeasurement, type ResolvedMeasurementPayload, remapMeasurementReferences, resolveMeasurementAnchor, resolveMeasurementNode, } from './resolve';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/measurement/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,oBAAoB,EACpB,KAAK,uBAAuB,EAC5B,8BAA8B,EAC9B,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAC1B,KAAK,mBAAmB,EACxB,KAAK,0BAA0B,EAC/B,0BAA0B,EAC1B,sBAAsB,GACvB,MAAM,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/measurement/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,oBAAoB,EACpB,KAAK,uBAAuB,EAC5B,8BAA8B,EAC9B,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAC1B,KAAK,mBAAmB,EACxB,KAAK,0BAA0B,EAC/B,0BAA0B,EAC1B,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,WAAW,CAAA"}

package/dist/measurement/index.js

@@ -1,2 +1,2 @@
 export { measurementDefinition } from './definition';
-export { closestMeasurementFeature, detachMeasurementPayload, freeMeasurementPoint, matchMeasurementFeatureForNode, measurementDependencyIds, measurementFeaturePoint, measurementFeaturesForNode, remapMeasurementReferences, resolveMeasurementNode, } from './resolve';
+export { closestMeasurementFeature, detachMeasurementPayload, freeMeasurementPoint, matchMeasurementFeatureForNode, measurementDependencyIds, measurementFeaturePoint, measurementFeaturesForNode, remapMeasurementReferences, resolveMeasurementAnchor, resolveMeasurementNode, } from './resolve';

package/dist/measurement/resolve.d.ts

@@ -34,6 +34,11 @@ export declare function measurementFeaturesForNode(node: AnyNode, resolve: NodeR
 export declare function matchMeasurementFeatureForNode(node: AnyNode, resolve: NodeResolver, point: MeasurementPoint, maxDistance: number): MeasurementFeatureMatch | null;
 export declare function closestMeasurementFeature(features: readonly MeasurementFeature[], point: MeasurementPoint, maxDistance: number): MeasurementFeatureMatch | null;
 export declare function measurementFeaturePoint(feature: MeasurementFeature, reference: MeasurementFeatureReference): MeasurementPoint | null;
+export declare function resolveMeasurementAnchor(anchor: MeasurementAnchor, resolve: NodeResolver): {
+    point: MeasurementPoint;
+    normal: MeasurementPoint | null;
+    dangling: MeasurementFeatureReference | null;
+};
 export declare function measurementDependencyIds(measurement: MeasurementPayload, resolve?: NodeResolver): AnyNodeId[];
 export declare function resolveMeasurementNode(node: Pick<MeasurementNode, 'measurement'>, resolve: NodeResolver): ResolvedMeasurement;
 export declare function detachMeasurementPayload(node: Pick<MeasurementNode, 'measurement'>, resolve: NodeResolver): MeasurementPayload;

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

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/measurement/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,SAAS,EAGd,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,2BAA2B,EAChC,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EAGrB,0BAA0B,EAC3B,MAAM,kBAAkB,CAAA;AAEzB,MAAM,MAAM,0BAA0B,GAClC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;CAAE,GAClE;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;CAAE,GACjF;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,gBAAgB,EAAE,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,gBAAgB,EAAE,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC;IAAC,SAAS,EAAE,gBAAgB,CAAA;CAAE,CAAA;AAE7E,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,0BAA0B,CAAA;IACnC,QAAQ,EAAE,2BAA2B,EAAE,CAAA;IACvC,YAAY,EAAE,SAAS,EAAE,CAAA;IACzB,aAAa,EAAE,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAA;CAC9C,CAAA;AAED,KAAK,YAAY,GAAG,CAAC,EAAE,EAAE,SAAS,KAAK,OAAO,GAAG,SAAS,CAAA;AAE1D,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,kBAAkB,CAAA;IAC3B,KAAK,EAAE,gBAAgB,CAAA;IACvB,CAAC,EAAE,MAAM,CAAA;IACT,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAA;IACrD,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAwBD,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,wBAG9E;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,gBAAgB,EACvB,WAAW,EAAE,MAAM,GAClB,uBAAuB,GAAG,IAAI,CA2BhC;AAED,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,EACvC,KAAK,EAAE,gBAAgB,EACvB,WAAW,EAAE,MAAM,GAClB,uBAAuB,GAAG,IAAI,CAahC;AAoCD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,kBAAkB,EAC3B,SAAS,EAAE,2BAA2B,GACrC,gBAAgB,GAAG,IAAI,CAazB;AAqCD,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,kBAAkB,EAC/B,OAAO,CAAC,EAAE,YAAY,GACrB,SAAS,EAAE,CAUb;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,EAC1C,OAAO,EAAE,YAAY,GACpB,mBAAmB,CAkDrB;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,EAC1C,OAAO,EAAE,YAAY,GACpB,kBAAkB,CAEpB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,gBAAgB,CAEhF;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAA"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/measurement/resolve.ts"],"names":[],"mappings":"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"}

package/dist/measurement/resolve.js

@@ -111,7 +111,7 @@ export function measurementFeaturePoint(feature, reference) {
             return pointOnPath(feature.geometry.points, t, true);
     }
 }
-function resolveAnchor(anchor, resolve) {
+export function resolveMeasurementAnchor(anchor, resolve) {
     if (Array.isArray(anchor))
         return { point: anchor, normal: null, dangling: null };
     const referencedNode = resolve(anchor.reference.nodeId);
@@ -152,7 +152,7 @@ export function resolveMeasurementNode(node, resolve) {
     const dangling = [];
     const anchorNormals = [];
     const point = (anchor) => {
-        const result = resolveAnchor(anchor, resolve);
+        const result = resolveMeasurementAnchor(anchor, resolve);
         if (result.dangling)
             dangling.push(result.dangling);
         anchorNormals.push(result.normal);

package/dist/measurement/surface-query.js

@@ -254,14 +254,14 @@ export function selectMeasurementSurfaceHit(hits, levelObject, preference) {
     const nearest = hits[0] ?? null;
     if (!(nearest && preference))
         return nearest;
-    const nearby = hits.filter((hit) => hit.intersection.distance <=
-        nearest.intersection.distance + SURFACE_INTENT_MAX_OCCLUSION_DISTANCE);
     if (preference.kind === 'horizontal') {
         if (Math.abs(toLocalSurfaceHit(nearest, levelObject).normal[1]) >=
             HORIZONTAL_SURFACE_MAX_OCCLUDER_NORMAL_Y) {
             return nearest;
         }
         const nodes = useScene.getState().nodes;
+        const nearby = hits.filter((hit) => hit.intersection.distance <=
+            nearest.intersection.distance + SURFACE_INTENT_MAX_OCCLUSION_DISTANCE);
         return (nearby.find((hit) => {
             const type = hit.targetNodeId ? nodes[hit.targetNodeId]?.type : undefined;
             return (Boolean(type && HORIZONTAL_SURFACE_TYPES.has(type)) &&
@@ -270,16 +270,16 @@ export function selectMeasurementSurfaceHit(hits, levelObject, preference) {
     }
     const preferredNormal = new Vector3(...preference.normal);
     if (preferredNormal.lengthSq() <= 1e-12)
-        return nearest;
+        return null;
     preferredNormal.normalize();
     const preferredPoint = new Vector3(...preference.point);
-    return (nearby.find((hit) => {
+    return (hits.find((hit) => {
         const localHit = toLocalSurfaceHit(hit, levelObject);
         const normalAlignment = Math.abs(preferredNormal.dot(new Vector3(...localHit.normal)));
         const planeDistance = Math.abs(new Vector3(...localHit.point).sub(preferredPoint).dot(preferredNormal));
         return (normalAlignment >= SURFACE_INTENT_MIN_NORMAL_ALIGNMENT &&
             planeDistance <= SURFACE_INTENT_PLANE_TOLERANCE);
-    }) ?? nearest);
+    }) ?? null);
 }
 function setRayFromPointer(raycaster, pointer, event, camera, canvas) {
     const rect = canvas.getBoundingClientRect();

package/dist/measurement/tool.d.ts

@@ -1,7 +1,8 @@
 import { type AlignmentAnchor, type MeasurementFeatureAnchor, type MeasurementSnapKind } from '@pascal-app/core';
-import { type LinearUnit, type MeasurementAxis, type MeasurementAxisGuide, type MeasurementPoint } from '@pascal-app/editor';
+import { type LinearUnit, type MeasurementAxis, type MeasurementAxisGuide, type MeasurementKind, type MeasurementPoint } from '@pascal-app/editor';
 import { type FC } from 'react';
 import { type Camera, type Intersection, type Object3D, Raycaster, Vector2, Vector3 } from 'three';
+import { type MeasurementSurfacePreference } from './surface-query';
 export type MeasurementRaycastContext = {
     ownerByObject: Map<Object3D, string>;
     roots: Object3D[];
@@ -35,6 +36,10 @@ export declare function selectClosestVerifiedAxisProjection(candidates: readonly
 export declare function selectAxisCandidateForSurfaceVerification<T extends MeasurementAxisCandidate>(candidates: readonly T[], threshold?: number, lockedAxis?: MeasurementAxis | null, releaseThreshold?: number, lockedFrom?: MeasurementPoint | null): T | null;
 export declare function measurementVertexSnapAnchors(points: readonly MeasurementPoint[], index: number, polygon: boolean): MeasurementPoint[];
 export declare function selectClosestMeasurementVertexIndex(screenDistances: readonly number[], threshold?: number): number | null;
+export declare function measurementPolygonSurfacePreference(kind: MeasurementKind, plane: {
+    point: MeasurementPoint;
+    normal: MeasurementPoint;
+} | null, applyMagneticSnap: boolean): MeasurementSurfacePreference | null;
 export declare function isMeasurementSurfaceMaterialVisible(object: Object3D, materialIndex?: number): boolean;
 export declare function isMeasurementSurfaceEligible(object: Object3D): boolean;
 export declare function collectMeasurementSurfaceRoots(scene: Object3D, registeredRoots: readonly Object3D[]): Object3D[];

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

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

package/dist/measurement/tool.js

@@ -124,12 +124,14 @@ function isMeasurementKind(value) {
         value === 'perimeter' ||
         value === 'volume');
 }
-function polygonSurfacePreference(kind, plane) {
+export function measurementPolygonSurfacePreference(kind, plane, applyMagneticSnap) {
     if (kind !== 'area' && kind !== 'perimeter' && kind !== 'volume')
         return null;
     return plane
         ? { kind: 'plane', point: plane.point, normal: plane.normal }
-        : { kind: 'horizontal' };
+        : applyMagneticSnap
+            ? { kind: 'horizontal' }
+            : null;
 }
 function isEffectivelyVisible(object) {
     let current = object;
@@ -1151,9 +1153,7 @@ export const MeasurementTool = () => {
                     anchorOrAnchors: anchors,
                     lockedGuide: applyMagneticSnap && activeDraft.axisGuide?.snapped ? activeDraft.axisGuide : null,
                     planarProximityAnchors: getPlanarProximityAnchors(),
-                    surfacePreference: applyMagneticSnap
-                        ? polygonSurfacePreference(activeDraft.kind, activeDraft.collectionPlane)
-                        : null,
+                    surfacePreference: measurementPolygonSurfacePreference(activeDraft.kind, activeDraft.collectionPlane, applyMagneticSnap),
                     applyMagneticSnap,
                     showAlignmentGuides: isAlignmentGuideActive(),
                 });
@@ -1186,9 +1186,7 @@ export const MeasurementTool = () => {
                 anchorOrAnchors: draft.points[draft.points.length - 1] ?? null,
                 lockedGuide: applyMagneticSnap && draft.axisGuide?.snapped ? draft.axisGuide : null,
                 planarProximityAnchors: getPlanarProximityAnchors(),
-                surfacePreference: applyMagneticSnap
-                    ? polygonSurfacePreference(draft.kind, draft.collectionPlane)
-                    : null,
+                surfacePreference: measurementPolygonSurfacePreference(draft.kind, draft.collectionPlane, applyMagneticSnap),
                 applyMagneticSnap,
                 showAlignmentGuides: isAlignmentGuideActive(),
             });
@@ -1269,9 +1267,7 @@ export const MeasurementTool = () => {
                 anchorOrAnchors: draft.points[draft.points.length - 1] ?? null,
                 lockedGuide: applyMagneticSnap && draft.axisGuide?.snapped ? draft.axisGuide : null,
                 planarProximityAnchors: getPlanarProximityAnchors(),
-                surfacePreference: applyMagneticSnap
-                    ? polygonSurfacePreference(draft.kind, draft.collectionPlane)
-                    : null,
+                surfacePreference: measurementPolygonSurfacePreference(draft.kind, draft.collectionPlane, applyMagneticSnap),
                 applyMagneticSnap,
                 showAlignmentGuides: isAlignmentGuideActive(),
             });

package/dist/pipe-segment/tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/pipe-segment/tool.tsx"],"names":[],"mappings":"AAwIA,QAAA,MAAM,eAAe,0CAmjBpB,CAAA;AAkCD,eAAe,eAAe,CAAA"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/pipe-segment/tool.tsx"],"names":[],"mappings":"AAyIA,QAAA,MAAM,eAAe,0CAujBpB,CAAA;AAkCD,eAAe,eAAe,CAAA"}

package/dist/pipe-segment/tool.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { emitter, PipeSegmentNode, useScene } from '@pascal-app/core';
-import { CursorSphere, DimensionPill, EDITOR_LAYER, isAngleSnapActive, isGridSnapActive, isMagneticSnapActive, markToolCancelConsumed, triggerSFX, useEditor, } from '@pascal-app/editor';
+import { CursorSphere, DimensionPill, EDITOR_LAYER, isAngleSnapActive, isGridSnapActive, isMagneticSnapActive, markToolCancelConsumed, triggerSFX, useEditor, usePathDraftPreview, } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { Html } from '@react-three/drei';
 import { useEffect, useRef, useState } from 'react';
@@ -124,6 +124,27 @@ const PipeSegmentTool = () => {
     const startBodyRef = useRef(null);
     const altAnchorRef = useRef(null);
     const lastClientYRef = useRef(null);
+    const displayStart = draftStart &&
+        cursorPos &&
+        sloped &&
+        system === 'waste' &&
+        !startPortRef.current &&
+        !startBodyRef.current &&
+        !snapTarget &&
+        !altActive
+        ? [
+            draftStart[0],
+            draftStart[1] +
+                Math.hypot(cursorPos[0] - draftStart[0], cursorPos[2] - draftStart[2]) * DRAIN_SLOPE,
+            draftStart[2],
+        ]
+        : draftStart;
+    useEffect(() => {
+        usePathDraftPreview
+            .getState()
+            .setDraft('pipe-segment', displayStart ? [displayStart] : [], cursorPos, { diameter, system });
+    }, [cursorPos, diameter, displayStart, system]);
+    useEffect(() => () => usePathDraftPreview.getState().clear('pipe-segment'), []);
     useEffect(() => {
         if (!activeLevelId)
             return;
@@ -540,24 +561,6 @@ const PipeSegmentTool = () => {
     }, [activeLevelId]);
     if (!activeLevelId)
         return null;
-    // Free waste start lifts at commit so the run falls ONTO the grid —
-    // mirror that here so the preview line / pill match the placed pipe.
-    // A snapped end (snapTarget set) keeps the start where it is.
-    const displayStart = draftStart &&
-        cursorPos &&
-        sloped &&
-        system === 'waste' &&
-        !startPortRef.current &&
-        !startBodyRef.current &&
-        !snapTarget &&
-        !altActive
-        ? [
-            draftStart[0],
-            draftStart[1] +
-                Math.hypot(cursorPos[0] - draftStart[0], cursorPos[2] - draftStart[2]) * DRAIN_SLOPE,
-            draftStart[2],
-        ]
-        : draftStart;
     const pillParts = cursorPos
         ? [
             ...['x', 'y', 'z'].map((axis, i) => ({

package/dist/roof-segment/floorplan-affordances.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floorplan-affordances.d.ts","sourceRoot":"","sources":["../../src/roof-segment/floorplan-affordances.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EAExB,KAAK,eAAe,EAGrB,MAAM,kBAAkB,CAAA;AA4CzB;;;;;;;;GAQG;AACH,eAAO,MAAM,2BAA2B,EAAE,mBAAmB,CAAC,eAAe,CA8C5E,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,EAAE,mBAAmB,CAAC,eAAe,CA4B5E,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,EAAE,mBAAmB,CAAC,eAAe,CAyCtE,CAAA"}
+{"version":3,"file":"floorplan-affordances.d.ts","sourceRoot":"","sources":["../../src/roof-segment/floorplan-affordances.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EAExB,KAAK,eAAe,EAIrB,MAAM,kBAAkB,CAAA;AA4CzB;;;;;;;;GAQG;AACH,eAAO,MAAM,2BAA2B,EAAE,mBAAmB,CAAC,eAAe,CAgD5E,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,EAAE,mBAAmB,CAAC,eAAe,CA8B5E,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,EAAE,mBAAmB,CAAC,eAAe,CA2CtE,CAAA"}