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

package/dist/downspout/geometry.js

@@ -1,5 +1,6 @@
 import * as THREE from 'three';
 import { mergeGeometries } from 'three/examples/jsm/utils/BufferGeometryUtils.js';
+import { applyCylinderWorldUvs, applyPlanarWorldUvs, applySphereWorldUvs, copyUvToSecondaryChannel, } from '../shared/primitive-uv';
 import { computeDownspoutPath, downspoutPipeDims, effectiveWallJog, } from './routing';
 /**
  * Downspout pipe builder. The pipe follows a real downspout's path —
@@ -78,6 +79,7 @@ export function buildDownspoutGeometry(node, routing) {
             p.dispose();
     }
     merged.computeVertexNormals();
+    copyUvToSecondaryChannel(merged);
     return merged;
 }
 /**
@@ -92,6 +94,10 @@ function segmentBetween(a, b, dims) {
     const geo = dims.shape === 'round'
         ? new THREE.CylinderGeometry(dims.halfX, dims.halfX, len, RADIAL_SEGMENTS).toNonIndexed()
         : new THREE.BoxGeometry(2 * dims.halfX, len, 2 * dims.halfZ).toNonIndexed();
+    if (dims.shape === 'round')
+        applyCylinderWorldUvs(geo, dims.halfX, len);
+    else
+        applyPlanarWorldUvs(geo);
     // The primitive runs along +Y centred at origin; rotate +Y onto the
     // segment direction, then drop it on the midpoint.
     geo.applyQuaternion(new THREE.Quaternion().setFromUnitVectors(UP, dir.normalize()));
@@ -150,6 +156,7 @@ function ringTube(a, b, dims) {
 function jointAt(p, prev, next, dims) {
     if (dims.shape === 'round') {
         const geo = new THREE.SphereGeometry(dims.halfX, JOINT_SEGMENTS, JOINT_SEGMENTS).toNonIndexed();
+        applySphereWorldUvs(geo, dims.halfX);
         geo.translate(p.x, p.y, p.z);
         return geo;
     }
@@ -160,6 +167,7 @@ function jointAt(p, prev, next, dims) {
         bis.copy(dirOut); // straight-through; degenerate
     bis.normalize();
     const geo = new THREE.BoxGeometry(2 * dims.halfX, 2 * dims.halfZ, 2 * dims.halfZ).toNonIndexed();
+    applyPlanarWorldUvs(geo);
     geo.applyQuaternion(new THREE.Quaternion().setFromUnitVectors(UP, bis));
     geo.translate(p.x, p.y, p.z);
     return geo;
@@ -185,6 +193,7 @@ function buildStraps(path, dims, spacing) {
     for (let i = 0; i < count; i++) {
         const y = count > 1 ? top - STRAP_END_MARGIN - i * stride : (top + bottom) / 2;
         const band = new THREE.BoxGeometry(w, STRAP_THICKNESS, d).toNonIndexed();
+        applyPlanarWorldUvs(band);
         band.translate(0, y, z);
         straps.push(band);
     }
@@ -197,6 +206,7 @@ function buildStraps(path, dims, spacing) {
 function buildSplash(path) {
     const [bx, by, bz] = path.bottom;
     const slab = new THREE.BoxGeometry(SPLASH_WIDTH, SPLASH_THICKNESS, SPLASH_LENGTH).toNonIndexed();
+    applyPlanarWorldUvs(slab);
     // Tilt the far (+Z) end down so it slopes away from the wall.
     slab.rotateX(SPLASH_TILT);
     slab.translate(bx, by - SPLASH_THICKNESS / 2, bz + SPLASH_LENGTH / 2);

package/dist/downspout/inspector-editors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspector-editors.d.ts","sourceRoot":"","sources":["../../src/downspout/inspector-editors.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,aAAa,EAKnB,MAAM,kBAAkB,CAAA;AAGzB;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,sCAyDxE"}
+{"version":3,"file":"inspector-editors.d.ts","sourceRoot":"","sources":["../../src/downspout/inspector-editors.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,aAAa,EAKnB,MAAM,kBAAkB,CAAA;AAGzB;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,sCAoExE"}

package/dist/downspout/inspector-editors.js

@@ -50,7 +50,15 @@ export function DownspoutPositionEditor({ node }) {
     const handleCommit = (offset) => {
         // Commit once to the store, then drop the override.
         const state = useScene.getState();
-        state.updateNode(gutterId, { outlets: withOffset(offset) });
+        const outlets = withOffset(offset).map((entry) => entry.id === node.outletId ? { ...entry, generatedBy: undefined } : entry);
+        const metadata = node.metadata && typeof node.metadata === 'object' && !Array.isArray(node.metadata)
+            ? { ...node.metadata }
+            : {};
+        delete metadata.generatedBy;
+        state.updateNodes([
+            { id: gutterId, data: { outlets } },
+            { id: node.id, data: { metadata: metadata } },
+        ]);
         useLiveNodeOverrides.getState().clear(gutterId);
         state.markDirty(gutterId);
     };

package/dist/downspout/parametrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parametrics.d.ts","sourceRoot":"","sources":["../../src/downspout/parametrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,eAAO,MAAM,oBAAoB,EAAE,oBAAoB,CAAC,aAAa,CAgEpE,CAAA"}
+{"version":3,"file":"parametrics.d.ts","sourceRoot":"","sources":["../../src/downspout/parametrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,eAAO,MAAM,oBAAoB,EAAE,oBAAoB,CAAC,aAAa,CAiEpE,CAAA"}

package/dist/downspout/parametrics.js

@@ -1,10 +1,11 @@
 import { DownspoutPositionEditor } from './inspector-editors';
 export const downspoutParametrics = {
+    derive: (_next, patch) => ('length' in patch ? { lengthMode: 'manual' } : {}),
     groups: [
         {
             label: 'Dimensions',
             fields: [
-                { key: 'length', kind: 'number', unit: 'm', min: 0.1, max: 8, step: 0.05 },
+                { key: 'length', kind: 'number', unit: 'm', min: 0.1, max: 1000, step: 0.05 },
                 { key: 'diameter', kind: 'number', unit: 'm', min: 0.02, max: 0.15, step: 0.005 },
                 // Cross-section: follow the gutter profile, or force round / rect.
                 {

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

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/downspout/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,aAAa,EAMnB,MAAM,kBAAkB,CAAA;AAuBzB;;;;;;;;;;;;;;;GAeG;AACH,QAAA,MAAM,iBAAiB,GAAI,qBAAqB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,uCAqKtE,CAAA;AAED,eAAe,iBAAiB,CAAA"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/downspout/renderer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,aAAa,EAMnB,MAAM,kBAAkB,CAAA;AAwBzB;;;;;;;;;;;;;;;GAeG;AACH,QAAA,MAAM,iBAAiB,GAAI,qBAAqB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,uCAmLtE,CAAA;AAED,eAAe,iBAAiB,CAAA"}

package/dist/downspout/renderer.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useLiveNodeOverrides, useRegistry, useScene, } from '@pascal-app/core';
-import { createMaterial, createMaterialFromPresetRef, createSurfaceRoleMaterial, useNodeEvents, useViewer, } from '@pascal-app/viewer';
+import { createMaterial, createMaterialFromPresetRef, createSurfaceRoleMaterial, resolveMaterialRef, useNodeEvents, useViewer, } from '@pascal-app/viewer';
 import { useEffect, useMemo, useRef } from 'react';
 import * as THREE from 'three';
 import { computeEaveY } from '../gutter/eave-snap';
@@ -38,6 +38,7 @@ const DownspoutRenderer = ({ node: storeNode }) => {
     const textures = useViewer((s) => s.textures);
     const colorPreset = useViewer((s) => s.colorPreset);
     const sceneTheme = useViewer((s) => s.sceneTheme);
+    const sceneMaterials = useScene((s) => s.materials);
     const overrides = useLiveNodeOverrides((s) => s.get(storeNode.id));
     const node = overrides
         ? { ...storeNode, ...overrides }
@@ -96,13 +97,28 @@ const DownspoutRenderer = ({ node: storeNode }) => {
     ]);
     useEffect(() => () => geometry.dispose(), [geometry]);
     const material = useMemo(() => {
-        if (!textures || (!node.material && !node.materialPreset)) {
+        if (!textures) {
+            return createSurfaceRoleMaterial('roof', colorPreset, THREE.FrontSide, sceneTheme);
+        }
+        const slotMaterial = resolveMaterialRef(node.slots?.surface, sceneMaterials, shading);
+        if (slotMaterial)
+            return slotMaterial;
+        if (!node.material && !node.materialPreset) {
             return createSurfaceRoleMaterial('roof', colorPreset, THREE.FrontSide, sceneTheme);
         }
         return node.material
             ? createMaterial(node.material, shading)
             : (createMaterialFromPresetRef(node.materialPreset, shading) ?? defaultMaterial);
-    }, [textures, colorPreset, sceneTheme, shading, node.material, node.materialPreset]);
+    }, [
+        textures,
+        colorPreset,
+        sceneTheme,
+        shading,
+        node.slots?.surface,
+        node.material,
+        node.materialPreset,
+        sceneMaterials,
+    ]);
     // Map downspout-local geometry into the host segment's local frame (where the
     // trim cut prisms live). Recompose the same outlet pose the inner mesh group
     // is mounted with (gutter offset + rotation → outlet → eave Y). Computed

package/dist/downspout/system.d.ts

@@ -0,0 +1,7 @@
+import { type SceneApi } from '@pascal-app/core';
+export declare function initializeAutomaticDownspoutSync(sceneApi: SceneApi): () => void;
+declare const DownspoutSystem: ({ sceneApi }: {
+    sceneApi: SceneApi;
+}) => null;
+export default DownspoutSystem;
+//# sourceMappingURL=system.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/downspout/system.tsx"],"names":[],"mappings":"AAEA,OAAO,EAOL,KAAK,QAAQ,EAEd,MAAM,kBAAkB,CAAA;AA0EzB,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,QAAQ,cAkClE;AAED,QAAA,MAAM,eAAe,GAAI,cAAc;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,SAG5D,CAAA;AAED,eAAe,eAAe,CAAA"}

package/dist/downspout/system.js

@@ -0,0 +1,114 @@
+'use client';
+import { resolveAutomaticDownspoutLength, usesAutomaticDownspoutLength, } from '@pascal-app/core';
+import { useEffect } from 'react';
+const BROAD_AUTOMATIC_LENGTH_DEPENDENCY_TYPES = new Set([
+    'site',
+    'building',
+    'level',
+    'wall',
+    'lean-to-extension',
+    'roof',
+]);
+function affectedAutomaticDownspoutIds(nodes, previous, changedIds, automaticIds) {
+    const affected = new Set();
+    for (const id of changedIds) {
+        const current = nodes[id];
+        const prior = previous[id];
+        if (current?.type === 'downspout' && usesAutomaticDownspoutLength(current))
+            affected.add(id);
+        if (prior?.type === 'downspout')
+            affected.add(id);
+        const candidate = current ?? prior;
+        if (!candidate)
+            continue;
+        if (BROAD_AUTOMATIC_LENGTH_DEPENDENCY_TYPES.has(candidate.type)) {
+            for (const automaticId of automaticIds)
+                affected.add(automaticId);
+            continue;
+        }
+        if (candidate.type === 'gutter' || candidate.type === 'roof-segment') {
+            const segmentId = candidate.type === 'roof-segment'
+                ? candidate.id
+                : (candidate.parentId ?? candidate.roofSegmentId);
+            const segment = segmentId
+                ? (nodes[segmentId] ?? previous[segmentId])
+                : undefined;
+            for (const childId of segment?.children ?? []) {
+                const child = nodes[childId] ?? previous[childId];
+                if (child?.type === 'downspout')
+                    affected.add(child.id);
+            }
+        }
+    }
+    return affected;
+}
+function automaticLengthUpdates(nodes, candidateIds) {
+    const updates = [];
+    for (const id of candidateIds) {
+        const candidate = nodes[id];
+        if (candidate?.type !== 'downspout' || !usesAutomaticDownspoutLength(candidate))
+            continue;
+        const downspout = candidate;
+        const gutter = downspout.gutterId
+            ? nodes[downspout.gutterId]
+            : undefined;
+        const segment = gutter?.roofSegmentId
+            ? nodes[gutter.roofSegmentId]
+            : undefined;
+        const outlet = gutter?.outlets?.find((entry) => entry.id === downspout.outletId);
+        if (!(gutter?.type === 'gutter' && segment?.type === 'roof-segment' && outlet))
+            continue;
+        const length = resolveAutomaticDownspoutLength(nodes, segment, gutter, outlet.offset);
+        if (Math.abs(length - downspout.length) > 1e-6) {
+            updates.push({ id: downspout.id, data: { length } });
+        }
+    }
+    return updates;
+}
+export function initializeAutomaticDownspoutSync(sceneApi) {
+    const applyChanges = sceneApi.applyChanges;
+    const subscribeNodes = sceneApi.subscribeNodes;
+    if (!(applyChanges && subscribeNodes))
+        return () => { };
+    const automaticIds = new Set();
+    for (const node of Object.values(sceneApi.nodes())) {
+        if (node.type === 'downspout' && usesAutomaticDownspoutLength(node)) {
+            automaticIds.add(node.id);
+        }
+    }
+    let syncing = false;
+    const apply = (nodes, candidateIds) => {
+        const updates = automaticLengthUpdates(nodes, candidateIds);
+        if (updates.length === 0)
+            return;
+        syncing = true;
+        sceneApi.pauseHistory();
+        try {
+            applyChanges({ update: updates });
+        }
+        finally {
+            sceneApi.resumeHistory();
+            syncing = false;
+        }
+    };
+    apply(sceneApi.nodes(), automaticIds);
+    return subscribeNodes((nodes, previous, changedIds) => {
+        if (syncing)
+            return;
+        for (const id of changedIds) {
+            const node = nodes[id];
+            if (node?.type === 'downspout' && usesAutomaticDownspoutLength(node))
+                automaticIds.add(id);
+            else if (previous[id]?.type === 'downspout')
+                automaticIds.delete(id);
+        }
+        const affected = affectedAutomaticDownspoutIds(nodes, previous, changedIds, automaticIds);
+        if (affected.size > 0)
+            apply(nodes, affected);
+    });
+}
+const DownspoutSystem = ({ sceneApi }) => {
+    useEffect(() => initializeAutomaticDownspoutSync(sceneApi), [sceneApi]);
+    return null;
+};
+export default DownspoutSystem;

package/dist/duct-fitting/accessory-geometry.d.ts

@@ -0,0 +1,4 @@
+import type { DuctFittingNode } from '@pascal-app/core';
+import { Group, type Material } from 'three';
+export declare function buildDuctAccessory(node: DuctFittingNode, material: Material): Group | null;
+//# sourceMappingURL=accessory-geometry.d.ts.map

package/dist/duct-fitting/accessory-geometry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"accessory-geometry.d.ts","sourceRoot":"","sources":["../../src/duct-fitting/accessory-geometry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,KAAK,QAAQ,EAAE,MAAM,OAAO,CAAA;AAG5C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,GAAG,KAAK,GAAG,IAAI,CAiH1F"}

package/dist/duct-fitting/accessory-geometry.js

@@ -0,0 +1,47 @@
+import { Group } from 'three';
+import { addBox, addProfile, hardwareMaterial } from '../shared/accessory-geometry';
+export function buildDuctAccessory(node, material) {
+    if (!['end-cap', 'damper', 'access-panel', 'coupling'].includes(node.fittingType))
+        return null;
+    const group = new Group();
+    const hardware = node.fittingType === 'damper' || node.fittingType === 'access-panel'
+        ? hardwareMaterial()
+        : material;
+    if (node.fittingType === 'access-panel') {
+        const w = node.panelWidth;
+        const h = node.panelHeight;
+        addBox(group, 'access-gasket', [w + 0.012, h + 0.012, 0.004], [0, 0, 0.002], hardware);
+        addBox(group, 'access-door', [w, h, 0.012], [0, 0, 0.01], material);
+        for (const side of [-1, 1]) {
+            addBox(group, `access-frame-side-${side}`, [0.016, h + 0.04, 0.012], [side * (w / 2 + 0.012), 0, 0.006], material);
+            addBox(group, `access-frame-rail-${side}`, [w + 0.04, 0.016, 0.012], [0, side * (h / 2 + 0.012), 0.006], material);
+            addBox(group, `access-hinge-${side}`, [0.028, 0.03, 0.018], [-w / 2, side * h * 0.28, 0.018], hardware);
+            addBox(group, `access-latch-${side}`, [0.025, 0.012, 0.015], [w * 0.36, side * h * 0.28, 0.024], hardware);
+        }
+        return group;
+    }
+    const width = (node.shape === 'round' ? node.diameter : node.width) * 0.0254;
+    const height = (node.shape === 'round' ? node.diameter : node.height) * 0.0254;
+    const cap = node.fittingType === 'end-cap';
+    const half = cap ? 0.025 : 0.1;
+    addProfile(group, 'accessory-sleeve', node.shape, width, height, -half, half, material, 0.0015);
+    for (const x of cap ? [-half] : [-half, half - 0.008]) {
+        addProfile(group, `accessory-flange-${x}`, node.shape, width + 0.02, height + 0.02, x, x + 0.008, material, 0.011);
+    }
+    if (cap) {
+        addProfile(group, 'end-cap-closure', node.shape, width, height, half - 0.002, half, material);
+        addProfile(group, 'end-cap-folded-rim', node.shape, width + 0.008, height + 0.008, half - 0.008, half, material, 0.006);
+    }
+    if (node.fittingType === 'damper') {
+        const blade = addProfile(group, 'damper-blade', node.shape, width - 0.006, height - 0.006, -0.001, 0.001, hardware);
+        blade.rotation.z = (-node.damperAngle * Math.PI) / 180;
+        addBox(group, 'damper-spindle', [0.008, 0.008, width + 0.06], [0, 0, 0], hardware);
+        addBox(group, 'damper-bearing', [0.04, 0.04, 0.012], [0, 0, width / 2 + 0.01], material);
+        const handle = addBox(group, 'damper-handle', [0.015, 0.09, 0.01], [0, 0, width / 2 + 0.035], hardware);
+        handle.geometry.translate(0, 0.035, 0);
+        handle.rotation.z = (-node.damperAngle * Math.PI) / 180;
+    }
+    if (node.fittingType === 'coupling')
+        addProfile(group, 'coupling-center-seam', node.shape, width + 0.008, height + 0.008, -0.004, 0.004, material, 0.005);
+    return group;
+}

package/dist/duct-fitting/definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/duct-fitting/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAOtD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CAyHxE,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/duct-fitting/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAQtD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CAiIxE,CAAA"}

package/dist/duct-fitting/definition.js

@@ -1,5 +1,6 @@
 import { ductBodyPaint, ductBodySlots } from '../shared/duct-body-paint';
 import { rotateFittingNode } from '../shared/fitting-rotation';
+import { ductFittingToolOptions } from '../shared/fitting-tool-options';
 import { buildDuctFittingFloorplan } from './floorplan';
 import { buildDuctFittingGeometry } from './geometry';
 import { ductFittingParametrics } from './parametrics';
@@ -15,7 +16,7 @@ import { DuctFittingNode } from './schema';
  */
 export const ductFittingDefinition = {
     kind: 'duct-fitting',
-    schemaVersion: 1,
+    schemaVersion: 3,
     schema: DuctFittingNode,
     category: 'utility',
     distributionRole: 'fitting',
@@ -27,6 +28,9 @@ export const ductFittingDefinition = {
         metadata: {},
         position: [0, 0, 0],
         rotation: [0, 0, 0],
+        damperAngle: 0,
+        panelWidth: 0.25,
+        panelHeight: 0.15,
         fittingType: 'elbow',
         shape: 'rect',
         width: 14,
@@ -56,11 +60,16 @@ export const ductFittingDefinition = {
     geometry: buildDuctFittingGeometry,
     geometryKey: (n) => JSON.stringify([
         n.fittingType,
+        n.damperAngle,
+        n.panelWidth,
+        n.panelHeight,
         // The mitered elbow + flange profiles swap width/height roles based
         // on where world-up sits in the local frame, so orientation is a
         // geometry input.
         n.rotation,
         n.shape,
+        n.inletShape,
+        n.outletShape,
         n.width,
         n.height,
         n.shape2,
@@ -103,6 +112,7 @@ export const ductFittingDefinition = {
         // `capabilities.movable` in the MoveTool dispatcher.
         move: () => import('./move-tool'),
     },
+    toolOptions: ductFittingToolOptions,
     tool: () => import('./tool'),
     toolHints: [
         { key: 'Click', label: 'Place fitting' },

package/dist/duct-fitting/floorplan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floorplan.d.ts","sourceRoot":"","sources":["../../src/duct-fitting/floorplan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAG1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAM/C;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,eAAe,EACrB,GAAG,EAAE,eAAe,GACnB,iBAAiB,GAAG,IAAI,CAgD1B"}
+{"version":3,"file":"floorplan.d.ts","sourceRoot":"","sources":["../../src/duct-fitting/floorplan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAO1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAM/C;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,eAAe,EACrB,GAAG,EAAE,eAAe,GACnB,iBAAiB,GAAG,IAAI,CAoD1B"}

package/dist/duct-fitting/floorplan.js

@@ -1,4 +1,8 @@
+import { MeshStandardMaterial } from 'three';
 import { INCHES_TO_METERS } from '../duct-segment/geometry';
+import { accessoryFloorplan } from '../shared/accessory-floorplan';
+import { buildDuctAccessory } from './accessory-geometry';
+import { buildDuctFittingGeometry } from './geometry';
 import { getDuctFittingPorts } from './ports';
 const SUPPLY_COLOR = '#d4825a';
 const RETURN_COLOR = '#5a8ad4';
@@ -12,6 +16,10 @@ const BODY_COLOR = '#9ca3af';
  * circle, which is exactly how it should read from above.
  */
 export function buildDuctFittingFloorplan(node, ctx) {
+    if (['end-cap', 'damper', 'access-panel', 'coupling'].includes(node.fittingType))
+        return accessoryFloorplan(buildDuctAccessory(node, new MeshStandardMaterial()), node, ctx);
+    if (node.fittingType === 'transition' || node.fittingType === 'reducer')
+        return accessoryFloorplan(buildDuctFittingGeometry(node), node, ctx);
     const [cx, , cz] = node.position;
     const ports = getDuctFittingPorts(node);
     const view = ctx.viewState;

package/dist/duct-fitting/geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/duct-fitting/geometry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAML,KAAK,EAMN,MAAM,OAAO,CAAA;AAUd,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AA6K/C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,eAAe,EACrB,GAAG,CAAC,EAAE,eAAe,EACrB,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM,GAClB,KAAK,CAoQP"}
+{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/duct-fitting/geometry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAML,KAAK,EAMN,MAAM,OAAO,CAAA;AAWd,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAmL/C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,eAAe,EACrB,GAAG,CAAC,EAAE,eAAe,EACrB,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM,GAClB,KAAK,CAyRP"}

package/dist/duct-fitting/geometry.js

@@ -1,7 +1,8 @@
 import { BufferGeometry, CylinderGeometry, DoubleSide, Euler, Float32BufferAttribute, Group, Mesh, SphereGeometry, TorusGeometry, Vector3, } from 'three';
 import { buildOvalSection, buildRectSection, buildSection, createDuctMaterial, INCHES_TO_METERS, } from '../duct-segment/geometry';
 import { DUCT_BODY_SLOT_ID } from '../shared/duct-body-paint';
-import { localFittingPorts } from './ports';
+import { buildDuctAccessory } from './accessory-geometry';
+import { adapterShape, localFittingPorts } from './ports';
 const RADIAL_SEGMENTS = 24;
 const UP = new Vector3(0, 1, 0);
 /**
@@ -104,17 +105,7 @@ function buildMiteredElbow(inletPos, outletPos, sweepM, cheekM, profileShape, ma
     mesh.name = `fitting-elbow-${profileShape}`;
     return mesh;
 }
-/**
- * Square-to-round loft between a rect ring at `xRect` and a round ring
- * at `xRound`, both centered on the local X axis (the straight-through
- * run). Profiles are sampled at matching polar angles — the rect point
- * is the ray's intersection with the rectangle boundary — so the skin
- * twists nowhere. Non-indexed triangles + computed normals give the
- * faceted gore look of a real shop-made square-to-round.
- */
-function buildRectToRoundLoft(xRect, xRound, widthM, heightM, radius, material) {
-    const hw = widthM / 2;
-    const hh = heightM / 2;
+function buildProfileLoft(xRect, xRound, widthM, heightM, material, inletShape, outletShape, outletWidthM, outletHeightM) {
     const rectRing = [];
     const roundRing = [];
     for (let i = 0; i < RADIAL_SEGMENTS; i++) {
@@ -124,9 +115,24 @@ function buildRectToRoundLoft(xRect, xRound, widthM, heightM, radius, material)
         // Scale the unit ray until it hits the rectangle boundary. Width
         // spans local Z and height local Y — the same axes buildRectSection
         // gives a +X run.
-        const t = 1 / Math.max(Math.abs(cz) / hw, Math.abs(sy) / hh);
+        const radiusAt = (shape, w, h) => {
+            if (shape === 'round')
+                return w / 2;
+            if (shape === 'rect')
+                return 1 / Math.max(Math.abs(cz) / (w / 2), Math.abs(sy) / (h / 2));
+            const r = Math.min(w, h) / 2;
+            const offset = Math.abs(w - h) / 2;
+            const major = Math.abs(w >= h ? cz : sy);
+            const minor = Math.abs(w >= h ? sy : cz);
+            const flat = minor > 1e-9 ? r / minor : Infinity;
+            return flat * major <= offset
+                ? flat
+                : offset * major + Math.sqrt(Math.max(0, r * r - offset * offset * minor * minor));
+        };
+        const t = radiusAt(inletShape, widthM, heightM);
+        const u = radiusAt(outletShape, outletWidthM, outletHeightM);
         rectRing.push(new Vector3(xRect, t * sy, t * cz));
-        roundRing.push(new Vector3(xRound, radius * sy, radius * cz));
+        roundRing.push(new Vector3(xRound, u * sy, u * cz));
     }
     const positions = [];
     const tri = (a, b, c) => positions.push(a.x, a.y, a.z, b.x, b.y, b.z, c.x, c.y, c.z);
@@ -167,6 +173,14 @@ function buildRectToRoundLoft(xRect, xRound, widthM, heightM, radius, material)
 export function buildDuctFittingGeometry(node, ctx, shading = 'rendered', textures = true, colorPreset = 'clay', sceneTheme) {
     const group = new Group();
     const material = createDuctMaterial(node, ctx?.materials, shading, textures, colorPreset, sceneTheme);
+    const accessory = buildDuctAccessory(node, material);
+    if (accessory) {
+        accessory.traverse((object) => {
+            if (object instanceof Mesh)
+                object.userData.slotId = DUCT_BODY_SLOT_ID;
+        });
+        return accessory;
+    }
     const radiusMain = (node.diameter * INCHES_TO_METERS) / 2;
     const ports = localFittingPorts(node);
     const widthM = node.width * INCHES_TO_METERS;
@@ -178,7 +192,9 @@ export function buildDuctFittingGeometry(node, ctx, shading = 'rendered', textur
     // where world-up sits in the fitting's local frame.
     const hingeWorld = UP.clone().applyEuler(new Euler(node.rotation[0], node.rotation[1], node.rotation[2]));
     const hingeIsVertical = Math.abs(hingeWorld.y) >= Math.SQRT1_2;
-    if (node.fittingType === 'reducer') {
+    if (node.fittingType === 'reducer' &&
+        adapterShape(node) === 'round' &&
+        adapterShape(node, true) === 'round') {
         const radiusOut = (node.diameter2 * INCHES_TO_METERS) / 2;
         const inlet = ports[0];
         const outlet = ports[1];
@@ -194,19 +210,24 @@ export function buildDuctFittingGeometry(node, ctx, shading = 'rendered', textur
         if (stubB)
             group.add(stubB);
     }
-    else if (node.fittingType === 'transition') {
-        // Square-to-round: rect stub on the inlet, lofted gore body through
-        // the junction, round stub on the outlet. Same inline layout as the
-        // reducer, with the taper replaced by the loft.
-        const radiusOut = (node.diameter2 * INCHES_TO_METERS) / 2;
+    else if (node.fittingType === 'transition' || node.fittingType === 'reducer') {
         const inlet = ports[0];
         const outlet = ports[1];
-        const taperHalf = Math.abs(inlet.position.x) / 3;
-        const stubA = buildRectSection(inlet.position, new Vector3(-taperHalf, 0, 0), widthM, heightM, material, 'fitting-stub-inlet');
+        const taperHalf = Math.abs(inlet.position.x) * 0.7;
+        const inletShape = adapterShape(node);
+        const outletShape = adapterShape(node, true);
+        const w1 = inletShape === 'round' ? node.diameter * INCHES_TO_METERS : widthM;
+        const h1 = inletShape === 'round' ? w1 : heightM;
+        const w2 = (outletShape === 'round' ? node.diameter2 : node.width2) * INCHES_TO_METERS;
+        const h2 = outletShape === 'round' ? w2 : node.height2 * INCHES_TO_METERS;
+        const stub = (a, b, shape, w, h, name) => shape === 'round'
+            ? buildSection(a, b, w / 2, material, name)
+            : (shape === 'oval' ? buildOvalSection : buildRectSection)(a, b, w, h, material, name);
+        const stubA = stub(inlet.position, new Vector3(-taperHalf, 0, 0), inletShape, w1, h1, 'fitting-stub-inlet');
+        const stubB = stub(new Vector3(taperHalf, 0, 0), outlet.position, outletShape, w2, h2, 'fitting-stub-outlet');
         if (stubA)
             group.add(stubA);
-        group.add(buildRectToRoundLoft(-taperHalf, taperHalf, widthM, heightM, radiusOut, material));
-        const stubB = buildSection(new Vector3(taperHalf, 0, 0), outlet.position, radiusOut, material, 'fitting-stub-outlet');
+        group.add(buildProfileLoft(-taperHalf, taperHalf, w1, h1, material, inletShape, outletShape, w2, h2));
         if (stubB)
             group.add(stubB);
     }
@@ -279,21 +300,10 @@ export function buildDuctFittingGeometry(node, ctx, shading = 'rendered', textur
         junction.name = 'fitting-junction';
         group.add(junction);
     }
-    // Joint trim at each opening. Round legs get a crimp-collar torus just
-    // proud of the stub; rect legs get a drive-cleat flange — the thin
-    // raised rim (TDC/S-cleat) real sheet-metal trunk joints wear where a
-    // section meets a fitting. The plate is centered on the collar plane so
-    // the rim reads as the seam between fitting and duct. Run legs
-    // (inlet/outlet) are rect when `shape` is rect; a rect tee's branch is
-    // rect when `shape2` is rect. Reducers ignore shape.
-    // Which profile a leg's opening carries: a transition's inlet is its
-    // rect end regardless of `shape`; reducers are always round; otherwise
-    // the run legs follow `shape` and a tee's branch follows `shape2`
-    // (only meaningful when the run itself is non-round).
     const legShape = (portId) => {
-        if (node.fittingType === 'transition')
-            return portId === 'inlet' ? 'rect' : 'round';
-        if (node.fittingType === 'reducer' || node.shape === 'round')
+        if (node.fittingType === 'transition' || node.fittingType === 'reducer')
+            return adapterShape(node, portId === 'outlet');
+        if (node.shape === 'round')
             return 'round';
         return portId === 'branch' || portId === 'branch2' ? node.shape2 : node.shape;
     };
@@ -302,6 +312,10 @@ export function buildDuctFittingGeometry(node, ctx, shading = 'rendered', textur
     // fold hinge lies horizontal (riser elbows) — same choice as the
     // mitered solid above.
     const rectLegProfile = (portId) => {
+        if (node.fittingType === 'transition' || node.fittingType === 'reducer')
+            return portId === 'outlet'
+                ? [node.width2 * INCHES_TO_METERS, node.height2 * INCHES_TO_METERS]
+                : [widthM, heightM];
         if (portId === 'branch' || portId === 'branch2') {
             const width2M = node.width2 * INCHES_TO_METERS;
             const height2M = node.height2 * INCHES_TO_METERS;

package/dist/duct-fitting/parametrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parametrics.d.ts","sourceRoot":"","sources":["../../src/duct-fitting/parametrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,oBAAoB,EAE1B,MAAM,kBAAkB,CAAA;AASzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAkF/C,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,CAAC,eAAe,CAoQxE,CAAA"}
+{"version":3,"file":"parametrics.d.ts","sourceRoot":"","sources":["../../src/duct-fitting/parametrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,oBAAoB,EAE1B,MAAM,kBAAkB,CAAA;AASzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAkF/C,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,CAAC,eAAe,CAqUxE,CAAA"}