Shelf had the floating action menu (move/delete) showing thanks to the previous registry-driven selection commit, but clicking move did nothing and duplicate silently failed. Two hardcoded chains: 1) FloatingActionMenu.handleMove guarded `setMovingNode` behind a hardcoded `node.type === 'item' || ... || node.type === 'spawn'` chain. Added `|| isRegistrySelectable(node.type)` so any registry kind triggers the move flow. 2) MoveTool dispatched per-kind components (MoveItemContent, MoveColumnTool, MoveWallTool, ...). The default fallback mounted MoveItemContent, which assumes the node is an ItemNode with asset/scale/metadata — crashes for shelf. Added a generic MoveRegistryNodeTool (kind-agnostic clone of MoveColumnTool): pure position+rotation drag with grid snap, re-parses orphan re-creates via `nodeRegistry.get(kind).schema.parse(...)`. MoveTool dispatches to it for any `nodeRegistry.has(movingNode.type)` before the MoveItemContent fallback. 3) FloatingActionMenu.handleDuplicate had a hardcoded `node.type === 'door' ? DoorNode.parse(...) : ...` chain. Added a registry-driven fallback after it: `const def = nodeRegistry.get(node.type); duplicate = def.schema.parse(duplicateInfo)`. Then the createNode + setMovingNode branches also augment with `nodeRegistry.has(duplicate.type)` so the new shelf gets created in the scene and handed off to the move tool for placement. After this: - Click shelf → move icon in floating menu → cursor follows mouse, click to place at new position. - Click shelf → duplicate icon → new shelf appears, offset by (1,0,1), handed to move tool so the user can position it. Phase 4 will collapse MoveRegistryNodeTool with the per-kind movers once they all reduce to the same position+rotation shape, and read `capabilities.movable` to gate handleMove instead of the OR chain. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
132 lines
5.4 KiB
TypeScript
132 lines
5.4 KiB
TypeScript
import type {
|
|
AnyNodeId,
|
|
BuildingNode,
|
|
CeilingNode,
|
|
ColumnNode,
|
|
DoorNode,
|
|
ElevatorNode,
|
|
FenceNode,
|
|
ItemNode,
|
|
RoofNode,
|
|
RoofSegmentNode,
|
|
SlabNode,
|
|
SpawnNode,
|
|
StairNode,
|
|
StairSegmentNode,
|
|
WallNode,
|
|
WindowNode,
|
|
} from '@pascal-app/core'
|
|
import { nodeRegistry } from '@pascal-app/core'
|
|
import { Vector3 } from 'three'
|
|
import { sfxEmitter } from '../../../lib/sfx-bus'
|
|
import useEditor from '../../../store/use-editor'
|
|
import { MoveBuildingContent } from '../building/move-building-tool'
|
|
import { MoveCeilingTool } from '../ceiling/move-ceiling-tool'
|
|
import { MoveColumnTool } from '../column/move-column-tool'
|
|
import { MoveDoorTool } from '../door/move-door-tool'
|
|
import { MoveElevatorTool } from '../elevator/move-elevator-tool'
|
|
import { MoveFenceTool } from '../fence/move-fence-tool'
|
|
import { MoveRegistryNodeTool } from '../registry/move-registry-node-tool'
|
|
import { MoveRoofTool } from '../roof/move-roof-tool'
|
|
import { MoveSlabTool } from '../slab/move-slab-tool'
|
|
import { MoveSpawnTool } from '../spawn/move-spawn-tool'
|
|
import { MoveWallTool } from '../wall/move-wall-tool'
|
|
import { MoveWindowTool } from '../window/move-window-tool'
|
|
import type { PlacementState } from './placement-types'
|
|
import { useDraftNode } from './use-draft-node'
|
|
import { usePlacementCoordinator } from './use-placement-coordinator'
|
|
|
|
function getInitialState(node: {
|
|
asset: { attachTo?: string }
|
|
parentId: string | null
|
|
}): PlacementState {
|
|
const attachTo = node.asset.attachTo
|
|
if (attachTo === 'wall' || attachTo === 'wall-side') {
|
|
return { surface: 'wall', wallId: node.parentId, ceilingId: null, surfaceItemId: null }
|
|
}
|
|
if (attachTo === 'ceiling') {
|
|
return { surface: 'ceiling', wallId: null, ceilingId: node.parentId, surfaceItemId: null }
|
|
}
|
|
return { surface: 'floor', wallId: null, ceilingId: null, surfaceItemId: null }
|
|
}
|
|
|
|
function MoveItemContent({ movingNode }: { movingNode: ItemNode }) {
|
|
const draftNode = useDraftNode()
|
|
|
|
const meta =
|
|
typeof movingNode.metadata === 'object' && movingNode.metadata !== null
|
|
? (movingNode.metadata as Record<string, unknown>)
|
|
: {}
|
|
const isNew = !!meta.isNew
|
|
|
|
const cursor = usePlacementCoordinator({
|
|
asset: movingNode.asset,
|
|
draftNode,
|
|
// Duplicates start fresh in floor mode; wall/ceiling draft is created lazily by ensureDraft
|
|
initialState: isNew
|
|
? { surface: 'floor', wallId: null, ceilingId: null, surfaceItemId: null }
|
|
: getInitialState(movingNode),
|
|
// Preserve the original item's scale so Y-position calculations use the correct height
|
|
defaultScale: isNew ? movingNode.scale : undefined,
|
|
initDraft: (gridPosition) => {
|
|
if (isNew) {
|
|
// Duplicate: use the same create() path as ItemTool so ghost rendering works correctly.
|
|
// Floor items get a draft immediately; wall/ceiling items are created lazily on surface entry.
|
|
gridPosition.copy(new Vector3(...movingNode.position))
|
|
if (!movingNode.asset.attachTo) {
|
|
draftNode.create(gridPosition, movingNode.asset, movingNode.rotation, movingNode.scale)
|
|
}
|
|
} else {
|
|
draftNode.adopt(movingNode)
|
|
gridPosition.copy(new Vector3(...movingNode.position))
|
|
}
|
|
},
|
|
onCommitted: () => {
|
|
sfxEmitter.emit('sfx:item-place')
|
|
useEditor.getState().setMovingNode(null)
|
|
return false
|
|
},
|
|
onCancel: () => {
|
|
draftNode.destroy()
|
|
useEditor.getState().setMovingNode(null)
|
|
},
|
|
})
|
|
|
|
return <>{cursor}</>
|
|
}
|
|
|
|
export const MoveTool: React.FC<{
|
|
onNodeMoved?: (nodeId: AnyNodeId) => void
|
|
onSpawnMoved?: (nodeId: SpawnNode['id']) => void
|
|
}> = ({ onNodeMoved, onSpawnMoved }) => {
|
|
const movingNode = useEditor((state) => state.movingNode)
|
|
|
|
if (!movingNode) return null
|
|
if (movingNode.type === 'building')
|
|
return <MoveBuildingContent node={movingNode as BuildingNode} />
|
|
if (movingNode.type === 'door') return <MoveDoorTool node={movingNode as DoorNode} />
|
|
if (movingNode.type === 'elevator')
|
|
return <MoveElevatorTool node={movingNode as ElevatorNode} onCommitted={onNodeMoved} />
|
|
if (movingNode.type === 'window') return <MoveWindowTool node={movingNode as WindowNode} />
|
|
if (movingNode.type === 'ceiling') return <MoveCeilingTool node={movingNode as CeilingNode} />
|
|
if (movingNode.type === 'column') return <MoveColumnTool node={movingNode as ColumnNode} />
|
|
if (movingNode.type === 'slab') return <MoveSlabTool node={movingNode as SlabNode} />
|
|
if (movingNode.type === 'wall') return <MoveWallTool node={movingNode as WallNode} />
|
|
if (movingNode.type === 'fence') return <MoveFenceTool node={movingNode as FenceNode} />
|
|
if (movingNode.type === 'roof' || movingNode.type === 'roof-segment')
|
|
return <MoveRoofTool node={movingNode as RoofNode | RoofSegmentNode} />
|
|
if (movingNode.type === 'spawn')
|
|
return <MoveSpawnTool node={movingNode as SpawnNode} onCommitted={onSpawnMoved} />
|
|
if (movingNode.type === 'stair' || movingNode.type === 'stair-segment')
|
|
return <MoveRoofTool node={movingNode as StairNode | StairSegmentNode} />
|
|
// Registry-driven kinds (any NodeDefinition with `capabilities.movable`)
|
|
// get a generic position+rotation mover. Phase 4 may consolidate this
|
|
// with the per-kind movers above when they all collapse to the same
|
|
// shape. Must come BEFORE the MoveItemContent fallback because that
|
|
// assumes the node is an ItemNode.
|
|
if (nodeRegistry.has(movingNode.type)) {
|
|
return <MoveRegistryNodeTool node={movingNode} />
|
|
}
|
|
return <MoveItemContent movingNode={movingNode as ItemNode} />
|
|
}
|