Each tool is now a direct copy of the legacy implementation, relocated
under @pascal-app/nodes/<kind>/ and dispatched via the registry's
def.affordanceTools. No DragAction abstraction, no clever live-drag
exception, no novel snap pipeline — same code, same UX, same
performance, same history dance.
Ports:
- fence/curve-tool.tsx (legacy CurveFenceTool, 1:1)
- fence/move-tool.tsx (legacy MoveFenceTool, 1:1 — including
the mesh.position + useLiveTransforms
exception that the legacy uses for fence
specifically)
- wall/curve-tool.tsx (legacy CurveWallTool, 1:1)
- slab/move-tool.tsx (legacy MoveSlabTool, 1:1)
- ceiling/move-tool.tsx (legacy MoveCeilingTool, 1:1 — preview
fill + outline overlay preserved)
Drops the obsolete DragAction-based action files
(packages/nodes/src/{fence,wall,slab,ceiling}/actions/{curve,move}.ts)
and their now-empty actions/ directories where applicable. Fence
keeps actions/move-endpoint.ts since that port works.
Editor public surface gains `getWallGridStep` + `snapScalarToGrid`
(transitional exports — Stage F moves them into @pascal-app/nodes).
ToolManager + MoveTool dispatch unchanged: the same legacy-fallback
branches now mount the registry component because the affordances are
declared, but the rendered behavior matches the legacy because the
implementations are copies.
Per-kind progress: fence D ✅ (curve / move-endpoint / move / placement
all kind-owned), slab D ✅, ceiling D ✅, wall D 🟡 (curve only,
endpoint/move/placement still legacy).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
192 lines
5.8 KiB
TypeScript
192 lines
5.8 KiB
TypeScript
'use client'
|
|
|
|
import {
|
|
type AnyNodeId,
|
|
emitter,
|
|
type GridEvent,
|
|
getClampedWallCurveOffset,
|
|
getMaxWallCurveOffset,
|
|
getWallChordFrame,
|
|
getWallMidpointHandlePoint,
|
|
normalizeWallCurveOffset,
|
|
useScene,
|
|
type WallNode,
|
|
} from '@pascal-app/core'
|
|
import {
|
|
CursorSphere,
|
|
getWallGridStep,
|
|
markToolCancelConsumed,
|
|
snapScalarToGrid,
|
|
triggerSFX,
|
|
useEditor,
|
|
} from '@pascal-app/editor'
|
|
import { useViewer } from '@pascal-app/viewer'
|
|
import { useCallback, useEffect, useRef, useState } from 'react'
|
|
|
|
/**
|
|
* Phase 5 Stage D — wall curve tool (kind-owned).
|
|
*
|
|
* 1:1 port of the legacy `CurveWallTool`. Same snap pipeline, Shift
|
|
* override, history dance, activation grace. The wall variant uses
|
|
* `useScene.temporal.getState().pause()` / `.resume()` directly rather
|
|
* than the depth-counted `pauseSceneHistory` helpers — matches legacy.
|
|
*/
|
|
export const CurveWallTool: React.FC<{ node: WallNode }> = ({ node }) => {
|
|
const activatedAtRef = useRef<number>(Date.now())
|
|
const originalCurveOffsetRef = useRef(getClampedWallCurveOffset(node))
|
|
const previousCurveOffsetRef = useRef<number | null>(null)
|
|
const shiftPressedRef = useRef(false)
|
|
const previewOffsetRef = useRef<number>(originalCurveOffsetRef.current)
|
|
|
|
const initialHandle = getWallMidpointHandlePoint(node)
|
|
const [cursorLocalPos, setCursorLocalPos] = useState<[number, number, number]>([
|
|
initialHandle.x,
|
|
0,
|
|
initialHandle.y,
|
|
])
|
|
|
|
const exitCurveMode = useCallback(() => {
|
|
useEditor.getState().setCurvingWall(null)
|
|
}, [])
|
|
|
|
useEffect(() => {
|
|
const nodeId = node.id
|
|
const originalCurveOffset = originalCurveOffsetRef.current
|
|
const chord = getWallChordFrame(node)
|
|
const maxCurveOffset = getMaxWallCurveOffset(node)
|
|
|
|
useScene.temporal.getState().pause()
|
|
let wasCommitted = false
|
|
|
|
const applyPreview = (curveOffset: number) => {
|
|
if (previewOffsetRef.current === curveOffset) {
|
|
return
|
|
}
|
|
previewOffsetRef.current = curveOffset
|
|
|
|
const nextNode = {
|
|
...node,
|
|
curveOffset,
|
|
}
|
|
const handlePoint = getWallMidpointHandlePoint(nextNode)
|
|
setCursorLocalPos([handlePoint.x, 0, handlePoint.y])
|
|
useScene.getState().updateNode(nodeId, { curveOffset })
|
|
useScene.getState().markDirty(nodeId as AnyNodeId)
|
|
}
|
|
|
|
const restoreOriginal = () => {
|
|
if (previewOffsetRef.current === originalCurveOffset) {
|
|
return
|
|
}
|
|
previewOffsetRef.current = originalCurveOffset
|
|
useScene.getState().updateNode(nodeId, { curveOffset: originalCurveOffset })
|
|
useScene.getState().markDirty(nodeId as AnyNodeId)
|
|
}
|
|
|
|
const onGridMove = (event: GridEvent) => {
|
|
const snapStep = getWallGridStep()
|
|
const localX = shiftPressedRef.current
|
|
? event.localPosition[0]
|
|
: snapScalarToGrid(event.localPosition[0], snapStep)
|
|
const localZ = shiftPressedRef.current
|
|
? event.localPosition[2]
|
|
: snapScalarToGrid(event.localPosition[2], snapStep)
|
|
|
|
const offsetFromMidpoint = -(
|
|
(localX - chord.midpoint.x) * chord.normal.x +
|
|
(localZ - chord.midpoint.y) * chord.normal.y
|
|
)
|
|
const snappedOffset = shiftPressedRef.current
|
|
? offsetFromMidpoint
|
|
: snapScalarToGrid(offsetFromMidpoint, snapStep)
|
|
const nextCurveOffset = normalizeWallCurveOffset(
|
|
node,
|
|
Math.max(-maxCurveOffset, Math.min(maxCurveOffset, snappedOffset)),
|
|
)
|
|
|
|
if (
|
|
previousCurveOffsetRef.current !== null &&
|
|
nextCurveOffset !== previousCurveOffsetRef.current
|
|
) {
|
|
triggerSFX('sfx:grid-snap')
|
|
}
|
|
previousCurveOffsetRef.current = nextCurveOffset
|
|
|
|
applyPreview(nextCurveOffset)
|
|
}
|
|
|
|
const onGridClick = (event: GridEvent) => {
|
|
if (Date.now() - activatedAtRef.current < 150) {
|
|
event.nativeEvent?.stopPropagation?.()
|
|
return
|
|
}
|
|
|
|
const curveOffset = previewOffsetRef.current
|
|
wasCommitted = true
|
|
|
|
if (curveOffset !== originalCurveOffset) {
|
|
// Restore original baseline while paused so the next resume+update
|
|
// registers as a single tracked change (undo reverts to original).
|
|
useScene.getState().updateNode(nodeId, { curveOffset: originalCurveOffset })
|
|
useScene.getState().markDirty(nodeId as AnyNodeId)
|
|
|
|
useScene.temporal.getState().resume()
|
|
useScene.getState().updateNode(nodeId, { curveOffset })
|
|
useScene.getState().markDirty(nodeId as AnyNodeId)
|
|
useScene.temporal.getState().pause()
|
|
}
|
|
|
|
triggerSFX('sfx:item-place')
|
|
useViewer.getState().setSelection({ selectedIds: [nodeId] })
|
|
exitCurveMode()
|
|
event.nativeEvent?.stopPropagation?.()
|
|
}
|
|
|
|
const onCancel = () => {
|
|
restoreOriginal()
|
|
useViewer.getState().setSelection({ selectedIds: [nodeId] })
|
|
useScene.temporal.getState().resume()
|
|
markToolCancelConsumed()
|
|
exitCurveMode()
|
|
}
|
|
|
|
const onKeyDown = (event: KeyboardEvent) => {
|
|
if (event.key === 'Shift') {
|
|
shiftPressedRef.current = true
|
|
}
|
|
}
|
|
|
|
const onKeyUp = (event: KeyboardEvent) => {
|
|
if (event.key === 'Shift') {
|
|
shiftPressedRef.current = false
|
|
}
|
|
}
|
|
|
|
emitter.on('grid:move', onGridMove)
|
|
emitter.on('grid:click', onGridClick)
|
|
emitter.on('tool:cancel', onCancel)
|
|
window.addEventListener('keydown', onKeyDown)
|
|
window.addEventListener('keyup', onKeyUp)
|
|
|
|
return () => {
|
|
if (!wasCommitted) {
|
|
restoreOriginal()
|
|
}
|
|
useScene.temporal.getState().resume()
|
|
emitter.off('grid:move', onGridMove)
|
|
emitter.off('grid:click', onGridClick)
|
|
emitter.off('tool:cancel', onCancel)
|
|
window.removeEventListener('keydown', onKeyDown)
|
|
window.removeEventListener('keyup', onKeyUp)
|
|
}
|
|
}, [exitCurveMode, node])
|
|
|
|
return (
|
|
<group>
|
|
<CursorSphere position={cursorLocalPos} showTooltip={false} />
|
|
</group>
|
|
)
|
|
}
|
|
|
|
export default CurveWallTool
|