parametrics: add custom field kind + restore fence Length / Curve
User noticed the auto-derived fence inspector was missing the legacy
panel's Length + Curve sliders, and the section labelling was wrong
(Posts → Structure). Both Length and Curve are awkward for the
parametrics field model:
- **Length** doesn't map to a single node key — it's derived from
`start`/`end`, and editing it moves `end` along the existing
direction.
- **Curve** maps to `curveOffset` but the slider's min/max are
bounded per-node by the chord length, plus updates need
`normalizeWallCurveOffset`.
Adds a `kind: 'custom'` field with a kind-supplied
`component: ComponentType<{ node, onUpdate }>`. The inspector mounts
it and lets the kind own rendering + update logic. `key` becomes a
free-form React key/label since it no longer needs to map to a node
property.
Fence parametrics now mirrors the legacy layout 1:1:
- Style (segmented controls + showInfill toggle).
- Dimensions (Length, Curve, Height, Thickness).
- Structure (Base Height, Top Rail, Post Spacing, Post Size, Ground
Clear, Edge Inset).
Length + Curve live in fence/inspector-editors.tsx.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.7
parent
80199dc890
commit
282cb22585
@@ -385,6 +385,17 @@ export type ParamField<N> =
|
|||||||
| { key: keyof N; kind: 'color'; visibleIf?: (n: N) => boolean }
|
| { key: keyof N; kind: 'color'; visibleIf?: (n: N) => boolean }
|
||||||
| { key: keyof N; kind: 'material'; visibleIf?: (n: N) => boolean }
|
| { key: keyof N; kind: 'material'; visibleIf?: (n: N) => boolean }
|
||||||
| { key: keyof N; kind: 'ref'; refKind: string; visibleIf?: (n: N) => boolean }
|
| { key: keyof N; kind: 'ref'; refKind: string; visibleIf?: (n: N) => boolean }
|
||||||
|
/** Escape hatch for fields that don't map to a single node key —
|
||||||
|
* derived values (`length` from `start`/`end`), sliders with
|
||||||
|
* dynamic min/max (curve sagitta bounded by chord length),
|
||||||
|
* composed editors, etc. The kind owns the rendering and the
|
||||||
|
* update logic. `key` here is just a stable React key/label. */
|
||||||
|
| {
|
||||||
|
key: string
|
||||||
|
kind: 'custom'
|
||||||
|
component: ComponentType<{ node: N; onUpdate: (patch: Partial<N>) => void }>
|
||||||
|
visibleIf?: (n: N) => boolean
|
||||||
|
}
|
||||||
|
|
||||||
export type Issue = { field?: string; msg: string; severity?: 'error' | 'warning' }
|
export type Issue = { field?: string; msg: string; severity?: 'error' | 'warning' }
|
||||||
|
|
||||||
|
|||||||
@@ -293,12 +293,35 @@ function FieldRenderer({ field, nodeId, onUpdate }: FieldRendererProps) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case 'custom':
|
||||||
|
// The field owns its rendering and update logic — used for
|
||||||
|
// derived values (length from start/end), dynamic-bounded
|
||||||
|
// sliders (curve sagitta), composed editors.
|
||||||
|
return <CustomFieldRenderer Comp={field.component} nodeId={nodeId} onUpdate={onUpdate} />
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// material / ref / unrecognized kinds — not implemented in v1.
|
// material / ref / unrecognized kinds — not implemented in v1.
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function CustomFieldRenderer({
|
||||||
|
Comp,
|
||||||
|
nodeId,
|
||||||
|
onUpdate,
|
||||||
|
}: {
|
||||||
|
Comp: ComponentType<{ node: AnyNode; onUpdate: (patch: Partial<AnyNode>) => void }>
|
||||||
|
nodeId: AnyNodeId
|
||||||
|
onUpdate: (patch: Partial<AnyNode>) => void
|
||||||
|
}) {
|
||||||
|
// Subscribe to the full node — the custom editor may read any
|
||||||
|
// field. Tools that don't want this churn should write narrower
|
||||||
|
// selectors inside Comp itself.
|
||||||
|
const node = useScene((s) => s.nodes[nodeId])
|
||||||
|
if (!node) return null
|
||||||
|
return <Comp node={node} onUpdate={onUpdate} />
|
||||||
|
}
|
||||||
|
|
||||||
// ─── helpers ─────────────────────────────────────────────────────────
|
// ─── helpers ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
function precisionForStep(step: number): number {
|
function precisionForStep(step: number): number {
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import {
|
||||||
|
type FenceNode,
|
||||||
|
getClampedWallCurveOffset,
|
||||||
|
getMaxWallCurveOffset,
|
||||||
|
getWallCurveLength,
|
||||||
|
normalizeWallCurveOffset,
|
||||||
|
} from '@pascal-app/core'
|
||||||
|
import { SliderControl } from '@pascal-app/editor'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Custom inspector editors for fence fields that don't map to a single
|
||||||
|
* node property in the canonical way:
|
||||||
|
*
|
||||||
|
* - **Length** is derived from `start`/`end`. Adjusting the slider
|
||||||
|
* moves `end` along the existing direction so the fence resizes from
|
||||||
|
* the start point. Matches the legacy `FencePanel`'s "Length" slider.
|
||||||
|
* - **Curve** is a slider on `curveOffset` with min/max bounded by the
|
||||||
|
* chord length (per-node), normalized via `normalizeWallCurveOffset`.
|
||||||
|
* Can't use a plain `number` field because the bounds change with
|
||||||
|
* the fence's shape.
|
||||||
|
*
|
||||||
|
* Both are wired through `parametrics.fields[].kind: 'custom'`.
|
||||||
|
*/
|
||||||
|
export function FenceLengthEditor({
|
||||||
|
node,
|
||||||
|
onUpdate,
|
||||||
|
}: {
|
||||||
|
node: FenceNode
|
||||||
|
onUpdate: (patch: Partial<FenceNode>) => void
|
||||||
|
}) {
|
||||||
|
const length = getWallCurveLength(node)
|
||||||
|
|
||||||
|
const handleChange = (newLength: number) => {
|
||||||
|
if (newLength <= 0) return
|
||||||
|
const dx = node.end[0] - node.start[0]
|
||||||
|
const dz = node.end[1] - node.start[1]
|
||||||
|
const currentLength = Math.sqrt(dx * dx + dz * dz)
|
||||||
|
if (currentLength === 0) return
|
||||||
|
const dirX = dx / currentLength
|
||||||
|
const dirZ = dz / currentLength
|
||||||
|
const newEnd: [number, number] = [
|
||||||
|
node.start[0] + dirX * newLength,
|
||||||
|
node.start[1] + dirZ * newLength,
|
||||||
|
]
|
||||||
|
onUpdate({ end: newEnd })
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SliderControl
|
||||||
|
label="Length"
|
||||||
|
max={50}
|
||||||
|
min={0.1}
|
||||||
|
onChange={handleChange}
|
||||||
|
precision={2}
|
||||||
|
step={0.01}
|
||||||
|
unit="m"
|
||||||
|
value={length}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FenceCurveEditor({
|
||||||
|
node,
|
||||||
|
onUpdate,
|
||||||
|
}: {
|
||||||
|
node: FenceNode
|
||||||
|
onUpdate: (patch: Partial<FenceNode>) => void
|
||||||
|
}) {
|
||||||
|
const curveOffset = getClampedWallCurveOffset(node)
|
||||||
|
const maxCurveOffset = getMaxWallCurveOffset(node)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SliderControl
|
||||||
|
label="Curve"
|
||||||
|
max={Math.max(0.01, maxCurveOffset)}
|
||||||
|
min={-Math.max(0.01, maxCurveOffset)}
|
||||||
|
onChange={(value) => onUpdate({ curveOffset: normalizeWallCurveOffset(node, value) })}
|
||||||
|
precision={2}
|
||||||
|
step={0.1}
|
||||||
|
unit="m"
|
||||||
|
value={Math.round(curveOffset * 100) / 100}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,34 +1,21 @@
|
|||||||
import type { ParametricDescriptor } from '@pascal-app/core'
|
import type { ParametricDescriptor } from '@pascal-app/core'
|
||||||
|
import { FenceCurveEditor, FenceLengthEditor } from './inspector-editors'
|
||||||
import type { FenceNode } from './schema'
|
import type { FenceNode } from './schema'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Inspector descriptor for fence.
|
* Inspector descriptor for fence. Mirrors the legacy `FencePanel`
|
||||||
|
* layout 1:1:
|
||||||
|
* - **Style** (segmented controls): style, baseStyle, showInfill toggle.
|
||||||
|
* - **Dimensions**: Length (derived from start/end), Curve (sagitta
|
||||||
|
* with dynamic bounds), Height, Thickness.
|
||||||
|
* - **Structure**: Base Height, Top Rail, Post Spacing, Post Size,
|
||||||
|
* Ground Clear, Edge Inset.
|
||||||
*
|
*
|
||||||
* Mirrors the legacy `fence-panel.tsx` controls but rendered by the
|
* Length + Curve use the `custom` field kind because they don't map
|
||||||
* generic `<ParametricInspector>`. Endpoints (`start` / `end`) and
|
* to single number fields with static bounds — see `inspector-editors.tsx`.
|
||||||
* `curveOffset` are edited via floor-plan affordances and 3D handles,
|
|
||||||
* not number inputs — kept out of parametrics.
|
|
||||||
*/
|
*/
|
||||||
export const fenceParametrics: ParametricDescriptor<FenceNode> = {
|
export const fenceParametrics: ParametricDescriptor<FenceNode> = {
|
||||||
groups: [
|
groups: [
|
||||||
{
|
|
||||||
label: 'Dimensions',
|
|
||||||
fields: [
|
|
||||||
{ key: 'height', kind: 'number', unit: 'm', min: 0.4, max: 3.5, step: 0.05 },
|
|
||||||
{ key: 'thickness', kind: 'number', unit: 'm', min: 0.02, max: 0.3, step: 0.005 },
|
|
||||||
{ key: 'baseHeight', kind: 'number', unit: 'm', min: 0, max: 0.6, step: 0.01 },
|
|
||||||
{ key: 'groundClearance', kind: 'number', unit: 'm', min: 0, max: 0.5, step: 0.01 },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Posts',
|
|
||||||
fields: [
|
|
||||||
{ key: 'postSpacing', kind: 'number', unit: 'm', min: 0.5, max: 5, step: 0.1 },
|
|
||||||
{ key: 'postSize', kind: 'number', unit: 'm', min: 0.04, max: 0.4, step: 0.01 },
|
|
||||||
{ key: 'topRailHeight', kind: 'number', unit: 'm', min: 0, max: 0.2, step: 0.005 },
|
|
||||||
{ key: 'edgeInset', kind: 'number', unit: 'm', min: 0, max: 0.1, step: 0.005 },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: 'Style',
|
label: 'Style',
|
||||||
fields: [
|
fields: [
|
||||||
@@ -47,5 +34,25 @@ export const fenceParametrics: ParametricDescriptor<FenceNode> = {
|
|||||||
{ key: 'showInfill', kind: 'boolean' },
|
{ key: 'showInfill', kind: 'boolean' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: 'Dimensions',
|
||||||
|
fields: [
|
||||||
|
{ key: 'length', kind: 'custom', component: FenceLengthEditor },
|
||||||
|
{ key: 'curve', kind: 'custom', component: FenceCurveEditor },
|
||||||
|
{ key: 'height', kind: 'number', unit: 'm', min: 0.4, max: 4, step: 0.05 },
|
||||||
|
{ key: 'thickness', kind: 'number', unit: 'm', min: 0.03, max: 0.5, step: 0.005 },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Structure',
|
||||||
|
fields: [
|
||||||
|
{ key: 'baseHeight', kind: 'number', unit: 'm', min: 0.04, max: 1, step: 0.01 },
|
||||||
|
{ key: 'topRailHeight', kind: 'number', unit: 'm', min: 0.01, max: 0.25, step: 0.005 },
|
||||||
|
{ key: 'postSpacing', kind: 'number', unit: 'm', min: 0.2, max: 5, step: 0.05 },
|
||||||
|
{ key: 'postSize', kind: 'number', unit: 'm', min: 0.01, max: 0.4, step: 0.005 },
|
||||||
|
{ key: 'groundClearance', kind: 'number', unit: 'm', min: 0, max: 0.6, step: 0.005 },
|
||||||
|
{ key: 'edgeInset', kind: 'number', unit: 'm', min: 0.005, max: 0.25, step: 0.005 },
|
||||||
|
],
|
||||||
|
},
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user