- useEditor.getState().setPreviewMode(false)} />
- useEditor.getState().setFirstPersonMode(false)} />
+ ) : (
+ useEditor.getState().setPreviewMode(false)} />
+ )}
+
) : (
<>
@@ -1384,8 +1391,14 @@ export default function Editor({
{!isLoading && isPreviewMode ? (
<>
- {previewViewerContent}
+ {isFirstPersonMode ? (
+
+ {previewViewerContent}
+
{previewViewerContent}
+ {isFirstPersonMode ? (
+
+ {previewViewerContent}
+
) : (
<>
diff --git a/packages/editor/src/components/editor/node-arrow-handles.tsx b/packages/editor/src/components/editor/node-arrow-handles.tsx
index 8dd51fd3..f4d5cbe8 100644
--- a/packages/editor/src/components/editor/node-arrow-handles.tsx
+++ b/packages/editor/src/components/editor/node-arrow-handles.tsx
@@ -9,6 +9,7 @@ import {
DEFAULT_ANGLE_STEP,
type HandleDescriptor,
type HandlePortal,
+ type LatchHandle,
type LinearResizeHandle,
nodeRegistry,
type RadialResizeHandle,
@@ -44,6 +45,7 @@ import { MeshBasicNodeMaterial } from 'three/webgpu'
import { EDITOR_LAYER } from '../../lib/constants'
import { RESIZE_HANDLE_DRAG_LABEL, ROTATE_HANDLE_DRAG_LABEL } from '../../lib/contextual-help'
import { createEditorApi } from '../../lib/editor-api'
+import { sfxEmitter } from '../../lib/sfx-bus'
import useDirectManipulationFeedback from '../../store/use-direct-manipulation-feedback'
import useEditor from '../../store/use-editor'
import useInteractionScope, {
@@ -112,11 +114,16 @@ export {
ARROW_COLOR,
ARROW_HOVER_COLOR,
ARROW_SCALE,
+ createArrowHandleGeometry,
createArrowHitAreaGeometry,
createEndpointHitAreaGeometry,
createMoveCrossHandleGeometry,
createRotateArrowHandleGeometry,
createRotateArrowHitAreaGeometry,
+ HandleArrow,
+ type HandleArrowInputShape,
+ type HandleArrowPlacement,
+ type HandleArrowProps,
HIT_AREA_MARGIN,
InvisibleHandleHitArea,
NO_RAYCAST,
@@ -374,6 +381,21 @@ function NodeArrowHandlesForNode({
// hook count between renders and trip React's rules-of-hooks check.
const [activeIndex, setActiveIndex] = useState
+ ),
+ label: 'Translucent',
+ },
}
const SHADING_OPTIONS = [
@@ -580,7 +607,12 @@ export const ViewerOverlay = ({
}
label={`Walls: ${wallModeConfig[wallMode as keyof typeof wallModeConfig].label}`}
onClick={() => {
- const modes: ('cutaway' | 'up' | 'down')[] = ['cutaway', 'up', 'down']
+ const modes: ('cutaway' | 'up' | 'down' | 'translucent')[] = [
+ 'cutaway',
+ 'up',
+ 'down',
+ 'translucent',
+ ]
const nextIndex = (modes.indexOf(wallMode as any) + 1) % modes.length
useViewer.getState().setWallMode(modes[nextIndex] ?? 'cutaway')
}}
@@ -641,6 +673,23 @@ export const ViewerOverlay = ({
src="/icons/topview.webp"
/>
+
+
+
+ {/* First-person walkthrough */}
+
+ {pill}
+
+
+ )
+}
+
+function GuideLine({
+ from,
+ to,
+ pill,
+ kind,
+}: {
+ from: Vec3
+ to: Vec3
+ pill?: string
+ kind: DormerGuide['kind']
+}) {
+ const { line, position } = useMemo(() => {
+ const position = new Float32BufferAttribute(new Float32Array(6), 3)
+ const geometry = new BufferGeometry()
+ geometry.setAttribute('position', position)
+ const line = new ThreeLine(geometry, kind === 'align-line' ? alignMaterial : guideMaterial)
+ line.frustumCulled = false
+ line.layers.set(EDITOR_LAYER)
+ line.renderOrder = 1000
+ return { line, position }
+ }, [kind])
+
+ position.setXYZ(0, from[0], from[1], from[2])
+ position.setXYZ(1, to[0], to[1], to[2])
+ position.needsUpdate = true
+
+ useEffect(() => () => line.geometry.dispose(), [line])
+
+ const mid: Vec3 = [(from[0] + to[0]) / 2, (from[1] + to[1]) / 2, (from[2] + to[2]) / 2]
+
+ return (
+ <>
+
+ {pill}
+
+
+ ) : null}
+
+ )
+}
diff --git a/packages/nodes/src/dormer/tool.tsx b/packages/nodes/src/dormer/tool.tsx
index d677c6a5..9b23c1cf 100644
--- a/packages/nodes/src/dormer/tool.tsx
+++ b/packages/nodes/src/dormer/tool.tsx
@@ -5,6 +5,7 @@ import { useViewer } from '@pascal-app/viewer'
import { useMemo } from 'react'
import { RoofAttachmentFallbackPreview } from '../shared/roof-attachment-fallback-preview'
import { dormerDefinition } from './definition'
+import { DormerPlacementGuides } from './placement-guides'
import DormerPreview from './preview'
import { useDormerPlacement } from './use-dormer-placement'
@@ -48,7 +49,7 @@ const DormerTool = () => {
[],
)
- const { activeBuildingId, clearPreview, segmentXform, hitLocal, ghostRotation } =
+ const { activeBuildingId, clearPreview, segmentXform, hitSegment, hitLocal, ghostRotation } =
useDormerPlacement({
onCommit: (hit, rotation) => {
const state = useScene.getState()
@@ -78,6 +79,15 @@ const DormerTool = () => {
/>
{activeBuildingId && segmentXform && hitLocal && (
+
+ )
+}
diff --git a/packages/nodes/src/duct-fitting/move-tool.tsx b/packages/nodes/src/duct-fitting/move-tool.tsx
index fb800d43..2fa7a671 100644
--- a/packages/nodes/src/duct-fitting/move-tool.tsx
+++ b/packages/nodes/src/duct-fitting/move-tool.tsx
@@ -11,6 +11,7 @@ import {
useScene,
} from '@pascal-app/core'
import {
+ consumePlacementDragRelease,
DragBoundingBox,
EDITOR_LAYER,
isGridSnapActive,
@@ -24,11 +25,13 @@ import {
import { useViewer } from '@pascal-app/viewer'
import { useEffect, useMemo, useState } from 'react'
import { Box3, Euler, type Material, type Mesh, MeshBasicMaterial, Vector3 } from 'three'
+import { autoOffsetInvalidationUpdates } from '../shared/auto-offset-tag'
import {
type Aabb2D,
collectGhostAlignmentCandidates,
resolveGhostAlignment,
} from '../shared/ghost-alignment'
+import { type RunMoveConnectivity, startRunMoveConnectivity } from '../shared/run-move-connectivity'
import { buildDuctFittingGeometry } from './geometry'
type Vec3 = [number, number, number]
@@ -176,9 +179,24 @@ export const MoveDuctFittingTool: React.FC<{ node: AnyNode }> = ({ node }) => {
}
if (existedAtStart) setMeshHidden(true)
+ // Carry connected ducts as the fitting slides: the part of the move along
+ // a run's axis stretches it, the part across translates the whole run (and
+ // propagates to its far joint). Snapshot once at drag start; only existing
+ // fittings are mated to anything.
+ const connectivity: RunMoveConnectivity | null = existedAtStart
+ ? startRunMoveConnectivity(node)
+ : null
+
let lastPos: Vec3 = originalPosition
+ // Tracks whether the last frame held Alt: the fitting is detached from its
+ // connected ducts for the drag, so they stay put (no follow) and the
+ // commit omits their updates. Mirrors the duct endpoint's Alt-detach.
+ let lastDetached = false
const onMove = (event: GridEvent) => {
+ // Alt = detach: drop the connected-duct follow so the fitting moves on
+ // its own, leaving every mated run where it sits.
+ const detached = event.nativeEvent?.altKey === true
const snap = isGridSnapActive() ? snapToGridStep : (v: number) => v
let x = snap(event.localPosition[0])
let z = snap(event.localPosition[2])
@@ -200,21 +218,29 @@ export const MoveDuctFittingTool: React.FC<{ node: AnyNode }> = ({ node }) => {
} else {
useAlignmentGuides.getState().clear()
}
+ const next: Vec3 = [x, lastPos[1], z]
- const next: Vec3 = [x, originalPosition[1], z]
if (
(isGridSnapActive() || isMagneticSnapActive()) &&
(next[0] !== lastPos[0] || next[2] !== lastPos[2])
)
triggerSFX('sfx:grid-snap')
lastPos = next
+ lastDetached = detached
hasMoved = true
setCursorPos(next)
+ // Detached: keep the followers at their origin (drop any live overrides
+ // from a prior non-detached frame). Otherwise preview the follow.
+ if (detached) connectivity?.clear()
+ else connectivity?.preview({ position: next })
}
- const commit = (event: GridEvent) => {
+ const commit = (event: GridEvent, fromDragRelease = false) => {
if (committed) return
- if (Date.now() - activatedAt < 150) {
+ // The 150ms debounce only guards click-to-place against the arming click
+ // double-firing; a press-drag release is a distinct pointerup gesture, so
+ // it skips the guard (a quick drag-flick still commits).
+ if (!fromDragRelease && Date.now() - activatedAt < 150) {
event.nativeEvent?.stopPropagation?.()
return
}
@@ -236,10 +262,24 @@ export const MoveDuctFittingTool: React.FC<{ node: AnyNode }> = ({ node }) => {
useScene.getState().createNode(created as AnyNode, node.parentId as AnyNodeId)
selectId = created.id as AnyNodeId
} else {
- useScene.getState().updateNode(nodeId, { position: lastPos } as Partial