@pascal-app/editor 0.8.0 → 0.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +8 -9
- package/src/components/editor/alignment-3d-guide-layer.tsx +160 -0
- package/src/components/editor/custom-camera-controls.tsx +754 -25
- package/src/components/editor/editor-layout-mobile.tsx +3 -3
- package/src/components/editor/editor-layout-v2.tsx +58 -51
- package/src/components/editor/export-manager.tsx +32 -3
- package/src/components/editor/first-person/build-collider-world.test.ts +149 -0
- package/src/components/editor/first-person/build-collider-world.ts +201 -83
- package/src/components/editor/first-person/bvh-ecctrl.tsx +8 -8
- package/src/components/editor/first-person-controls.tsx +825 -20
- package/src/components/editor/floating-action-menu.tsx +287 -196
- package/src/components/editor/floating-building-action-menu.tsx +1 -1
- package/src/components/editor/floorplan-panel.tsx +5829 -12005
- package/src/components/editor/grid.tsx +51 -17
- package/src/components/editor/group-move-handle.tsx +316 -0
- package/src/components/editor/group-rotate-handle.tsx +382 -0
- package/src/components/editor/group-transform-shared.test.ts +205 -0
- package/src/components/editor/group-transform-shared.ts +256 -0
- package/src/components/editor/handles/handle-arrow.tsx +523 -0
- package/src/components/editor/handles/use-handle-drag.ts +213 -0
- package/src/components/editor/index.tsx +178 -149
- package/src/components/editor/measurement-pill.tsx +75 -0
- package/src/components/editor/node-arrow-handles.tsx +1453 -0
- package/src/components/editor/selection-manager.tsx +433 -156
- package/src/components/editor/site-edge-labels.tsx +44 -20
- package/src/components/editor/slab-hole-highlights.tsx +466 -0
- package/src/components/editor/snapshot-capture-overlay.tsx +136 -62
- package/src/components/editor/thumbnail-generator.tsx +9 -3
- package/src/components/editor/use-floorplan-background-placement.ts +119 -32
- package/src/components/editor/use-floorplan-hit-testing.ts +24 -0
- package/src/components/editor/use-floorplan-scene-data.ts +14 -2
- package/src/components/editor/wall-measurement-label.tsx +11 -6
- package/src/components/editor/wall-move-side-handles.tsx +855 -0
- package/src/components/editor/wall-opening-highlights.tsx +181 -0
- package/src/components/editor/wall-snap-beacon-layer.tsx +150 -0
- package/src/components/editor-2d/floorplan-action-menu-layer.tsx +6 -1
- package/src/components/editor-2d/floorplan-alignment-guide-layer.tsx +142 -0
- package/src/components/editor-2d/floorplan-cursor-indicator-overlay.tsx +5 -3
- package/src/components/editor-2d/floorplan-registry-action-menu.tsx +227 -0
- package/src/components/editor-2d/floorplan-registry-move-overlay.tsx +616 -0
- package/src/components/editor-2d/floorplan-render-context.tsx +62 -0
- package/src/components/editor-2d/floorplan-snap-beacon-layer.tsx +75 -0
- package/src/components/editor-2d/floorplan-wall-move-ghost-layer.tsx +47 -0
- package/src/components/editor-2d/renderers/floorplan-geometry-renderer.tsx +266 -0
- package/src/components/editor-2d/renderers/floorplan-measurements-layer.tsx +108 -66
- package/src/components/editor-2d/renderers/floorplan-placement-preview-layer.tsx +59 -0
- package/src/components/editor-2d/renderers/floorplan-registry-layer.tsx +1963 -0
- package/src/components/editor-2d/renderers/floorplan-stair-layer.tsx +24 -9
- package/src/components/editor-2d/svg-paths.ts +10 -2
- package/src/components/systems/ceiling/ceiling-selection-affordance-system.tsx +26 -3
- package/src/components/systems/ceiling/ceiling-system.tsx +12 -8
- package/src/components/systems/roof/roof-edit-system.tsx +86 -12
- package/src/components/systems/stair/stair-edit-system.tsx +1 -1
- package/src/components/tools/elevator/elevator-defaults.ts +8 -0
- package/src/components/tools/elevator/elevator-tool.tsx +349 -0
- package/src/components/tools/elevator/move-elevator-tool.tsx +252 -0
- package/src/components/tools/fence/fence-drafting.ts +64 -22
- package/src/components/tools/item/move-tool.tsx +41 -105
- package/src/components/tools/item/placement-math.test.ts +10 -0
- package/src/components/tools/item/placement-math.ts +31 -5
- package/src/components/tools/item/placement-strategies.ts +190 -15
- package/src/components/tools/item/placement-types.ts +10 -1
- package/src/components/tools/item/use-draft-node.ts +20 -1
- package/src/components/tools/item/use-placement-coordinator.tsx +694 -191
- package/src/components/tools/registry/move-registry-node-tool.tsx +602 -0
- package/src/components/tools/roof/roof-tool.tsx +108 -12
- package/src/components/tools/select/box-select-state.ts +77 -0
- package/src/components/tools/select/box-select-tool.tsx +324 -538
- package/src/components/tools/select/plane-box-select-tool.tsx +577 -0
- package/src/components/tools/select/screen-rectangle-selection.ts +84 -0
- package/src/components/tools/select/select-candidates.test.ts +109 -0
- package/src/components/tools/select/select-candidates.ts +85 -0
- package/src/components/tools/shared/affordance-dispatch.ts +30 -0
- package/src/components/tools/shared/drag-bounding-box.tsx +171 -0
- package/src/components/tools/shared/floor-stack-preview.ts +25 -0
- package/src/components/tools/shared/fresh-placement-visibility.ts +61 -0
- package/src/components/tools/shared/placement-box-geometry.ts +123 -0
- package/src/components/tools/shared/placement-box.tsx +123 -0
- package/src/components/tools/shared/polygon-editor.tsx +617 -167
- package/src/components/tools/shared/segment-angle.ts +56 -0
- package/src/components/tools/site/site-boundary-editor.tsx +464 -12
- package/src/components/tools/site/site-flag-model.ts +18 -0
- package/src/components/tools/stair/stair-defaults.ts +1 -1
- package/src/components/tools/stair/stair-tool.tsx +269 -35
- package/src/components/tools/tool-manager.tsx +172 -56
- package/src/components/tools/wall/wall-drafting.ts +98 -98
- package/src/components/tools/wall/wall-snap-geometry.test.ts +79 -0
- package/src/components/tools/wall/wall-snap-geometry.ts +270 -0
- package/src/components/tools/zone/zone-tool.tsx +16 -6
- package/src/components/ui/action-menu/action-button.tsx +21 -1
- package/src/components/ui/action-menu/control-modes.tsx +5 -82
- package/src/components/ui/action-menu/index.tsx +1 -113
- package/src/components/ui/action-menu/structure-tools.tsx +13 -88
- package/src/components/ui/action-menu/view-toggles.tsx +243 -6
- package/src/components/ui/command-palette/editor-commands.tsx +18 -13
- package/src/components/ui/command-palette/index.tsx +2 -1
- package/src/components/ui/controls/material-paint-panel.tsx +83 -0
- package/src/components/ui/controls/material-picker.tsx +11 -32
- package/src/components/ui/controls/metric-control.tsx +33 -11
- package/src/components/ui/floating-level-selector.tsx +47 -10
- package/src/components/ui/helpers/helper-manager.tsx +16 -17
- package/src/components/ui/helpers/registered-tool-helper.tsx +25 -0
- package/src/components/ui/item-catalog/catalog-items.tsx +1 -0
- package/src/components/ui/item-catalog/item-catalog.tsx +3 -0
- package/src/components/ui/level-duplicate-dialog.tsx +2 -1
- package/src/components/ui/panels/node-display.ts +1 -0
- package/src/components/ui/panels/panel-manager.tsx +35 -47
- package/src/components/ui/panels/panel-wrapper.tsx +217 -12
- package/src/components/ui/panels/parametric-inspector.tsx +469 -0
- package/src/components/ui/primitives/dropdown-menu.tsx +12 -8
- package/src/components/ui/scene-loader.tsx +1 -3
- package/src/components/ui/sidebar/panels/items-panel/function-tree-panel.tsx +263 -0
- package/src/components/ui/sidebar/panels/items-panel/index.tsx +82 -8
- package/src/components/ui/sidebar/panels/settings-panel/index.tsx +59 -9
- package/src/components/ui/sidebar/panels/settings-panel/keyboard-shortcuts-dialog.tsx +6 -1
- package/src/components/ui/sidebar/panels/settings-panel/load-build-dialog.tsx +259 -0
- package/src/components/ui/sidebar/panels/site-panel/building-tree-node.tsx +3 -1
- package/src/components/ui/sidebar/panels/site-panel/ceiling-tree-node.tsx +5 -2
- package/src/components/ui/sidebar/panels/site-panel/chimney-tree-node.tsx +83 -0
- package/src/components/ui/sidebar/panels/site-panel/dormer-tree-node.tsx +89 -0
- package/src/components/ui/sidebar/panels/site-panel/elevator-tree-node.tsx +75 -0
- package/src/components/ui/sidebar/panels/site-panel/fence-tree-node.tsx +2 -2
- package/src/components/ui/sidebar/panels/site-panel/gutter-tree-node.tsx +83 -0
- package/src/components/ui/sidebar/panels/site-panel/index.tsx +4 -6
- package/src/components/ui/sidebar/panels/site-panel/level-tree-node.tsx +2 -1
- package/src/components/ui/sidebar/panels/site-panel/registry-tree-node.tsx +93 -0
- package/src/components/ui/sidebar/panels/site-panel/roof-tree-node.tsx +41 -5
- package/src/components/ui/sidebar/panels/site-panel/shelf-tree-node.tsx +128 -0
- package/src/components/ui/sidebar/panels/site-panel/slab-tree-node.tsx +5 -2
- package/src/components/ui/sidebar/panels/site-panel/solar-panel-tree-node.tsx +83 -0
- package/src/components/ui/sidebar/panels/site-panel/spawn-tree-node.tsx +7 -1
- package/src/components/ui/sidebar/panels/site-panel/tree-node.tsx +68 -36
- package/src/components/ui/sidebar/panels/zone-panel/index.tsx +51 -2
- package/src/components/ui/sidebar/tab-bar.tsx +61 -1
- package/src/components/viewer-overlay.tsx +169 -52
- package/src/components/viewer-zone-system.tsx +1 -1
- package/src/hooks/use-auto-save.ts +10 -3
- package/src/hooks/use-ceiling-events.ts +175 -0
- package/src/hooks/use-drag-action.ts +124 -0
- package/src/hooks/use-keyboard.ts +115 -62
- package/src/hooks/use-selection.ts +64 -0
- package/src/index.tsx +237 -5
- package/src/lib/constants.ts +6 -2
- package/src/lib/editor-api.ts +62 -0
- package/src/lib/elevator-support.ts +96 -0
- package/src/lib/floorplan/apply-alignment.ts +111 -0
- package/src/lib/floorplan/index.ts +7 -0
- package/src/lib/floorplan/selection-tool.ts +40 -0
- package/src/lib/floorplan/stairs.ts +12 -1
- package/src/lib/fresh-planar-placement.test.ts +102 -0
- package/src/lib/fresh-planar-placement.ts +63 -0
- package/src/lib/history.ts +2 -1
- package/src/lib/level-duplication.ts +54 -42
- package/src/lib/level-name.ts +11 -0
- package/src/lib/material-paint.ts +211 -19
- package/src/lib/placement-metadata.ts +29 -0
- package/src/lib/planar-cursor-placement.test.ts +43 -0
- package/src/lib/planar-cursor-placement.ts +42 -0
- package/src/lib/roof-duplication.ts +1 -1
- package/src/lib/scene-clipboard.ts +267 -0
- package/src/lib/scene.ts +13 -4
- package/src/lib/sfx-bus.ts +23 -1
- package/src/lib/sfx-player.ts +70 -22
- package/src/lib/site-boundary.ts +1 -0
- package/src/lib/stair-levels.test.ts +146 -0
- package/src/lib/stair-levels.ts +177 -0
- package/src/lib/world-grid-snap.ts +199 -0
- package/src/lib/zone-content.ts +130 -0
- package/src/store/use-alignment-guides.ts +21 -0
- package/src/store/use-editor.tsx +320 -37
- package/src/store/use-placement-preview.ts +31 -0
- package/src/store/use-wall-move-ghosts.ts +36 -0
- package/src/store/use-wall-snap-indicator.ts +32 -0
- package/src/components/editor/preset-thumbnail-generator.tsx +0 -125
- package/src/components/editor-2d/renderers/floorplan-roof-layer.tsx +0 -113
- package/src/components/tools/building/move-building-tool.tsx +0 -157
- package/src/components/tools/ceiling/ceiling-boundary-editor.tsx +0 -43
- package/src/components/tools/ceiling/ceiling-hole-editor.tsx +0 -49
- package/src/components/tools/ceiling/ceiling-tool.tsx +0 -465
- package/src/components/tools/ceiling/move-ceiling-tool.tsx +0 -264
- package/src/components/tools/column/column-tool.tsx +0 -97
- package/src/components/tools/column/move-column-tool.tsx +0 -105
- package/src/components/tools/door/door-math.ts +0 -110
- package/src/components/tools/door/door-tool.tsx +0 -324
- package/src/components/tools/door/move-door-tool.tsx +0 -412
- package/src/components/tools/fence/curve-fence-tool.tsx +0 -178
- package/src/components/tools/fence/fence-tool.tsx +0 -346
- package/src/components/tools/fence/move-fence-endpoint-tool.tsx +0 -441
- package/src/components/tools/fence/move-fence-tool.tsx +0 -302
- package/src/components/tools/item/item-tool.tsx +0 -26
- package/src/components/tools/roof/move-roof-tool.tsx +0 -364
- package/src/components/tools/slab/move-slab-tool.tsx +0 -182
- package/src/components/tools/slab/slab-boundary-editor.tsx +0 -43
- package/src/components/tools/slab/slab-hole-editor.tsx +0 -49
- package/src/components/tools/slab/slab-tool.tsx +0 -322
- package/src/components/tools/spawn/move-spawn-tool.tsx +0 -101
- package/src/components/tools/spawn/spawn-tool.tsx +0 -130
- package/src/components/tools/wall/curve-wall-tool.tsx +0 -178
- package/src/components/tools/wall/move-wall-endpoint-tool.tsx +0 -426
- package/src/components/tools/wall/move-wall-tool.tsx +0 -358
- package/src/components/tools/wall/wall-tool.tsx +0 -332
- package/src/components/tools/window/move-window-tool.tsx +0 -447
- package/src/components/tools/window/window-math.ts +0 -117
- package/src/components/tools/window/window-tool.tsx +0 -332
- package/src/components/ui/helpers/ceiling-helper.tsx +0 -20
- package/src/components/ui/helpers/slab-helper.tsx +0 -20
- package/src/components/ui/helpers/wall-helper.tsx +0 -20
- package/src/components/ui/panels/ceiling-panel.tsx +0 -249
- package/src/components/ui/panels/column-panel.tsx +0 -759
- package/src/components/ui/panels/door-panel.tsx +0 -1299
- package/src/components/ui/panels/fence-panel.tsx +0 -222
- package/src/components/ui/panels/item-panel.tsx +0 -306
- package/src/components/ui/panels/presets/presets-popover.tsx +0 -511
- package/src/components/ui/panels/roof-panel.tsx +0 -280
- package/src/components/ui/panels/roof-segment-panel.tsx +0 -311
- package/src/components/ui/panels/slab-panel.tsx +0 -250
- package/src/components/ui/panels/spawn-panel.tsx +0 -161
- package/src/components/ui/panels/stair-panel.tsx +0 -577
- package/src/components/ui/panels/stair-segment-panel.tsx +0 -325
- package/src/components/ui/panels/wall-panel.tsx +0 -273
- package/src/components/ui/panels/window-panel.tsx +0 -968
- package/src/contexts/presets-context.tsx +0 -121
- package/src/hooks/use-contextual-tools.ts +0 -61
|
@@ -1,412 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
type AnyNodeId,
|
|
3
|
-
DoorNode,
|
|
4
|
-
emitter,
|
|
5
|
-
isCurvedWall,
|
|
6
|
-
sceneRegistry,
|
|
7
|
-
spatialGridManager,
|
|
8
|
-
useLiveTransforms,
|
|
9
|
-
useScene,
|
|
10
|
-
type WallEvent,
|
|
11
|
-
} from '@pascal-app/core'
|
|
12
|
-
import { useViewer } from '@pascal-app/viewer'
|
|
13
|
-
import { useCallback, useEffect, useMemo, useRef } from 'react'
|
|
14
|
-
import { BoxGeometry, EdgesGeometry, type Group } from 'three'
|
|
15
|
-
import { LineBasicNodeMaterial } from 'three/webgpu'
|
|
16
|
-
import { EDITOR_LAYER } from '../../../lib/constants'
|
|
17
|
-
import { sfxEmitter } from '../../../lib/sfx-bus'
|
|
18
|
-
import useEditor from '../../../store/use-editor'
|
|
19
|
-
import {
|
|
20
|
-
calculateCursorRotation,
|
|
21
|
-
calculateItemRotation,
|
|
22
|
-
getSideFromNormal,
|
|
23
|
-
isValidWallSideFace,
|
|
24
|
-
snapToHalf,
|
|
25
|
-
} from '../item/placement-math'
|
|
26
|
-
import { clampToWall, hasWallChildOverlap, wallLocalToWorld } from './door-math'
|
|
27
|
-
|
|
28
|
-
const edgeMaterial = new LineBasicNodeMaterial({
|
|
29
|
-
color: 0xef_44_44,
|
|
30
|
-
linewidth: 3,
|
|
31
|
-
depthTest: false,
|
|
32
|
-
depthWrite: false,
|
|
33
|
-
})
|
|
34
|
-
|
|
35
|
-
export const MoveDoorTool: React.FC<{ node: DoorNode }> = ({ node: movingDoorNode }) => {
|
|
36
|
-
const cursorGroupRef = useRef<Group>(null!)
|
|
37
|
-
|
|
38
|
-
const exitMoveMode = useCallback(() => {
|
|
39
|
-
useEditor.getState().setMovingNode(null)
|
|
40
|
-
}, [])
|
|
41
|
-
|
|
42
|
-
useEffect(() => {
|
|
43
|
-
useScene.temporal.getState().pause()
|
|
44
|
-
|
|
45
|
-
const meta =
|
|
46
|
-
typeof movingDoorNode.metadata === 'object' && movingDoorNode.metadata !== null
|
|
47
|
-
? (movingDoorNode.metadata as Record<string, unknown>)
|
|
48
|
-
: {}
|
|
49
|
-
const isNew = !!meta.isNew
|
|
50
|
-
|
|
51
|
-
const original = {
|
|
52
|
-
position: [...movingDoorNode.position] as [number, number, number],
|
|
53
|
-
rotation: [...movingDoorNode.rotation] as [number, number, number],
|
|
54
|
-
side: movingDoorNode.side,
|
|
55
|
-
parentId: movingDoorNode.parentId,
|
|
56
|
-
wallId: movingDoorNode.wallId,
|
|
57
|
-
metadata: movingDoorNode.metadata,
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
if (!isNew) {
|
|
61
|
-
useScene.getState().updateNode(movingDoorNode.id, {
|
|
62
|
-
metadata: { ...meta, isTransient: true },
|
|
63
|
-
})
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
let currentWallId: string | null = movingDoorNode.parentId
|
|
67
|
-
|
|
68
|
-
const markWallDirty = (wallId: string | null) => {
|
|
69
|
-
if (wallId) useScene.getState().dirtyNodes.add(wallId as AnyNodeId)
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
const getLevelId = () => useViewer.getState().selection.levelId
|
|
73
|
-
const getLevelYOffset = () => {
|
|
74
|
-
const id = getLevelId()
|
|
75
|
-
return id ? (sceneRegistry.nodes.get(id as AnyNodeId)?.position.y ?? 0) : 0
|
|
76
|
-
}
|
|
77
|
-
const getSlabElevation = (wallEvent: WallEvent) =>
|
|
78
|
-
spatialGridManager.getSlabElevationForWall(
|
|
79
|
-
wallEvent.node.parentId ?? '',
|
|
80
|
-
wallEvent.node.start,
|
|
81
|
-
wallEvent.node.end,
|
|
82
|
-
)
|
|
83
|
-
|
|
84
|
-
const hideCursor = () => {
|
|
85
|
-
if (cursorGroupRef.current) cursorGroupRef.current.visible = false
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
const updateCursor = (
|
|
89
|
-
worldPosition: [number, number, number],
|
|
90
|
-
cursorRotationY: number,
|
|
91
|
-
valid: boolean,
|
|
92
|
-
) => {
|
|
93
|
-
const group = cursorGroupRef.current
|
|
94
|
-
if (!group) return
|
|
95
|
-
group.visible = true
|
|
96
|
-
group.position.set(...worldPosition)
|
|
97
|
-
group.rotation.y = cursorRotationY
|
|
98
|
-
edgeMaterial.color.setHex(valid ? 0x22_c5_5e : 0xef_44_44)
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
const getPlacementOrientation = (event: WallEvent) => {
|
|
102
|
-
const faceSide = getSideFromNormal(event.normal)
|
|
103
|
-
const side = movingDoorNode.side ?? faceSide
|
|
104
|
-
const rotationOffset = side !== faceSide ? Math.PI : 0
|
|
105
|
-
return {
|
|
106
|
-
side,
|
|
107
|
-
itemRotation: calculateItemRotation(event.normal) + rotationOffset,
|
|
108
|
-
cursorRotation:
|
|
109
|
-
calculateCursorRotation(event.normal, event.node.start, event.node.end) + rotationOffset,
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
const onWallEnter = (event: WallEvent) => {
|
|
114
|
-
if (!isValidWallSideFace(event.normal)) return
|
|
115
|
-
if (isCurvedWall(event.node)) {
|
|
116
|
-
hideCursor()
|
|
117
|
-
return
|
|
118
|
-
}
|
|
119
|
-
if (event.node.parentId !== getLevelId()) return
|
|
120
|
-
|
|
121
|
-
const { side, itemRotation, cursorRotation } = getPlacementOrientation(event)
|
|
122
|
-
|
|
123
|
-
const localX = snapToHalf(event.localPosition[0])
|
|
124
|
-
const { clampedX, clampedY } = clampToWall(
|
|
125
|
-
event.node,
|
|
126
|
-
localX,
|
|
127
|
-
movingDoorNode.width,
|
|
128
|
-
movingDoorNode.height,
|
|
129
|
-
)
|
|
130
|
-
|
|
131
|
-
const prevWallId = currentWallId
|
|
132
|
-
currentWallId = event.node.id
|
|
133
|
-
|
|
134
|
-
useScene.getState().updateNode(movingDoorNode.id, {
|
|
135
|
-
position: [clampedX, clampedY, 0],
|
|
136
|
-
rotation: [0, itemRotation, 0],
|
|
137
|
-
side,
|
|
138
|
-
parentId: event.node.id,
|
|
139
|
-
wallId: event.node.id,
|
|
140
|
-
})
|
|
141
|
-
useLiveTransforms.getState().set(movingDoorNode.id, {
|
|
142
|
-
position: [clampedX, clampedY, 0],
|
|
143
|
-
rotation: itemRotation,
|
|
144
|
-
})
|
|
145
|
-
|
|
146
|
-
if (prevWallId && prevWallId !== event.node.id) markWallDirty(prevWallId)
|
|
147
|
-
markWallDirty(event.node.id)
|
|
148
|
-
|
|
149
|
-
const valid = !hasWallChildOverlap(
|
|
150
|
-
event.node.id,
|
|
151
|
-
clampedX,
|
|
152
|
-
clampedY,
|
|
153
|
-
movingDoorNode.width,
|
|
154
|
-
movingDoorNode.height,
|
|
155
|
-
movingDoorNode.id,
|
|
156
|
-
)
|
|
157
|
-
|
|
158
|
-
updateCursor(
|
|
159
|
-
wallLocalToWorld(
|
|
160
|
-
event.node,
|
|
161
|
-
clampedX,
|
|
162
|
-
clampedY,
|
|
163
|
-
getLevelYOffset(),
|
|
164
|
-
getSlabElevation(event),
|
|
165
|
-
),
|
|
166
|
-
cursorRotation,
|
|
167
|
-
valid,
|
|
168
|
-
)
|
|
169
|
-
event.stopPropagation()
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
const onWallMove = (event: WallEvent) => {
|
|
173
|
-
if (!isValidWallSideFace(event.normal)) return
|
|
174
|
-
if (isCurvedWall(event.node)) {
|
|
175
|
-
hideCursor()
|
|
176
|
-
return
|
|
177
|
-
}
|
|
178
|
-
if (event.node.parentId !== getLevelId()) return
|
|
179
|
-
|
|
180
|
-
const { side, itemRotation, cursorRotation } = getPlacementOrientation(event)
|
|
181
|
-
|
|
182
|
-
const localX = snapToHalf(event.localPosition[0])
|
|
183
|
-
const { clampedX, clampedY } = clampToWall(
|
|
184
|
-
event.node,
|
|
185
|
-
localX,
|
|
186
|
-
movingDoorNode.width,
|
|
187
|
-
movingDoorNode.height,
|
|
188
|
-
)
|
|
189
|
-
|
|
190
|
-
if (currentWallId !== event.node.id) {
|
|
191
|
-
// Wall changed mid-move: must updateNode to reparent
|
|
192
|
-
useScene.getState().updateNode(movingDoorNode.id, {
|
|
193
|
-
position: [clampedX, clampedY, 0],
|
|
194
|
-
rotation: [0, itemRotation, 0],
|
|
195
|
-
side,
|
|
196
|
-
parentId: event.node.id,
|
|
197
|
-
wallId: event.node.id,
|
|
198
|
-
})
|
|
199
|
-
markWallDirty(currentWallId)
|
|
200
|
-
currentWallId = event.node.id
|
|
201
|
-
} else {
|
|
202
|
-
// Same wall: update Three.js mesh directly to avoid store churn
|
|
203
|
-
// collectCutoutBrushes reads cutoutMesh.matrixWorld, not scene store positions
|
|
204
|
-
const doorMesh = sceneRegistry.nodes.get(movingDoorNode.id as AnyNodeId)
|
|
205
|
-
if (doorMesh) {
|
|
206
|
-
doorMesh.position.set(clampedX, clampedY, 0)
|
|
207
|
-
doorMesh.rotation.set(0, itemRotation, 0)
|
|
208
|
-
doorMesh.updateMatrixWorld(true)
|
|
209
|
-
}
|
|
210
|
-
}
|
|
211
|
-
useLiveTransforms.getState().set(movingDoorNode.id, {
|
|
212
|
-
position: [clampedX, clampedY, 0],
|
|
213
|
-
rotation: itemRotation,
|
|
214
|
-
})
|
|
215
|
-
markWallDirty(event.node.id)
|
|
216
|
-
|
|
217
|
-
const valid = !hasWallChildOverlap(
|
|
218
|
-
event.node.id,
|
|
219
|
-
clampedX,
|
|
220
|
-
clampedY,
|
|
221
|
-
movingDoorNode.width,
|
|
222
|
-
movingDoorNode.height,
|
|
223
|
-
movingDoorNode.id,
|
|
224
|
-
)
|
|
225
|
-
|
|
226
|
-
updateCursor(
|
|
227
|
-
wallLocalToWorld(
|
|
228
|
-
event.node,
|
|
229
|
-
clampedX,
|
|
230
|
-
clampedY,
|
|
231
|
-
getLevelYOffset(),
|
|
232
|
-
getSlabElevation(event),
|
|
233
|
-
),
|
|
234
|
-
cursorRotation,
|
|
235
|
-
valid,
|
|
236
|
-
)
|
|
237
|
-
event.stopPropagation()
|
|
238
|
-
}
|
|
239
|
-
|
|
240
|
-
const onWallClick = (event: WallEvent) => {
|
|
241
|
-
if (!isValidWallSideFace(event.normal)) return
|
|
242
|
-
if (isCurvedWall(event.node)) return
|
|
243
|
-
if (event.node.parentId !== getLevelId()) return
|
|
244
|
-
|
|
245
|
-
const { side, itemRotation } = getPlacementOrientation(event)
|
|
246
|
-
|
|
247
|
-
const localX = snapToHalf(event.localPosition[0])
|
|
248
|
-
const { clampedX, clampedY } = clampToWall(
|
|
249
|
-
event.node,
|
|
250
|
-
localX,
|
|
251
|
-
movingDoorNode.width,
|
|
252
|
-
movingDoorNode.height,
|
|
253
|
-
)
|
|
254
|
-
|
|
255
|
-
const valid = !hasWallChildOverlap(
|
|
256
|
-
event.node.id,
|
|
257
|
-
clampedX,
|
|
258
|
-
clampedY,
|
|
259
|
-
movingDoorNode.width,
|
|
260
|
-
movingDoorNode.height,
|
|
261
|
-
movingDoorNode.id,
|
|
262
|
-
)
|
|
263
|
-
if (!valid) return
|
|
264
|
-
|
|
265
|
-
let placedId: string
|
|
266
|
-
|
|
267
|
-
if (isNew) {
|
|
268
|
-
useScene.getState().deleteNode(movingDoorNode.id)
|
|
269
|
-
useScene.temporal.getState().resume()
|
|
270
|
-
|
|
271
|
-
const cloned = structuredClone(movingDoorNode) as any
|
|
272
|
-
delete cloned.id
|
|
273
|
-
const node = DoorNode.parse({
|
|
274
|
-
...cloned,
|
|
275
|
-
position: [clampedX, clampedY, 0],
|
|
276
|
-
rotation: [0, itemRotation, 0],
|
|
277
|
-
side,
|
|
278
|
-
wallId: event.node.id,
|
|
279
|
-
parentId: event.node.id,
|
|
280
|
-
})
|
|
281
|
-
useScene.getState().createNode(node, event.node.id as AnyNodeId)
|
|
282
|
-
placedId = node.id
|
|
283
|
-
} else {
|
|
284
|
-
useScene.getState().updateNode(movingDoorNode.id, {
|
|
285
|
-
position: original.position,
|
|
286
|
-
rotation: original.rotation,
|
|
287
|
-
side: original.side,
|
|
288
|
-
parentId: original.parentId,
|
|
289
|
-
wallId: original.wallId,
|
|
290
|
-
metadata: original.metadata,
|
|
291
|
-
})
|
|
292
|
-
useScene.temporal.getState().resume()
|
|
293
|
-
|
|
294
|
-
useScene.getState().updateNode(movingDoorNode.id, {
|
|
295
|
-
position: [clampedX, clampedY, 0],
|
|
296
|
-
rotation: [0, itemRotation, 0],
|
|
297
|
-
side,
|
|
298
|
-
parentId: event.node.id,
|
|
299
|
-
wallId: event.node.id,
|
|
300
|
-
metadata: {},
|
|
301
|
-
})
|
|
302
|
-
|
|
303
|
-
if (original.parentId && original.parentId !== event.node.id) {
|
|
304
|
-
markWallDirty(original.parentId)
|
|
305
|
-
}
|
|
306
|
-
placedId = movingDoorNode.id
|
|
307
|
-
}
|
|
308
|
-
|
|
309
|
-
markWallDirty(event.node.id)
|
|
310
|
-
useLiveTransforms.getState().clear(movingDoorNode.id)
|
|
311
|
-
useScene.temporal.getState().pause()
|
|
312
|
-
|
|
313
|
-
sfxEmitter.emit('sfx:item-place')
|
|
314
|
-
hideCursor()
|
|
315
|
-
useViewer.getState().setSelection({ selectedIds: [placedId] })
|
|
316
|
-
exitMoveMode()
|
|
317
|
-
event.stopPropagation()
|
|
318
|
-
}
|
|
319
|
-
|
|
320
|
-
const onWallLeave = () => {
|
|
321
|
-
hideCursor()
|
|
322
|
-
useLiveTransforms.getState().clear(movingDoorNode.id)
|
|
323
|
-
if (isNew) return
|
|
324
|
-
if (currentWallId && currentWallId !== original.parentId) {
|
|
325
|
-
markWallDirty(currentWallId)
|
|
326
|
-
}
|
|
327
|
-
currentWallId = original.parentId
|
|
328
|
-
useScene.getState().updateNode(movingDoorNode.id, {
|
|
329
|
-
position: original.position,
|
|
330
|
-
rotation: original.rotation,
|
|
331
|
-
side: original.side,
|
|
332
|
-
parentId: original.parentId,
|
|
333
|
-
wallId: original.wallId,
|
|
334
|
-
})
|
|
335
|
-
if (original.parentId) markWallDirty(original.parentId)
|
|
336
|
-
}
|
|
337
|
-
|
|
338
|
-
const onCancel = () => {
|
|
339
|
-
useLiveTransforms.getState().clear(movingDoorNode.id)
|
|
340
|
-
if (isNew) {
|
|
341
|
-
useScene.getState().deleteNode(movingDoorNode.id)
|
|
342
|
-
if (currentWallId) markWallDirty(currentWallId)
|
|
343
|
-
} else {
|
|
344
|
-
useScene.getState().updateNode(movingDoorNode.id, {
|
|
345
|
-
position: original.position,
|
|
346
|
-
rotation: original.rotation,
|
|
347
|
-
side: original.side,
|
|
348
|
-
parentId: original.parentId,
|
|
349
|
-
wallId: original.wallId,
|
|
350
|
-
metadata: original.metadata,
|
|
351
|
-
})
|
|
352
|
-
if (original.parentId) markWallDirty(original.parentId)
|
|
353
|
-
}
|
|
354
|
-
useScene.temporal.getState().resume()
|
|
355
|
-
hideCursor()
|
|
356
|
-
exitMoveMode()
|
|
357
|
-
}
|
|
358
|
-
|
|
359
|
-
emitter.on('wall:enter', onWallEnter)
|
|
360
|
-
emitter.on('wall:move', onWallMove)
|
|
361
|
-
emitter.on('wall:click', onWallClick)
|
|
362
|
-
emitter.on('wall:leave', onWallLeave)
|
|
363
|
-
emitter.on('tool:cancel', onCancel)
|
|
364
|
-
|
|
365
|
-
return () => {
|
|
366
|
-
const current = useScene.getState().nodes[movingDoorNode.id as AnyNodeId] as
|
|
367
|
-
| DoorNode
|
|
368
|
-
| undefined
|
|
369
|
-
const currentMeta = current?.metadata as Record<string, unknown> | undefined
|
|
370
|
-
if (currentMeta?.isTransient) {
|
|
371
|
-
if (isNew) {
|
|
372
|
-
useScene.getState().deleteNode(movingDoorNode.id)
|
|
373
|
-
if (currentWallId) markWallDirty(currentWallId)
|
|
374
|
-
} else {
|
|
375
|
-
useScene.getState().updateNode(movingDoorNode.id, {
|
|
376
|
-
position: original.position,
|
|
377
|
-
rotation: original.rotation,
|
|
378
|
-
side: original.side,
|
|
379
|
-
parentId: original.parentId,
|
|
380
|
-
wallId: original.wallId,
|
|
381
|
-
metadata: original.metadata,
|
|
382
|
-
})
|
|
383
|
-
if (original.parentId) markWallDirty(original.parentId)
|
|
384
|
-
}
|
|
385
|
-
}
|
|
386
|
-
useLiveTransforms.getState().clear(movingDoorNode.id)
|
|
387
|
-
useScene.temporal.getState().resume()
|
|
388
|
-
emitter.off('wall:enter', onWallEnter)
|
|
389
|
-
emitter.off('wall:move', onWallMove)
|
|
390
|
-
emitter.off('wall:click', onWallClick)
|
|
391
|
-
emitter.off('wall:leave', onWallLeave)
|
|
392
|
-
emitter.off('tool:cancel', onCancel)
|
|
393
|
-
}
|
|
394
|
-
}, [movingDoorNode, exitMoveMode])
|
|
395
|
-
|
|
396
|
-
const edgesGeo = useMemo(() => {
|
|
397
|
-
const boxGeo = new BoxGeometry(
|
|
398
|
-
movingDoorNode.width,
|
|
399
|
-
movingDoorNode.height,
|
|
400
|
-
movingDoorNode.frameDepth ?? 0.07,
|
|
401
|
-
)
|
|
402
|
-
const geo = new EdgesGeometry(boxGeo)
|
|
403
|
-
boxGeo.dispose()
|
|
404
|
-
return geo
|
|
405
|
-
}, [movingDoorNode])
|
|
406
|
-
|
|
407
|
-
return (
|
|
408
|
-
<group ref={cursorGroupRef} visible={false}>
|
|
409
|
-
<lineSegments geometry={edgesGeo} layers={EDITOR_LAYER} material={edgeMaterial} />
|
|
410
|
-
</group>
|
|
411
|
-
)
|
|
412
|
-
}
|
|
@@ -1,178 +0,0 @@
|
|
|
1
|
-
'use client'
|
|
2
|
-
|
|
3
|
-
import {
|
|
4
|
-
type AnyNodeId,
|
|
5
|
-
emitter,
|
|
6
|
-
type FenceNode,
|
|
7
|
-
type GridEvent,
|
|
8
|
-
getClampedWallCurveOffset,
|
|
9
|
-
getMaxWallCurveOffset,
|
|
10
|
-
getWallChordFrame,
|
|
11
|
-
getWallMidpointHandlePoint,
|
|
12
|
-
normalizeWallCurveOffset,
|
|
13
|
-
pauseSceneHistory,
|
|
14
|
-
resumeSceneHistory,
|
|
15
|
-
useScene,
|
|
16
|
-
} from '@pascal-app/core'
|
|
17
|
-
import { useViewer } from '@pascal-app/viewer'
|
|
18
|
-
import { useCallback, useEffect, useRef, useState } from 'react'
|
|
19
|
-
import { markToolCancelConsumed } from '../../../hooks/use-keyboard'
|
|
20
|
-
import { sfxEmitter } from '../../../lib/sfx-bus'
|
|
21
|
-
import useEditor from '../../../store/use-editor'
|
|
22
|
-
import { CursorSphere } from '../shared/cursor-sphere'
|
|
23
|
-
import { getWallGridStep, snapScalarToGrid } from '../wall/wall-drafting'
|
|
24
|
-
|
|
25
|
-
export const CurveFenceTool: React.FC<{ node: FenceNode }> = ({ node }) => {
|
|
26
|
-
const activatedAtRef = useRef<number>(Date.now())
|
|
27
|
-
const originalCurveOffsetRef = useRef(getClampedWallCurveOffset(node))
|
|
28
|
-
const previousCurveOffsetRef = useRef<number | null>(null)
|
|
29
|
-
const shiftPressedRef = useRef(false)
|
|
30
|
-
const previewOffsetRef = useRef<number>(originalCurveOffsetRef.current)
|
|
31
|
-
|
|
32
|
-
const initialHandle = getWallMidpointHandlePoint(node)
|
|
33
|
-
const [cursorLocalPos, setCursorLocalPos] = useState<[number, number, number]>([
|
|
34
|
-
initialHandle.x,
|
|
35
|
-
0,
|
|
36
|
-
initialHandle.y,
|
|
37
|
-
])
|
|
38
|
-
|
|
39
|
-
const exitCurveMode = useCallback(() => {
|
|
40
|
-
useEditor.getState().setCurvingFence(null)
|
|
41
|
-
}, [])
|
|
42
|
-
|
|
43
|
-
useEffect(() => {
|
|
44
|
-
const nodeId = node.id
|
|
45
|
-
const originalCurveOffset = originalCurveOffsetRef.current
|
|
46
|
-
const chord = getWallChordFrame(node)
|
|
47
|
-
const maxCurveOffset = getMaxWallCurveOffset(node)
|
|
48
|
-
|
|
49
|
-
pauseSceneHistory(useScene)
|
|
50
|
-
let wasCommitted = false
|
|
51
|
-
|
|
52
|
-
const applyPreview = (curveOffset: number) => {
|
|
53
|
-
if (previewOffsetRef.current === curveOffset) {
|
|
54
|
-
return
|
|
55
|
-
}
|
|
56
|
-
previewOffsetRef.current = curveOffset
|
|
57
|
-
|
|
58
|
-
const nextNode = {
|
|
59
|
-
...node,
|
|
60
|
-
curveOffset,
|
|
61
|
-
}
|
|
62
|
-
const handlePoint = getWallMidpointHandlePoint(nextNode)
|
|
63
|
-
setCursorLocalPos([handlePoint.x, 0, handlePoint.y])
|
|
64
|
-
useScene.getState().updateNode(nodeId, { curveOffset })
|
|
65
|
-
useScene.getState().markDirty(nodeId as AnyNodeId)
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
const restoreOriginal = () => {
|
|
69
|
-
if (previewOffsetRef.current === originalCurveOffset) {
|
|
70
|
-
return
|
|
71
|
-
}
|
|
72
|
-
previewOffsetRef.current = originalCurveOffset
|
|
73
|
-
useScene.getState().updateNode(nodeId, { curveOffset: originalCurveOffset })
|
|
74
|
-
useScene.getState().markDirty(nodeId as AnyNodeId)
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
const onGridMove = (event: GridEvent) => {
|
|
78
|
-
const snapStep = getWallGridStep()
|
|
79
|
-
const localX = shiftPressedRef.current
|
|
80
|
-
? event.localPosition[0]
|
|
81
|
-
: snapScalarToGrid(event.localPosition[0], snapStep)
|
|
82
|
-
const localZ = shiftPressedRef.current
|
|
83
|
-
? event.localPosition[2]
|
|
84
|
-
: snapScalarToGrid(event.localPosition[2], snapStep)
|
|
85
|
-
|
|
86
|
-
const offsetFromMidpoint = -(
|
|
87
|
-
(localX - chord.midpoint.x) * chord.normal.x +
|
|
88
|
-
(localZ - chord.midpoint.y) * chord.normal.y
|
|
89
|
-
)
|
|
90
|
-
const snappedOffset = shiftPressedRef.current
|
|
91
|
-
? offsetFromMidpoint
|
|
92
|
-
: snapScalarToGrid(offsetFromMidpoint, snapStep)
|
|
93
|
-
const nextCurveOffset = normalizeWallCurveOffset(
|
|
94
|
-
node,
|
|
95
|
-
Math.max(-maxCurveOffset, Math.min(maxCurveOffset, snappedOffset)),
|
|
96
|
-
)
|
|
97
|
-
|
|
98
|
-
if (
|
|
99
|
-
previousCurveOffsetRef.current !== null &&
|
|
100
|
-
nextCurveOffset !== previousCurveOffsetRef.current
|
|
101
|
-
) {
|
|
102
|
-
sfxEmitter.emit('sfx:grid-snap')
|
|
103
|
-
}
|
|
104
|
-
previousCurveOffsetRef.current = nextCurveOffset
|
|
105
|
-
|
|
106
|
-
applyPreview(nextCurveOffset)
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
const onGridClick = (event: GridEvent) => {
|
|
110
|
-
if (Date.now() - activatedAtRef.current < 150) {
|
|
111
|
-
event.nativeEvent?.stopPropagation?.()
|
|
112
|
-
return
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
const curveOffset = previewOffsetRef.current
|
|
116
|
-
wasCommitted = true
|
|
117
|
-
|
|
118
|
-
if (curveOffset !== originalCurveOffset) {
|
|
119
|
-
useScene.getState().updateNode(nodeId, { curveOffset: originalCurveOffset })
|
|
120
|
-
useScene.getState().markDirty(nodeId as AnyNodeId)
|
|
121
|
-
|
|
122
|
-
resumeSceneHistory(useScene)
|
|
123
|
-
useScene.getState().updateNode(nodeId, { curveOffset })
|
|
124
|
-
useScene.getState().markDirty(nodeId as AnyNodeId)
|
|
125
|
-
pauseSceneHistory(useScene)
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
sfxEmitter.emit('sfx:item-place')
|
|
129
|
-
useViewer.getState().setSelection({ selectedIds: [nodeId] })
|
|
130
|
-
exitCurveMode()
|
|
131
|
-
event.nativeEvent?.stopPropagation?.()
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
const onCancel = () => {
|
|
135
|
-
restoreOriginal()
|
|
136
|
-
useViewer.getState().setSelection({ selectedIds: [nodeId] })
|
|
137
|
-
resumeSceneHistory(useScene)
|
|
138
|
-
markToolCancelConsumed()
|
|
139
|
-
exitCurveMode()
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
const onKeyDown = (event: KeyboardEvent) => {
|
|
143
|
-
if (event.key === 'Shift') {
|
|
144
|
-
shiftPressedRef.current = true
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
const onKeyUp = (event: KeyboardEvent) => {
|
|
149
|
-
if (event.key === 'Shift') {
|
|
150
|
-
shiftPressedRef.current = false
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
|
|
154
|
-
emitter.on('grid:move', onGridMove)
|
|
155
|
-
emitter.on('grid:click', onGridClick)
|
|
156
|
-
emitter.on('tool:cancel', onCancel)
|
|
157
|
-
window.addEventListener('keydown', onKeyDown)
|
|
158
|
-
window.addEventListener('keyup', onKeyUp)
|
|
159
|
-
|
|
160
|
-
return () => {
|
|
161
|
-
if (!wasCommitted) {
|
|
162
|
-
restoreOriginal()
|
|
163
|
-
}
|
|
164
|
-
resumeSceneHistory(useScene)
|
|
165
|
-
emitter.off('grid:move', onGridMove)
|
|
166
|
-
emitter.off('grid:click', onGridClick)
|
|
167
|
-
emitter.off('tool:cancel', onCancel)
|
|
168
|
-
window.removeEventListener('keydown', onKeyDown)
|
|
169
|
-
window.removeEventListener('keyup', onKeyUp)
|
|
170
|
-
}
|
|
171
|
-
}, [exitCurveMode, node])
|
|
172
|
-
|
|
173
|
-
return (
|
|
174
|
-
<group>
|
|
175
|
-
<CursorSphere position={cursorLocalPos} showTooltip={false} />
|
|
176
|
-
</group>
|
|
177
|
-
)
|
|
178
|
-
}
|