feat(nodes): mode-aware roof-segment edit + 2D rotation parity with 3D
Roof-segment edit/move ignored the active snap mode and showed no chip: - add snapProfile:'structural' so a body-move resolves the no-angle polygon context (grid/lines/off) like every other structural move; - resize uses getSegmentGridStep() (0 outside grid mode = the "smooth" resize that used to need a held Shift), dropping the captured gridSnapStep + Shift; - move drops its Shift bypass; - the affordance dispatcher opens a boundary reshape scope for the resize so the snapping chip shows and the context resolves. 2D rotation handles now match the 3D gizmo across all six rotate affordances (column / elevator / roof-segment / shelf / spawn / stair): a shared rotateAffordanceDelta snaps to the 15° step unless Shift (free), the dispatcher opens the same ROTATE_HANDLE_DRAG_LABEL handle-drag scope the 3D gizmo uses so the contextual HUD shows the "Shift = rotate freely" hint, and the live degree readout snaps to match the committed rotation. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
7512fccdaf
commit
84cdf4519d
@@ -4,6 +4,7 @@ import {
|
||||
type FloorplanAffordance,
|
||||
useScene,
|
||||
} from '@pascal-app/core'
|
||||
import { rotateAffordanceDelta } from '../shared/rotate-affordance'
|
||||
|
||||
// Floor minimums — mirror the 3D handles in `column/definition.ts` so a
|
||||
// drag can't push a value past what the renderer accepts.
|
||||
@@ -146,11 +147,13 @@ export const columnRotateAffordance: FloorplanAffordance<ColumnNode> = {
|
||||
|
||||
return {
|
||||
affectedIds: [columnId],
|
||||
apply({ planPoint }) {
|
||||
const currentAngle = Math.atan2(planPoint[1] - cz, planPoint[0] - cx)
|
||||
let delta = currentAngle - initialAngle
|
||||
while (delta > Math.PI) delta -= 2 * Math.PI
|
||||
while (delta < -Math.PI) delta += 2 * Math.PI
|
||||
apply({ planPoint, modifiers }) {
|
||||
const delta = rotateAffordanceDelta({
|
||||
center: [cx, cz],
|
||||
initialAngle,
|
||||
planPoint,
|
||||
free: modifiers.shiftKey,
|
||||
})
|
||||
const newRotation = initialRotation - delta
|
||||
lastRotation = newRotation
|
||||
useScene.getState().updateNode(columnId, { rotation: newRotation })
|
||||
|
||||
@@ -4,6 +4,7 @@ import {
|
||||
type FloorplanAffordance,
|
||||
useScene,
|
||||
} from '@pascal-app/core'
|
||||
import { rotateAffordanceDelta } from '../shared/rotate-affordance'
|
||||
|
||||
const MIN_ELEVATOR_DIM = 0.6
|
||||
|
||||
@@ -83,11 +84,13 @@ export const elevatorRotateAffordance: FloorplanAffordance<ElevatorNode> = {
|
||||
|
||||
return {
|
||||
affectedIds: [elevatorId],
|
||||
apply({ planPoint }) {
|
||||
const currentAngle = Math.atan2(planPoint[1] - cz, planPoint[0] - cx)
|
||||
let delta = currentAngle - initialAngle
|
||||
while (delta > Math.PI) delta -= 2 * Math.PI
|
||||
while (delta < -Math.PI) delta += 2 * Math.PI
|
||||
apply({ planPoint, modifiers }) {
|
||||
const delta = rotateAffordanceDelta({
|
||||
center: [cx, cz],
|
||||
initialAngle,
|
||||
planPoint,
|
||||
free: modifiers.shiftKey,
|
||||
})
|
||||
const newRotation = initialRotation - delta
|
||||
lastRotation = newRotation
|
||||
useScene.getState().updateNode(elevatorId, { rotation: newRotation })
|
||||
|
||||
@@ -267,6 +267,11 @@ export const roofSegmentDefinition: NodeDefinition<typeof RoofSegmentNode> = {
|
||||
schema: RoofSegmentNode,
|
||||
category: 'structure',
|
||||
surfaceRole: 'roof',
|
||||
// Mirrors the parent roof: a body-move resolves the no-angle `polygon`
|
||||
// snap context (grid / lines / off), so dragging a segment shows the
|
||||
// snapping chip and honours the active mode like every other structural
|
||||
// move. Resize / rotate run through their own reshaping scope.
|
||||
snapProfile: 'structural',
|
||||
|
||||
defaults: () => {
|
||||
const stub = RoofSegmentNodeSchema.parse({
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
} from '@pascal-app/core'
|
||||
import { getSegmentGridStep } from '@pascal-app/editor'
|
||||
import { createFloorplanCursorResolver } from '../shared/floorplan-cursor'
|
||||
import { rotateAffordanceDelta } from '../shared/rotate-affordance'
|
||||
|
||||
const MIN_ROOF_DIM = 1
|
||||
|
||||
@@ -59,7 +60,7 @@ function resolveSegmentFrame(
|
||||
* the math survives any parent-roof rotation.
|
||||
*/
|
||||
export const roofSegmentResizeAffordance: FloorplanAffordance<RoofSegmentNode> = {
|
||||
start({ node, payload, nodes, initialPlanPoint, gridSnapStep }) {
|
||||
start({ node, payload, nodes, initialPlanPoint }) {
|
||||
const { axis, side } = payload as RoofSegmentResizePayload
|
||||
const segmentId = node.id as AnyNodeId
|
||||
const initialValue = axis === 'x' ? node.width : node.depth
|
||||
@@ -79,12 +80,15 @@ export const roofSegmentResizeAffordance: FloorplanAffordance<RoofSegmentNode> =
|
||||
|
||||
return {
|
||||
affectedIds: [segmentId],
|
||||
apply({ planPoint, modifiers }) {
|
||||
apply({ planPoint }) {
|
||||
const currentLocal = projectLocalAxis(planPoint[0], planPoint[1])
|
||||
const delta = (currentLocal - initialLocal) * side
|
||||
const rawValue = initialValue + 2 * delta
|
||||
const snappedValue =
|
||||
!modifiers.shiftKey && gridSnapStep > 0 ? snapScalar(rawValue, gridSnapStep) : rawValue
|
||||
// Mode-aware grid step (0 outside grid mode, so `lines` / `off` resize
|
||||
// freely — the "smooth" behaviour that used to need a held Shift). The
|
||||
// reshaping scope opened by the dispatcher resolves the `polygon` set.
|
||||
const step = getSegmentGridStep()
|
||||
const snappedValue = step > 0 ? snapScalar(rawValue, step) : rawValue
|
||||
const newValue = Math.max(MIN_ROOF_DIM, snappedValue)
|
||||
lastValue = newValue
|
||||
useScene
|
||||
@@ -121,11 +125,13 @@ export const roofSegmentRotateAffordance: FloorplanAffordance<RoofSegmentNode> =
|
||||
|
||||
return {
|
||||
affectedIds: [segmentId],
|
||||
apply({ planPoint }) {
|
||||
const currentAngle = Math.atan2(planPoint[1] - cz, planPoint[0] - cx)
|
||||
let delta = currentAngle - initialAngle
|
||||
while (delta > Math.PI) delta -= 2 * Math.PI
|
||||
while (delta < -Math.PI) delta += 2 * Math.PI
|
||||
apply({ planPoint, modifiers }) {
|
||||
const delta = rotateAffordanceDelta({
|
||||
center: [cx, cz],
|
||||
initialAngle,
|
||||
planPoint,
|
||||
free: modifiers.shiftKey,
|
||||
})
|
||||
lastRotation = initialRotation - delta
|
||||
useScene.getState().updateNode(segmentId, { rotation: lastRotation })
|
||||
},
|
||||
@@ -168,9 +174,12 @@ export const roofSegmentMoveTarget: FloorplanMoveTarget<RoofSegmentNode> = ({ no
|
||||
|
||||
return {
|
||||
affectedIds: [segmentId],
|
||||
apply({ planPoint, modifiers }) {
|
||||
apply({ planPoint }) {
|
||||
// Mode-aware: `getSegmentGridStep()` is 0 outside grid mode (so `lines` /
|
||||
// `off` move freely), and the `moving` scope resolves the `polygon` set
|
||||
// via the kind's `snapProfile` — no held-Shift bypass.
|
||||
const step = getSegmentGridStep()
|
||||
const snap = (value: number) => (modifiers.shiftKey ? value : snapScalar(value, step))
|
||||
const snap = (value: number) => snapScalar(value, step)
|
||||
const worldPoint = resolveCursor(planPoint, { snap })
|
||||
const dx = worldPoint[0] - roofPosX
|
||||
const dz = worldPoint[1] - roofPosZ
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import { DEFAULT_ANGLE_STEP } from '@pascal-app/core'
|
||||
|
||||
/**
|
||||
* Shared rotation delta for the 2D corner rotate-arrow affordances (column /
|
||||
* elevator / roof-segment / shelf / spawn / stair — all structurally
|
||||
* identical). Measures the pointer's angular sweep from the grab bearing
|
||||
* around the node center, wrapped to [-π, π] so a drag crossing ±π keeps its
|
||||
* sign, then snaps it to the 15° increment unless `free` (the held Shift the
|
||||
* contextual HUD advertises). The 2D twin of the 3D gizmo's
|
||||
* `snapDirectRotationDelta`, so rotating a node reads the same in both views.
|
||||
*/
|
||||
export function rotateAffordanceDelta(args: {
|
||||
center: readonly [number, number]
|
||||
initialAngle: number
|
||||
planPoint: readonly [number, number]
|
||||
free: boolean
|
||||
}): number {
|
||||
const { center, initialAngle, planPoint, free } = args
|
||||
const currentAngle = Math.atan2(planPoint[1] - center[1], planPoint[0] - center[0])
|
||||
let delta = currentAngle - initialAngle
|
||||
while (delta > Math.PI) delta -= 2 * Math.PI
|
||||
while (delta < -Math.PI) delta += 2 * Math.PI
|
||||
return free ? delta : Math.round(delta / DEFAULT_ANGLE_STEP) * DEFAULT_ANGLE_STEP
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import {
|
||||
type ShelfNode,
|
||||
useScene,
|
||||
} from '@pascal-app/core'
|
||||
import { rotateAffordanceDelta } from '../shared/rotate-affordance'
|
||||
|
||||
// Mirror the 3D handles in `shelf/definition.ts` so a drag can't push a
|
||||
// value past what the renderer / geometry builder accepts.
|
||||
@@ -82,11 +83,13 @@ export const shelfRotateAffordance: FloorplanAffordance<ShelfNode> = {
|
||||
|
||||
return {
|
||||
affectedIds: [shelfId],
|
||||
apply({ planPoint }) {
|
||||
const currentAngle = Math.atan2(planPoint[1] - cz, planPoint[0] - cx)
|
||||
let delta = currentAngle - initialAngle
|
||||
while (delta > Math.PI) delta -= 2 * Math.PI
|
||||
while (delta < -Math.PI) delta += 2 * Math.PI
|
||||
apply({ planPoint, modifiers }) {
|
||||
const delta = rotateAffordanceDelta({
|
||||
center: [cx, cz],
|
||||
initialAngle,
|
||||
planPoint,
|
||||
free: modifiers.shiftKey,
|
||||
})
|
||||
const newRotationY = initialRotationY - delta
|
||||
lastRotation = [r[0], newRotationY, r[2]]
|
||||
useScene.getState().updateNode(shelfId, { rotation: lastRotation })
|
||||
|
||||
@@ -4,6 +4,7 @@ import {
|
||||
type SpawnNode,
|
||||
useScene,
|
||||
} from '@pascal-app/core'
|
||||
import { rotateAffordanceDelta } from '../shared/rotate-affordance'
|
||||
|
||||
export const spawnRotateAffordance: FloorplanAffordance<SpawnNode> = {
|
||||
start({ node, initialPlanPoint }) {
|
||||
@@ -16,11 +17,13 @@ export const spawnRotateAffordance: FloorplanAffordance<SpawnNode> = {
|
||||
|
||||
return {
|
||||
affectedIds: [spawnId],
|
||||
apply({ planPoint }) {
|
||||
const currentAngle = Math.atan2(planPoint[1] - cz, planPoint[0] - cx)
|
||||
let delta = currentAngle - initialAngle
|
||||
while (delta > Math.PI) delta -= 2 * Math.PI
|
||||
while (delta < -Math.PI) delta += 2 * Math.PI
|
||||
apply({ planPoint, modifiers }) {
|
||||
const delta = rotateAffordanceDelta({
|
||||
center: [cx, cz],
|
||||
initialAngle,
|
||||
planPoint,
|
||||
free: modifiers.shiftKey,
|
||||
})
|
||||
lastRotation = initialRotation - delta
|
||||
useScene.getState().updateNode(spawnId, { rotation: lastRotation })
|
||||
},
|
||||
|
||||
@@ -6,6 +6,7 @@ import {
|
||||
type StairSegmentNode,
|
||||
useScene,
|
||||
} from '@pascal-app/core'
|
||||
import { rotateAffordanceDelta } from '../shared/rotate-affordance'
|
||||
|
||||
// Minimums + max sweep mirror the 3D handles in
|
||||
// `packages/editor/src/components/editor/stair-segment-handles.tsx` so a 2D
|
||||
@@ -232,12 +233,13 @@ export const stairRotateAffordance: FloorplanAffordance<StairNode> = {
|
||||
|
||||
return {
|
||||
affectedIds: [stairId],
|
||||
apply({ planPoint }) {
|
||||
const currentAngle = Math.atan2(planPoint[1] - cz, planPoint[0] - cx)
|
||||
let delta = currentAngle - initialAngle
|
||||
// Wrap to [-π, π] so a drag crossing ±π doesn't flip sign mid-gesture.
|
||||
while (delta > Math.PI) delta -= 2 * Math.PI
|
||||
while (delta < -Math.PI) delta += 2 * Math.PI
|
||||
apply({ planPoint, modifiers }) {
|
||||
const delta = rotateAffordanceDelta({
|
||||
center: [cx, cz],
|
||||
initialAngle,
|
||||
planPoint,
|
||||
free: modifiers.shiftKey,
|
||||
})
|
||||
const newRotation = initialRotation - delta
|
||||
lastRotation = newRotation
|
||||
useScene.getState().updateNode(stairId, { rotation: newRotation })
|
||||
|
||||
Reference in New Issue
Block a user