@pascal-app/nodes 1.0.7 → 1.1.0

package/dist/column/renderer.js

@@ -2,10 +2,12 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { COLUMN_BASE_DEFAULT, COLUMN_CAPITAL_DEFAULT, COLUMN_FRAME_DEFAULT, COLUMN_SHAFT_DEFAULT, collectDescendants, createSceneApi, useLiveNodeOverrides, useLiveTransforms, useRegistry, useScene, } from '@pascal-app/core';
 import { baseMaterial, createColumnBoxGeometry, createColumnCylinderGeometry, createColumnSphereGeometry, createColumnTorusGeometry, createMaterial, createMaterialFromPresetRef, createSurfaceRoleMaterial, NodeRenderer, resolveMaterialRef, resolveSlotDefaultMaterial, useNodeEvents, useViewer, } from '@pascal-app/viewer';
-import { createContext, useContext, useEffect, useMemo, useRef } from 'react';
+import { createContext, memo, useContext, useEffect, useMemo, useRef } from 'react';
 import { BufferGeometry, Float32BufferAttribute } from 'three';
 import { ScriptedOpeningModel } from '../shared/scripted-opening.js';
-import { columnCapitalBlocks, columnShaftLayout, getSegments, getShaftScaleAt, getShaftSegmentCount, getShaftTwistRadians, } from './shape.js';
+import { createColumnBandGeometry, createColumnPanelGeometry, createColumnShaftGeometry, createColumnSpiralGeometry, } from './geometry.js';
+import { ColumnInspectorOverlay } from './inspector-highlight.js';
+import { columnCapitalBlocks, columnShaftLayout, getSegments } from './shape.js';
 const DEFAULT_COLUMN_MATERIAL = baseMaterial();
 const DEFAULT_COLUMN_SLOT_MATERIALS = createSingleColumnMaterialMap(DEFAULT_COLUMN_MATERIAL);
 const ColumnMaterialContext = createContext(DEFAULT_COLUMN_SLOT_MATERIALS);
