@pascal-app/editor 1.1.0 → 1.1.2

package/src/lib/wall-pull.ts

@@ -19,13 +19,13 @@
 
 import {
   type AnyNodeId,
-  getWallCurveFrameAt,
   getWallThickness,
   useScene,
   WALL_CONSTRUCTION_FIELDS,
   type WallNode,
   type WallPlanPoint,
   wallFollowsStorey,
+  wallPullSeed,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
 import { create } from 'zustand'
@@ -34,15 +34,6 @@ import type { ContinuationMode } from './continuation'
 import { getWallDrawVariant, selectWallDrawVariant } from './wall-draw-variant'
 import { publishWallRunFeedback } from './wall-run-snap'
 
-/** The floor plan's affordance id for a wall end's pull grip (a `move-arrow`, variant `pull`). */
-export const WALL_PULL_AFFORDANCE = 'wall-pull'
-
-/** What a pull grip carries: the wall, and which of its ends it pulls from. */
-export type WallPullGripPayload = { wallId: string; endpoint: 'start' | 'end' }
-
-/** The grip's tooltip, in both views. */
-export const WALL_PULL_GRIP_TITLE = 'Drag to draw the next wall'
-
 export type WallPullRun = {
   /** Bumped per pull, so each view seeds its draft from it once. */
   seq: number
@@ -93,23 +84,6 @@ export function wallPullTypePatch(wall: WallNode, storeyHeight: number | null):
   return patch as Partial<WallNode>
 }
 
-/**
- * The pulled end of `wall` and the direction out of it: along the wall for a
- * straight one, along its tangent for a curved one.
- */
-export function wallPullSeed(
-  wall: Pick<WallNode, 'start' | 'end' | 'curveOffset'>,
-  endpoint: 'start' | 'end',
-): { start: WallPlanPoint; reference: WallPlanPoint } | null {
-  const start: WallPlanPoint =
-    endpoint === 'start' ? [wall.start[0], wall.start[1]] : [wall.end[0], wall.end[1]]
-  const tangent = getWallCurveFrameAt(wall as WallNode, endpoint === 'start' ? 0 : 1).tangent
-  const sign = endpoint === 'start' ? -1 : 1
-  const length = Math.hypot(tangent.x, tangent.y)
-  if (!(length > 1e-9)) return null
-  return { start, reference: [(tangent.x / length) * sign, (tangent.y / length) * sign] }
-}
-
 // What the pull changed for its run, put back when it ends.
 let restore: { shape: ContinuationMode; toolDefaults: Record<string, unknown> | null } | null = null
 let stopWatching: (() => void) | null = null

package/src/store/use-editor.tsx

@@ -21,6 +21,15 @@ import {
   type WallSurfaceSide,
 } from '@pascal-app/core'
 import { useViewer } from '@pascal-app/viewer'
+import {
+  cameraPoseStore,
+  type NavigationSyncPose,
+  type NavigationSyncPoseInput,
+  publishNavigationSyncPose,
+  type RoomKey,
+  sameRoom,
+  subscribeNavigationSyncPose,
+} from '@pascal-app/viewer/ui'
 import { create } from 'zustand'
 import { persist } from 'zustand/middleware'
 import {
@@ -56,7 +65,6 @@ import {
   type PaintHoverInfo,
   type PaintScope,
 } from '../lib/paint-scope'
-import { type RoomKey, sameRoom } from '../lib/room-selection'
 import {
   cycleSnappingModeIn,
   defaultSnappingModeFor,
@@ -66,8 +74,6 @@ import {
   snapContextOf,
   snappingModesFor,
 } from '../lib/snapping-mode'
-import { cameraPoseStore } from './camera-pose-store'
-import { publishNavigationSyncPoseToStore } from './navigation-sync-pose-store'
 import useInteractionScope from './use-interaction-scope'
 import {
   clampViewPaneRatio,
@@ -233,18 +239,6 @@ export type CatalogCategory =
 export type FloorplanSelectionTool = 'click' | 'marquee'
 export type GridSnapStep = 0.5 | 0.25 | 0.1 | 0.05
 
-export type NavigationSyncSource = '2d' | '3d'
-
-export type NavigationSyncPose = {
-  source: NavigationSyncSource
-  revision: number
-  target: [number, number, number]
-  azimuth: number
-  viewWidth: number
-}
-
-export type NavigationSyncPoseInput = Omit<NavigationSyncPose, 'revision'>
-
 // Combined tool type. Known literals keep autocomplete; the `(string & {})`
 // arm lets plugin-contributed tool ids (e.g. `'trees:tree'`) typecheck without
 // the host enumerating every plugin kind. The runtime dispatch is already
@@ -490,12 +484,13 @@ type EditorState = {
   setViewPinned: (viewId: string, pinned: boolean) => void
   isFloorplanHovered: boolean
   setFloorplanHovered: (hovered: boolean) => void
+  /** Mirror of viewer/ui's navigation sync store, kept for plugins that read it here. */
+  navigationSyncPose: NavigationSyncPose | null
+  publishNavigationSyncPose: (pose: NavigationSyncPoseInput) => void
   // Toggleable DWV riser-diagram (plumbing isometric) overlay.
   isRiserOpen: boolean
   setRiserOpen: (open: boolean) => void
   toggleRiserOpen: () => void
-  navigationSyncPose: NavigationSyncPose | null
-  publishNavigationSyncPose: (pose: NavigationSyncPoseInput) => void
   floorplanSelectionTool: FloorplanSelectionTool
   setFloorplanSelectionTool: (tool: FloorplanSelectionTool) => void
   gridSnapStep: GridSnapStep
@@ -1538,18 +1533,11 @@ const useEditor = create<EditorState>()(
         set((state) => ({ pinnedViews: { ...state.pinnedViews, [viewId]: pinned } })),
       isFloorplanHovered: false,
       setFloorplanHovered: (hovered) => set({ isFloorplanHovered: hovered }),
+      navigationSyncPose: null,
+      publishNavigationSyncPose,
       isRiserOpen: false,
       setRiserOpen: (open) => set({ isRiserOpen: open }),
       toggleRiserOpen: () => set((state) => ({ isRiserOpen: !state.isRiserOpen })),
-      navigationSyncPose: null,
-      publishNavigationSyncPose: (pose) => {
-        const navigationSyncPose = {
-          ...pose,
-          revision: (get().navigationSyncPose?.revision ?? 0) + 1,
-        }
-        publishNavigationSyncPoseToStore(navigationSyncPose)
-        set({ navigationSyncPose })
-      },
       floorplanSelectionTool: 'click' as FloorplanSelectionTool,
       setFloorplanSelectionTool: (tool) => set({ floorplanSelectionTool: tool }),
       gridSnapStep: DEFAULT_PERSISTED_EDITOR_LAYOUT_STATE.gridSnapStep,
@@ -1863,4 +1851,7 @@ usePaintRegionMode.subscribe((state) => {
   if (useEditor.getState().paintEraser !== paintEraser) useEditor.setState({ paintEraser })
 })
 
+// Published plugins read the 2D/3D navigation pose from the editor store; the shared store owns it.
+subscribeNavigationSyncPose((navigationSyncPose) => useEditor.setState({ navigationSyncPose }))
+
 export default useEditor

package/src/store/use-floorplan-annotation-visibility.ts

@@ -1,5 +1,10 @@
 'use client'
 
+import {
+  DEFAULT_FLOORPLAN_WALL_DIMENSION_FACES,
+  type FloorplanWallDimensionFaces,
+  normalizeFloorplanWallDimensionFaces,
+} from '@pascal-app/core'
 import { create } from 'zustand'
 import { persist } from 'zustand/middleware'
 import {
@@ -8,11 +13,6 @@ import {
   type FloorplanAnnotationVisibility,
   normalizeFloorplanAnnotationVisibility,
 } from '../lib/floorplan/annotation-visibility'
-import {
-  DEFAULT_FLOORPLAN_WALL_DIMENSION_FACES,
-  type FloorplanWallDimensionFaces,
-  normalizeFloorplanWallDimensionFaces,
-} from '../lib/floorplan/floorplan-extension'
 
 type PersistedFloorplanAnnotationState = {
   visibility: FloorplanAnnotationVisibility

package/src/store/use-wall-region-handles-selection.ts

@@ -1,10 +1,9 @@
 import { type AnyNodeId, useScene } from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
+import { isTypingTarget, useViewer } from '@pascal-app/viewer'
 import { create } from 'zustand'
 import { hasLiveGestures } from '../lib/gesture-lifecycle'
 import { removeWallRegion } from '../lib/paint-regions'
 import { sfxEmitter } from '../lib/sfx-bus'
-import { isTypingTarget } from '../lib/typing-target'
 import useDeleteConfirmation from './use-delete-confirmation'
 import useInteractionScope from './use-interaction-scope'
 

package/src/components/editor/__bench__/room-label-placement.bench.ts

@@ -1,108 +0,0 @@
-import type { Polygon } from '@pascal-app/core'
-import {
-  type PillCandidate,
-  placePills,
-  type RoomHit,
-  type RoomLabelEntry,
-  roomAt,
-} from '../room-labels'
-
-// One room-label placement pass and one pointer pick, for a 900 × 600 px house of 31, 60 and 120
-// rooms (every third an L), printed as JSON medians in ms. Run with `bun run <this file>`.
-let seed = 11
-const random = () => {
-  seed = (seed * 1_103_515_245 + 12_345) % 2 ** 31
-  return seed / 2 ** 31
-}
-
-function house(count: number) {
-  const columns = Math.ceil(Math.sqrt(count * 1.5))
-  const rows = Math.ceil(count / columns)
-  const width = 900 / columns
-  const depth = 600 / rows
-  return Array.from({ length: count }, (_, i) => {
-    const left = 270 + (i % columns) * width
-    const top = 150 + Math.floor(i / columns) * depth
-    const right = left + width
-    const bottom = top + depth
-    const outer: [number, number][] =
-      i % 3 === 0
-        ? [
-            [left, top],
-            [right, top],
-            [right, top + depth / 2],
-            [left + width / 2, top + depth / 2],
-            [left + width / 2, bottom],
-            [left, bottom],
-          ]
-        : [
-            [left, top],
-            [right, top],
-            [right, bottom],
-            [left, bottom],
-          ]
-    const outline: Polygon = { outer, holes: [] }
-    const pill = 60 + random() * 110
-    const candidate: PillCandidate = {
-      id: `room_${i}`,
-      x: left + width / 4,
-      y: top + depth / 4,
-      size: [pill, 24, pill * 0.6],
-      area: width * depth * (i % 3 === 0 ? 0.75 : 1),
-      outline,
-    }
-    const entry: RoomLabelEntry = {
-      zoneId: candidate.id,
-      polygon: outer,
-      holes: [],
-      area: candidate.area,
-    }
-    return { candidate, entry }
-  })
-}
-
-const median = (samples: number[]) => samples.sort((a, b) => a - b)[samples.length >> 1]!
-
-const pane = { width: 1440, height: 900 }
-const results: Record<string, unknown> = {}
-for (const count of [31, 60, 120]) {
-  const rooms = house(count)
-  const candidates = rooms.map((room) => room.candidate)
-  const entries = rooms.map((room) => room.entry)
-  for (let i = 0; i < 20; i++) placePills(candidates, pane)
-  const cold: number[] = []
-  const warm: number[] = []
-  let previous = placePills(candidates, pane)
-  for (let i = 0; i < 100; i++) {
-    let started = performance.now()
-    placePills(candidates, pane)
-    cold.push(performance.now() - started)
-    started = performance.now()
-    previous = placePills(candidates, pane, previous)
-    warm.push(performance.now() - started)
-  }
-  const points = Array.from(
-    { length: 1000 },
-    (): RoomHit => [270 + random() * 900, 150 + random() * 600, 0],
-  )
-  for (const point of points) roomAt(entries, () => point)
-  const picks: number[] = []
-  for (let i = 0; i < 20; i++) {
-    const started = performance.now()
-    for (const point of points) roomAt(entries, () => point)
-    picks.push((performance.now() - started) / points.length)
-  }
-  const tiers = Object.fromEntries(
-    ['full', 'name', 'dot', 'hidden'].map((tier) => [
-      tier,
-      [...previous.values()].filter((placement) => placement.tier === tier).length,
-    ]),
-  )
-  results[count] = {
-    placeMs: median(cold),
-    placeWithPreviousMs: median(warm),
-    pickMs: median(picks),
-    tiers,
-  }
-}
-console.log(JSON.stringify(results, null, 2))