@@ -38,7 +40,7 @@ function createLegacyColumnMaterial({ material, materialPreset, shading, texture
         return createMaterial(material, shading);
     return baseMaterial(shading);
 }
-function resolveColumnSlotMaterial({ colorPreset, legacyMaterial, node, sceneMaterials, shading, slotId, textures, }) {
+export function resolveColumnSlotMaterial({ colorPreset, legacyMaterial, node, sceneMaterials, shading, slotId, textures, }) {
     if (!textures)
         return createSurfaceRoleMaterial('wall', colorPreset);
     const slotRef = node.slots?.[slotId];
@@ -113,6 +115,7 @@ function MappedBox({ depth, height, position, rotation, softenEdges = true, widt
             return null;
         return createColumnBoxGeometry(width, height, depth, bevelRadius);
     }, [bevelRadius, depth, height, width]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
     if (!geometry)
         return null;
     return (_jsxs("mesh", { castShadow: true, dispose: null, position: position, receiveShadow: true, rotation: rotation, userData: { slotId }, children: [_jsx("primitive", { attach: "geometry", dispose: null, object: geometry }), _jsx(ColumnMaterial, {})] }));
@@ -197,14 +200,15 @@ function FlatEndedBeam({ depth, end, start, width, }) {
         geometry.computeVertexNormals();
         return geometry;
     }, [depth, length, start, end, width]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
     if (!geometry)
         return null;
     return (_jsxs("mesh", { castShadow: true, dispose: null, receiveShadow: true, userData: { slotId }, children: [_jsx("primitive", { attach: "geometry", dispose: null, object: geometry }), _jsx(ColumnMaterial, {})] }));
 }
 function AFrameSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const bottomSpread = Math.max(0.2, node.braceBottomSpread ?? Math.max(node.width * 3, 1.2));
     const topSpread = clamp(node.braceTopSpread ?? 0.12, 0, bottomSpread);
     const bottomY = 0;
@@ -222,8 +226,8 @@ function AFrameSupport({ node }) {
 }
 function YFrameSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const topSpread = Math.max(0.2, node.braceTopSpread ?? 0.9);
     const splitY = height * 0.56;
     const foot = [0, 0, 0];
@@ -239,8 +243,8 @@ function YFrameSupport({ node }) {
 }
 function VFrameSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const topSpread = Math.max(0.2, node.braceTopSpread ?? 1);
     const foot = [0, 0, 0];
     const leftTop = [-topSpread / 2, height, 0];
@@ -254,8 +258,8 @@ function VFrameSupport({ node }) {
 }
 function XBraceSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const bottomSpread = Math.max(0.2, node.braceBottomSpread ?? 1);
     const topSpread = Math.max(0.2, node.braceTopSpread ?? 1);
     const leftBottom = [-bottomSpread / 2, 0, 0];
@@ -271,8 +275,8 @@ function XBraceSupport({ node }) {
 }
 function KBraceSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const spread = Math.max(0.2, Math.max(node.braceBottomSpread ?? 1, node.braceTopSpread ?? 1));
     const leftBottom = [-spread / 2, 0, 0];
     const leftTop = [-spread / 2, height, 0];
@@ -286,8 +290,8 @@ function KBraceSupport({ node }) {
 }
 function SingleStrutSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const spread = Math.max(0.2, Math.max(node.braceBottomSpread ?? 1, node.braceTopSpread ?? 1));
     const bottom = [-spread / 2, 0, 0];
     const top = [spread / 2, height, 0];
@@ -298,8 +302,8 @@ function SingleStrutSupport({ node }) {
 }
 function TripodSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const width = Math.max(0.2, node.braceBottomSpread ?? 1.1);
     const depth = Math.max(0.2, node.braceTopSpread ?? 1.1);
     const top = [0, height, 0];
@@ -315,8 +319,8 @@ function TripodSupport({ node }) {
 }
 function TrestleSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const width = Math.max(0.2, node.braceBottomSpread ?? 1.2);
     const depth = Math.max(0.2, node.braceTopSpread ?? 1);
     const zPositions = [-depth / 2, depth / 2];
@@ -337,8 +341,8 @@ function TrestleSupport({ node }) {
 }
 function PortalFrameSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const width = Math.max(0.2, node.braceBottomSpread ?? 1.4);
     const leftBottom = [-width / 2, 0, 0];
     const rightBottom = [width / 2, 0, 0];
@@ -351,8 +355,8 @@ function PortalFrameSupport({ node }) {
 }
 function BoxFrameSupport({ node }) {
     const height = Math.max(0.2, node.height);
-    const braceWidth = clamp(node.braceWidth ?? node.width, 0.04, 1.6);
-    const braceDepth = clamp(node.braceDepth ?? node.depth, 0.04, 1.6);
+    const braceWidth = Math.max(0.04, node.braceWidth ?? node.width);
+    const braceDepth = Math.max(0.04, node.braceDepth ?? node.depth);
     const width = Math.max(0.2, node.braceBottomSpread ?? 1.4);
     const depth = Math.max(0.2, node.braceTopSpread ?? 1);
     const corners = [
@@ -381,6 +385,7 @@ function MappedCylinder({ height, position, radius, radiusBottom = radius, radiu
             segments,
         });
     }, [height, radius, radiusBottom, radiusTop, radiusX, radiusZ, segments]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
     if (!geometry)
         return null;
     return (_jsxs("mesh", { castShadow: true, dispose: null, position: position, receiveShadow: true, rotation: rotation, userData: { slotId }, children: [_jsx("primitive", { attach: "geometry", dispose: null, object: geometry }), _jsx(ColumnMaterial, {})] }));
@@ -399,6 +404,7 @@ function MappedCone({ height, position, radiusX, radiusZ = radiusX, rotation, se
             segments,
         });
     }, [height, radiusX, radiusZ, segments]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
     if (!geometry)
         return null;
     return (_jsxs("mesh", { castShadow: true, dispose: null, position: position, receiveShadow: true, rotation: rotation, userData: { slotId }, children: [_jsx("primitive", { attach: "geometry", dispose: null, object: geometry }), _jsx(ColumnMaterial, {})] }));
@@ -410,6 +416,7 @@ function MappedSphere({ position, radius, segments = 10, verticalSegments = 8, }
             return null;
         return createColumnSphereGeometry(radius, segments, verticalSegments);
     }, [radius, segments, verticalSegments]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
     if (!geometry)
         return null;
     return (_jsxs("mesh", { castShadow: true, dispose: null, position: position, receiveShadow: true, userData: { slotId }, children: [_jsx("primitive", { attach: "geometry", dispose: null, object: geometry }), _jsx(ColumnMaterial, {})] }));
@@ -428,6 +435,7 @@ function MappedTorus({ arc, position, ringRadius, rotation, scaleX, scaleY, scal
             tubeRadius,
         });
     }, [arc, ringRadius, scaleX, scaleY, scaleZ, tubeRadius]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
     if (!geometry)
         return null;
     return (_jsxs("mesh", { castShadow: true, dispose: null, position: position, receiveShadow: true, rotation: rotation, userData: { slotId }, children: [_jsx("primitive", { attach: "geometry", dispose: null, object: geometry }), _jsx(ColumnMaterial, {})] }));
@@ -435,29 +443,48 @@ function MappedTorus({ arc, position, ringRadius, rotation, scaleX, scaleY, scal
 function SquareBlock({ y, height, width, depth, softenEdges = true, }) {
     return (_jsx(MappedBox, { depth: depth, height: height, position: [0, y + height / 2, 0], softenEdges: softenEdges, width: width }));
 }
-function RoundBlock({ x = 0, y, z = 0, height, radius, segments = 32, }) {
-    return (_jsx(MappedCylinder, { height: height, position: [x, y + height / 2, z], radius: radius, segments: segments }));
-}
-function RoundedRectangleShaftSegment({ y, height, width, depth, cornerRadius, }) {
-    if (height <= 0)
-        return null;
-    const radius = Math.min(Math.max(0, cornerRadius), Math.min(width, depth) * 0.45);
-    if (radius <= 0.001) {
-        return _jsx(SquareBlock, { depth: depth, height: height, width: width, y: y });
-    }
-    const innerWidth = Math.max(0, width - radius * 2);
-    const innerDepth = Math.max(0, depth - radius * 2);
-    const cornerX = width / 2 - radius;
-    const cornerZ = depth / 2 - radius;
-    return (_jsxs("group", { children: [innerWidth > 0 && (_jsx(SquareBlock, { depth: depth, height: height, softenEdges: false, width: innerWidth, y: y })), innerDepth > 0 && (_jsx(SquareBlock, { depth: innerDepth, height: height, softenEdges: false, width: width, y: y })), [
-                [cornerX, cornerZ],
-                [cornerX, -cornerZ],
-                [-cornerX, cornerZ],
-                [-cornerX, -cornerZ],
-            ].map(([x, z], index) => (_jsx(RoundBlock, { height: height, radius: radius, segments: 18, x: x, y: y, z: z }, index)))] }));
+function RoundBlock({ y, height, radius, radiusX = 1, radiusZ = 1, segments = 32, x = 0, z = 0, }) {
+    const edgeSoftness = useContext(ColumnEdgeSoftnessContext);
+    const slotId = useContext(ColumnSlotContext);
+    const geometry = useMemo(() => {
+        const geometry = createColumnShaftGeometry({
+            crossSection: segments === 8 ? 'octagonal' : segments === 16 ? 'sixteen-sided' : 'round',
+            radius,
+            width: radius * 2,
+            depth: radius * 2,
+            shaftProfile: 'straight',
+            shaftTaper: 0,
+            shaftBulge: 0,
+            shaftStartScale: 1,
+            shaftEndScale: 1,
+            shaftSegmentCount: 1,
+            shaftTwistStep: 0,
+            shaftCornerRadius: 0,
+            edgeSoftness: edgeSoftness / Math.max(1, radiusX, radiusZ),
+            fluteCount: 0,
+            fluteWidth: 0.02,
+            fluteDepth: 0,
+            shaftDetail: 'none',
+        }, height);
+        geometry.scale(radiusX, 1, radiusZ);
+        const uv = geometry.getAttribute('uv');
+        const circumferenceRatio = Math.sqrt((radiusX ** 2 + radiusZ ** 2) / 2);
+        const positions = geometry.getAttribute('position'), normals = geometry.getAttribute('normal');
+        for (let i = 0; i < uv.count; i++) {
+            if (Math.abs(normals.getY(i)) > 0.99)
+                uv.setXY(i, positions.getX(i), positions.getZ(i));
+            else
+                uv.setX(i, uv.getX(i) * circumferenceRatio);
+        }
+        geometry.setAttribute('uv2', uv.clone());
+        return geometry;
+    }, [radius, radiusX, radiusZ, segments, height, edgeSoftness]);
+    useEffect(() => () => geometry.dispose(), [geometry]);
+    return (_jsxs("mesh", { castShadow: true, receiveShadow: true, dispose: null, position: [x, y, z], userData: { slotId }, children: [_jsx("primitive", { attach: "geometry", object: geometry, dispose: null }), _jsx(ColumnMaterial, {})] }));
 }
 function OvalBlock({ y, height, width, depth, segments = 32, }) {
-    return (_jsx(MappedCylinder, { height: height, position: [0, y + height / 2, 0], radius: 1, radiusX: width / 2, radiusZ: depth / 2, segments: segments }));
+    const radius = Math.min(width, depth) / 2;
+    return (_jsx(RoundBlock, { y: y, height: height, radius: radius, radiusX: width / (radius * 2), radiusZ: depth / (radius * 2), segments: segments }));
 }
 function ColumnBlock({ node, y, height, scale = 1, }) {
     if (height <= 0)
@@ -470,23 +497,50 @@ function ColumnBlock({ node, y, height, scale = 1, }) {
     }
     return _jsx(RoundBlock, { height: height, radius: radius, segments: getSegments(node), y: y });
 }
-function TaperedRoundShaft({ node, y, height }) {
-    const segmentCount = getShaftSegmentCount(node);
-    const segmentHeight = height / segmentCount;
-    return (_jsx("group", { children: Array.from({ length: segmentCount }, (_, index) => {
-            const t = (index + 0.5) / segmentCount;
-            const profileScale = getShaftScaleAt(node, t);
-            return (_jsx("group", { rotation: [0, getShaftTwistRadians(node, index), 0], children: _jsx(RoundBlock, { height: segmentHeight * 1.015, radius: node.radius * profileScale, segments: getSegments(node), y: y + index * segmentHeight }) }, index));
-        }) }));
-}
-function TaperedSquareShaft({ node, y, height }) {
-    const segmentCount = getShaftSegmentCount(node);
-    const segmentHeight = height / segmentCount;
-    return (_jsx("group", { children: Array.from({ length: segmentCount }, (_, index) => {
-            const t = (index + 0.5) / segmentCount;
-            const profileScale = getShaftScaleAt(node, t);
-            return (_jsx("group", { rotation: [0, getShaftTwistRadians(node, index), 0], children: _jsx(RoundedRectangleShaftSegment, { cornerRadius: (node.shaftCornerRadius ?? 0.035) * profileScale, depth: node.depth * profileScale, height: segmentHeight * 1.015, width: node.width * profileScale, y: y + index * segmentHeight }) }, index));
-        }) }));
+function MergedShaft({ node, y, height }) {
+    const { crossSection, radius, width, depth, shaftProfile, shaftTaper, shaftBulge, shaftStartScale, shaftEndScale, shaftSegmentCount, shaftTwistStep, shaftCornerRadius, edgeSoftness, fluteCount, fluteWidth, fluteDepth, shaftDetail, } = node;
+    const geometry = useMemo(() => createColumnShaftGeometry({
+        crossSection,
+        radius,
+        width,
+        depth,
+        shaftProfile,
+        shaftTaper,
+        shaftBulge,
+        shaftStartScale,
+        shaftEndScale,
+        shaftSegmentCount,
+        shaftTwistStep,
+        shaftCornerRadius,
+        edgeSoftness,
+        fluteCount,
+        fluteWidth,
+        fluteDepth,
+        shaftDetail,
+    }, height), [
+        height,
+        crossSection,
+        radius,
+        width,
+        depth,
+        shaftProfile,
+        shaftTaper,
+        shaftBulge,
+        shaftStartScale,
+        shaftEndScale,
+        shaftSegmentCount,
+        shaftTwistStep,
+        shaftCornerRadius,
+        edgeSoftness,
+        fluteCount,
+        fluteWidth,
+        fluteDepth,
+        shaftDetail,
+    ]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
+    if (!geometry)
+        return null;
+    return (_jsxs("mesh", { castShadow: true, receiveShadow: true, dispose: null, position: [0, y, 0], userData: { slotId: 'shaft' }, children: [_jsx("primitive", { attach: "geometry", object: geometry, dispose: null }), _jsx(ColumnMaterial, {})] }));
 }
 function Shaft({ node, y, height }) {
     if (height <= 0)
@@ -501,12 +555,7 @@ function Shaft({ node, y, height }) {
                     [0, -offset],
                 ].map(([x, z], index) => (_jsx(RoundBlock, { height: height, radius: sideRadius, segments: 16, x: x, y: y, z: z }, `${x}-${z}-${index}`)))] }));
     }
-    if (node.crossSection === 'round' ||
-        node.crossSection === 'octagonal' ||
-        node.crossSection === 'sixteen-sided') {
-        return _jsx(TaperedRoundShaft, { height: height, node: node, y: y });
-    }
-    return _jsx(TaperedSquareShaft, { height: height, node: node, y: y });
+    return _jsx(MergedShaft, { height: height, node: node, y: y });
 }
 function Base({ node, height }) {
     if (height <= 0)
@@ -530,7 +579,7 @@ function Base({ node, height }) {
                 const t = index / Math.max(1, tierCount - 1);
                 const widthScaleAt = Math.max(0.5, widthScale - t * stepSpread);
                 const depthScaleAt = Math.max(0.5, depthScale - t * stepSpread);
-                return (_jsx(SquareBlock, { depth: node.depth * depthScaleAt, height: tierHeight * 1.01, width: node.width * widthScaleAt, y: index * tierHeight }, index));
+                return (_jsx(SquareBlock, { depth: node.depth * depthScaleAt, height: tierHeight, width: node.width * widthScaleAt, y: index * tierHeight }, index));
             }) }));
     }
     if (baseStyle === 'round-rings') {
@@ -556,7 +605,7 @@ function Base({ node, height }) {
                             height * 0.58,
                             Math.sin(angle) * baseRadius * 0.86,
                         ], radius: ribRadius, rotation: [0, -angle, 0], segments: 6 }, index));
-                }), _jsx(RoundBlock, { height: height * 0.16, radius: baseRadius * 0.72, segments: 32, y: height * 0.82 })] }));
+                }), _jsx(RoundBlock, { height: height * 0.18, radius: baseRadius * 0.72, segments: 32, y: height * 0.82 })] }));
     }
     if (baseStyle === 'panelled-pedestal') {
         const inset = node.basePanelInset ?? 0.02;
@@ -583,140 +632,66 @@ function BaseCarvings({ node, height }) {
             return (_jsx(MappedCone, { height: height * 0.28, position: [Math.cos(angle) * radius, y, Math.sin(angle) * radius], radiusX: 0.014, radiusZ: 0.01, rotation: [0.36, -angle, 0], segments: 5 }, index));
         }) }));
 }
-function Rings({ node, shaftY, shaftHeight, }) {
-    if (node.ringCount <= 0 || shaftHeight <= 0)
-        return null;
-    const ringPlacement = node.ringPlacement ?? 'ends';
-    const ringSpread = Math.min(0.45, Math.max(0.04, node.ringSpread ?? 0.16));
-    const ringHeight = Math.min(node.ringThickness ?? 0.055, shaftHeight / Math.max(8, node.ringCount * 3));
-    const rings = Array.from({ length: node.ringCount }, (_, index) => {
-        const pairIndex = Math.floor(index / 2);
-        const nearTop = index % 2 === 1;
-        const pairCount = Math.ceil(node.ringCount / 2);
-        const pairT = pairCount <= 1 ? 0 : pairIndex / (pairCount - 1);
-        const offset = Math.min(0.48, 0.06 + pairT * Math.max(0, ringSpread - 0.06));
-        const oneSideT = 0.06 + (index / Math.max(1, node.ringCount - 1)) * Math.max(0, ringSpread - 0.06);
-        const t = ringPlacement === 'even'
-            ? (index + 1) / (node.ringCount + 1)
-            : ringPlacement === 'top'
-                ? 1 - Math.min(0.48, oneSideT)
-                : ringPlacement === 'bottom'
-                    ? Math.min(0.48, oneSideT)
-                    : nearTop
-                        ? 1 - offset
-                        : offset;
-        return {
-            scale: Math.min(1.4, getShaftScaleAt(node, t) + 0.12),
-            y: shaftY + shaftHeight * t - ringHeight / 2,
-        };
-    }).sort((a, b) => a.y - b.y);
-    return (_jsx("group", { children: rings.map((ring, index) => (_jsx(ColumnBlock, { height: ringHeight, node: node, scale: ring.scale, y: ring.y }, index))) }));
-}
-function LatheBands({ node, shaftY, shaftHeight, }) {
-    const latheRingCount = Math.max(node.latheRingCount ?? 0, node.shaftDetail === 'lathe-turned' ? 8 : 0);
-    if (latheRingCount <= 0 || shaftHeight <= 0)
-        return null;
-    const placement = node.latheRingSpacing ?? 'ends';
-    const bandHeight = Math.min(0.04, shaftHeight / Math.max(12, latheRingCount * 3));
-    const bands = Array.from({ length: latheRingCount }, (_, index) => {
-        const pairIndex = Math.floor(index / 2);
-        const nearTop = index % 2 === 1;
-        const offset = Math.min(0.48, 0.1 + pairIndex * 0.04);
-        const t = placement === 'even'
-            ? (index + 1) / (latheRingCount + 1)
-            : placement === 'top'
-                ? 1 - Math.min(0.48, 0.08 + index * 0.04)
-                : placement === 'bottom'
-                    ? Math.min(0.48, 0.08 + index * 0.04)
-                    : nearTop
-                        ? 1 - offset
-                        : offset;
-        return shaftY + shaftHeight * t - bandHeight / 2;
-    }).sort((a, b) => a - b);
-    return (_jsx("group", { children: bands.map((y, index) => (_jsx(ColumnBlock, { height: bandHeight, node: node, scale: 0.82 + (index % 2) * 0.08, y: y }, index))) }));
-}
-function Flutes({ node, shaftY, shaftHeight, }) {
-    const fluteCount = Math.max(node.fluteCount, node.shaftDetail === 'fluted' ? 16 : 0);
-    if (fluteCount <= 0 || shaftHeight <= 0 || node.crossSection !== 'round')
+const detailFields = [
+    'crossSection',
+    'radius',
+    'width',
+    'depth',
+    'shaftProfile',
+    'shaftTaper',
+    'shaftBulge',
+    'shaftStartScale',
+    'shaftEndScale',
+    'shaftSegmentCount',
+    'shaftTwistStep',
+    'shaftCornerRadius',
+    'edgeSoftness',
+    'fluteCount',
+    'fluteWidth',
+    'fluteDepth',
+    'shaftDetail',
+    'spiralRibCount',
+    'spiralTwist',
+    'panelCount',
+    'style',
+    'panelShape',
+    'panelInsetDepth',
+    'ringCount',
+    'ringSpread',
+    'ringThickness',
+    'ringPlacement',
+    'latheRingCount',
+    'latheRingSpacing',
+    'lowerBandEnabled',
+    'lowerBandHeight',
+    'lowerBandCarvingLevel',
+    'carvingPlacement',
+];
+const ShaftDetails = memo(function ShaftDetails(props) {
+    return (_jsxs(_Fragment, { children: [_jsx(ShaftBands, { ...props }), _jsx(DravidianShaftPanels, { ...props }), _jsx(SpiralRibs, { ...props })] }));
+}, (a, b) => a.shaftHeight === b.shaftHeight &&
+    a.shaftY === b.shaftY &&
+    detailFields.every((key) => a.node[key] === b.node[key]));
+function ShaftBands({ node, shaftY, shaftHeight, }) {
+    const geometry = useMemo(() => createColumnBandGeometry(node, shaftHeight), [node, shaftHeight]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
+    if (!geometry)
         return null;
-    const fluteDepth = node.fluteDepth ?? 0.02;
-    const fluteWidth = node.fluteWidth ?? fluteDepth;
-    const fluteRadius = Math.max(0.006, fluteWidth * 0.42);
-    const shaftRadius = node.radius * 0.74;
-    return (_jsx("group", { children: Array.from({ length: fluteCount }, (_, index) => {
-            const angle = (index / fluteCount) * Math.PI * 2;
-            const x = Math.cos(angle) * shaftRadius;
-            const z = Math.sin(angle) * shaftRadius;
-            return (_jsx(MappedCylinder, { height: shaftHeight * 0.92, position: [x, shaftY + shaftHeight / 2, z], radius: fluteRadius, segments: 8 }, index));
-        }) }));
-}
-function DravidianPanelFace({ position, rotation = 0, panelHeight, panelWidth, rail, reliefDepth, panelShape, }) {
-    return (_jsxs("group", { position: position, rotation: [0, rotation, 0], children: [_jsx(MappedBox, { depth: reliefDepth, height: rail, position: [0, panelHeight / 2, 0], softenEdges: false, width: panelWidth }), _jsx(MappedBox, { depth: reliefDepth, height: rail, position: [0, -panelHeight / 2, 0], softenEdges: false, width: panelWidth }), _jsx(MappedBox, { depth: reliefDepth, height: panelHeight, position: [panelWidth / 2, 0, 0], softenEdges: false, width: rail }), _jsx(MappedBox, { depth: reliefDepth, height: panelHeight, position: [-panelWidth / 2, 0, 0], softenEdges: false, width: rail }), panelShape === 'diamond' && (_jsx(MappedBox, { depth: reliefDepth, height: panelHeight * 0.42, position: [0, 0, 0], rotation: [0, 0, Math.PI / 4], softenEdges: false, width: rail * 1.2 })), panelShape === 'arched' && (_jsx(MappedTorus, { arc: Math.PI, position: [0, panelHeight * 0.28, 0], ringRadius: panelWidth * 0.42, scaleX: panelWidth * 0.42, scaleY: rail, scaleZ: reliefDepth, tubeRadius: Math.max(rail, reliefDepth) * 0.18 }))] }));
+    return (_jsxs("mesh", { castShadow: true, receiveShadow: true, dispose: null, position: [0, shaftY, 0], userData: { slotId: 'shaft' }, children: [_jsx("primitive", { attach: "geometry", object: geometry, dispose: null }), _jsx(ColumnMaterial, {})] }));
 }
 function DravidianShaftPanels({ node, shaftY, shaftHeight, }) {
-    const panelCount = Math.max(node.panelCount ?? 0, node.style === 'dravidian-carved' || node.shaftDetail === 'panelled' ? 3 : 0);
-    if (panelCount <= 0 || shaftHeight <= 0)
+    const geometry = useMemo(() => createColumnPanelGeometry(node, shaftHeight), [node, shaftHeight]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
+    if (!geometry)
         return null;
-    const shaftWidth = node.width * 0.72;
-    const shaftDepth = node.depth * 0.72;
-    const panelHeight = Math.min(0.42, shaftHeight / Math.max(4, panelCount + 2));
-    const panelWidth = node.width * 0.26;
-    const rail = Math.max(0.012, node.width * 0.028);
-    const reliefDepth = Math.max(0.012, node.panelInsetDepth ?? node.width * 0.025);
-    const rows = Array.from({ length: panelCount }, (_, index) => (index + 1) / (panelCount + 1));
-    const panelShape = node.panelShape ?? 'rectangle';
-    const faceProps = { panelHeight, panelWidth, rail, reliefDepth, panelShape };
-    return (_jsx("group", { children: rows.map((t, rowIndex) => {
-            const y = shaftY + shaftHeight * t;
-            return (_jsxs("group", { children: [_jsx(DravidianPanelFace, { position: [0, y, shaftDepth / 2 + reliefDepth / 2], ...faceProps }), _jsx(DravidianPanelFace, { position: [0, y, -shaftDepth / 2 - reliefDepth / 2], ...faceProps }), _jsx(DravidianPanelFace, { position: [shaftWidth / 2 + reliefDepth / 2, y, 0], rotation: Math.PI / 2, ...faceProps }), _jsx(DravidianPanelFace, { position: [-shaftWidth / 2 - reliefDepth / 2, y, 0], rotation: Math.PI / 2, ...faceProps })] }, rowIndex));
-        }) }));
+    return (_jsxs("mesh", { castShadow: true, receiveShadow: true, dispose: null, position: [0, shaftY, 0], userData: { slotId: 'shaft' }, children: [_jsx("primitive", { attach: "geometry", object: geometry, dispose: null }), _jsx(ColumnMaterial, {})] }));
 }
 function SpiralRibs({ node, shaftY, shaftHeight, }) {
-    const spiralRibCount = node.spiralRibCount ?? 0;
-    const spiralTwist = node.spiralTwist ?? 0;
-    const shaftTaper = node.shaftTaper ?? 0;
-    const ribCountSetting = Math.max(spiralRibCount, node.shaftDetail === 'spiral' ? 12 : 0);
-    if (ribCountSetting <= 0 || spiralTwist === 0 || shaftHeight <= 0)
-        return null;
-    const ribCount = Math.min(ribCountSetting, 24);
-    const stepCount = 28;
-    const ribDistance = node.radius * 0.78;
-    const ribWidth = Math.max(0.012, node.radius * 0.06);
-    const segmentHeight = (shaftHeight / stepCount) * 1.18;
-    const lean = spiralTwist > 0 ? -0.55 : 0.55;
-    return (_jsx("group", { children: Array.from({ length: ribCount * stepCount }, (_, index) => {
-            const ribIndex = index % ribCount;
-            const stepIndex = Math.floor(index / ribCount);
-            const t = (stepIndex + 0.5) / stepCount;
-            const angle = (ribIndex / ribCount) * Math.PI * 2 + t * spiralTwist * Math.PI * 2;
-            const taperScale = 1 - Math.min(shaftTaper, 0.85) * t;
-            return (_jsx(MappedCylinder, { height: segmentHeight, position: [
-                    Math.cos(angle) * ribDistance * taperScale,
-                    shaftY + shaftHeight * t,
-                    Math.sin(angle) * ribDistance * taperScale,
-                ], radius: ribWidth, rotation: [0, -angle, lean], segments: 8 }, index));
-        }) }));
-}
-function LowerCarvedBand({ node, shaftY, shaftHeight, }) {
-    const placement = node.carvingPlacement ?? 'capital';
-    if (!node.lowerBandEnabled ||
-        shaftHeight <= 0 ||
-        (placement !== 'shaft' && placement !== 'all')) {
+    const geometry = useMemo(() => createColumnSpiralGeometry(node, shaftHeight), [node, shaftHeight]);
+    useEffect(() => () => geometry?.dispose(), [geometry]);
+    if (!geometry)
         return null;
-    }
-    const bandHeight = Math.min(node.lowerBandHeight ?? 0.24, shaftHeight * 0.35);
-    const y = shaftY + shaftHeight * 0.12;
-    const level = Math.max(1, node.lowerBandCarvingLevel ?? 1);
-    const count = Math.max(6, level * 6);
-    const distance = Math.max(node.radius * 0.82, Math.max(node.width, node.depth) * 0.36);
-    return (_jsxs("group", { children: [_jsx(ColumnBlock, { height: bandHeight, node: node, scale: 0.84, y: y }), Array.from({ length: count }, (_, index) => {
-                const angle = (index / count) * Math.PI * 2;
-                return (_jsx(MappedCylinder, { height: bandHeight * 0.62, position: [
-                        Math.cos(angle) * distance,
-                        y + bandHeight * 0.5,
-                        Math.sin(angle) * distance,
-                    ], radius: 0.012, rotation: [0, -angle, 0], segments: 5 }, index));
-            })] }));
+    return (_jsxs("mesh", { castShadow: true, receiveShadow: true, dispose: null, position: [0, shaftY, 0], userData: { slotId: 'shaft' }, children: [_jsx("primitive", { attach: "geometry", object: geometry, dispose: null }), _jsx(ColumnMaterial, {})] }));
 }
 function CapitalCarvings({ node, capitalY, capitalHeight, }) {
     const placement = node.carvingPlacement ?? 'capital';
@@ -849,7 +824,7 @@ function ColumnBody({ node }) {
         const support = node.supportStyle === 'a-frame' ? (_jsx(AFrameSupport, { node: node })) : node.supportStyle === 'y-frame' ? (_jsx(YFrameSupport, { node: node })) : node.supportStyle === 'v-frame' ? (_jsx(VFrameSupport, { node: node })) : node.supportStyle === 'x-brace' ? (_jsx(XBraceSupport, { node: node })) : node.supportStyle === 'k-brace' ? (_jsx(KBraceSupport, { node: node })) : node.supportStyle === 'single-strut' ? (_jsx(SingleStrutSupport, { node: node })) : node.supportStyle === 'tripod' ? (_jsx(TripodSupport, { node: node })) : node.supportStyle === 'trestle' ? (_jsx(TrestleSupport, { node: node })) : node.supportStyle === 'portal-frame' ? (_jsx(PortalFrameSupport, { node: node })) : (_jsx(BoxFrameSupport, { node: node }));
         return _jsx(ColumnSlot, { slotId: "frame", children: support });
     }
-    return (_jsxs(_Fragment, { children: [_jsxs(ColumnSlot, { slotId: "base", children: [_jsx(Base, { height: shaftLayout.baseHeight, node: node }), _jsx(BaseCarvings, { height: shaftLayout.baseHeight, node: node })] }), _jsxs(ColumnSlot, { slotId: "shaft", children: [_jsx(Shaft, { height: shaftLayout.shaftHeight, node: node, y: shaftLayout.shaftY }), _jsx(Rings, { node: node, shaftHeight: shaftLayout.shaftHeight, shaftY: shaftLayout.shaftY }), _jsx(LatheBands, { node: node, shaftHeight: shaftLayout.shaftHeight, shaftY: shaftLayout.shaftY }), _jsx(Flutes, { node: node, shaftHeight: shaftLayout.shaftHeight, shaftY: shaftLayout.shaftY }), _jsx(LowerCarvedBand, { node: node, shaftHeight: shaftLayout.shaftHeight, shaftY: shaftLayout.shaftY }), _jsx(DravidianShaftPanels, { node: node, shaftHeight: shaftLayout.shaftHeight, shaftY: shaftLayout.shaftY }), _jsx(SpiralRibs, { node: node, shaftHeight: shaftLayout.shaftHeight, shaftY: shaftLayout.shaftY })] }), _jsxs(ColumnSlot, { slotId: "capital", children: [_jsx(Capital, { height: shaftLayout.capitalHeight, node: node, y: shaftLayout.baseHeight + shaftLayout.shaftHeight }), _jsx(CapitalCarvings, { capitalHeight: shaftLayout.capitalHeight, capitalY: shaftLayout.baseHeight + shaftLayout.shaftHeight, node: node })] })] }));
+    return (_jsxs(_Fragment, { children: [_jsxs(ColumnSlot, { slotId: "base", children: [_jsx(Base, { height: shaftLayout.baseHeight, node: node }), _jsx(BaseCarvings, { height: shaftLayout.baseHeight, node: node })] }), _jsxs(ColumnSlot, { slotId: "shaft", children: [_jsx(Shaft, { height: shaftLayout.shaftHeight, node: node, y: shaftLayout.shaftY }), _jsx(ShaftDetails, { node: node, shaftHeight: shaftLayout.shaftHeight, shaftY: shaftLayout.shaftY })] }), _jsxs(ColumnSlot, { slotId: "capital", children: [_jsx(Capital, { height: shaftLayout.capitalHeight, node: node, y: shaftLayout.baseHeight + shaftLayout.shaftHeight }), _jsx(CapitalCarvings, { capitalHeight: shaftLayout.capitalHeight, capitalY: shaftLayout.baseHeight + shaftLayout.shaftHeight, node: node })] })] }));
 }
 /**
  * Translucent, non-interactive ghost of a column — the placement tool's
@@ -897,6 +872,7 @@ export const ColumnPreview = ({ node }) => {
 };
 export const ColumnRenderer = ({ node: rawNode }) => {
     const ref = useRef(null);
+    const bodyRef = useRef(null);
     // Merge any live drag override so width / depth / radius / height
     // arrows update the mesh on every pointer move, with zustand only
     // hearing the commit on release. Subscribes narrowly to this node's
@@ -935,6 +911,6 @@ export const ColumnRenderer = ({ node: rawNode }) => {
                 dirtySubtree();
         });
     }, [node]);
-    return (_jsx(ColumnMaterialContext.Provider, { value: materials, children: _jsx(ColumnEdgeSoftnessContext.Provider, { value: node.edgeSoftness ?? 0.025, children: _jsxs("group", { position: liveTransform?.position ?? node.position, ref: ref, rotation: [0, liveTransform?.rotation ?? node.rotation, 0], visible: node.visible, userData: modelData, ...handlers, children: [node.source ? _jsx(ScriptedOpeningModel, { node: node }) : _jsx(ColumnBody, { node: node }), node.children.map((id) => (_jsx(NodeRenderer, { nodeId: id }, id)))] }) }) }));
+    return (_jsx(ColumnMaterialContext.Provider, { value: materials, children: _jsxs(ColumnEdgeSoftnessContext.Provider, { value: node.edgeSoftness ?? 0.025, children: [_jsxs("group", { position: liveTransform?.position ?? node.position, ref: ref, rotation: [0, liveTransform?.rotation ?? node.rotation, 0], visible: node.visible, userData: modelData, ...handlers, children: [_jsx("group", { ref: bodyRef, name: "column-body", children: node.source ? _jsx(ScriptedOpeningModel, { node: node }) : _jsx(ColumnBody, { node: node }) }), node.children.map((id) => (_jsx(NodeRenderer, { nodeId: id }, id)))] }), _jsx(ColumnInspectorOverlay, { nodeId: node.id, body: bodyRef, node: node, position: liveTransform?.position ?? node.position, rotation: liveTransform?.rotation ?? node.rotation })] }) }));
 };
 export default ColumnRenderer;

package/dist/column/shape.d.ts

@@ -1,8 +1,8 @@
 import type { ColumnNode } from '@pascal-app/core';
-export declare function getSegments(node: ColumnNode): 8 | 16 | 32;
-export declare function getShaftSegmentCount(node: ColumnNode): number;
-export declare function getShaftTwistRadians(node: ColumnNode, index: number): number;
-export declare function getShaftScaleAt(node: ColumnNode, t: number): number;
+export declare function getSegments(node: Pick<ColumnNode, 'crossSection'>): 8 | 16 | 32;
+export declare function getShaftSegmentCount(node: Pick<ColumnNode, 'shaftProfile' | 'shaftTaper' | 'shaftTwistStep' | 'shaftSegmentCount'>): number;
+export declare function getShaftTwistRadians(node: Pick<ColumnNode, 'shaftTwistStep'>, index: number): number;
+export declare function getShaftScaleAt(node: Pick<ColumnNode, 'shaftProfile' | 'shaftTaper' | 'shaftStartScale' | 'shaftEndScale' | 'shaftBulge'>, t: number): number;
 export declare function columnShaftLayout(node: ColumnNode): {
     baseHeight: number;
     capitalHeight: number;

package/dist/column/shape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shape.d.ts","sourceRoot":"","sources":["../../src/column/shape.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,eAI3C;AAMD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,UAUpD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,UAEnE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,UA0B1D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU;;;;;EAMjD;AACD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAA;IACzC,CAAC,EAAE,MAAM,CAAA;IACT,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AACD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAyE/F"}
+{"version":3,"file":"shape.d.ts","sourceRoot":"","sources":["../../src/column/shape.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,eAIjE;AAMD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,YAAY,GAAG,gBAAgB,GAAG,mBAAmB,CAAC,UAW/F;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,UAE3F;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,CACR,UAAU,EACV,cAAc,GAAG,YAAY,GAAG,iBAAiB,GAAG,eAAe,GAAG,YAAY,CACnF,EACD,CAAC,EAAE,MAAM,UA2BV;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU;;;;;EAMjD;AACD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAA;IACzC,CAAC,EAAE,MAAM,CAAA;IACT,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AACD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAyE/F"}

package/dist/column/shape.js

@@ -87,7 +87,7 @@ export function columnCapitalBlocks(node, y, height) {
             return {
                 kind: 'box',
                 y: y + (index * height) / count,
-                height: (height / count) * 1.01,
+                height: height / count,
                 width: node.width * Math.max(0.5, widthScale - spread),
                 depth: node.depth * Math.max(0.5, depthScale - spread),
             };

package/dist/column/surface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"surface.d.ts","sourceRoot":"","sources":["../../src/column/surface.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,mBAAmB,EAExB,KAAK,eAAe,EAErB,MAAM,kBAAkB,CAAA;AAoBzB,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,mBAAmB,EAAE,CAuDzE;AAED,eAAO,MAAM,qBAAqB,EAAE,eAUnC,CAAA"}
+{"version":3,"file":"surface.d.ts","sourceRoot":"","sources":["../../src/column/surface.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,mBAAmB,EAExB,KAAK,eAAe,EAErB,MAAM,kBAAkB,CAAA;AAoBzB,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,mBAAmB,EAAE,CAyEzE;AAED,eAAO,MAAM,qBAAqB,EAAE,eAUnC,CAAA"}