@pascal-app/editor 1.1.0 → 1.1.2

package/src/components/viewer/use-viewer-camera-navigation-sync.ts

@@ -1,140 +0,0 @@
-'use client'
-
-import { type CameraPose, emitter } from '@pascal-app/core'
-import { useViewer } from '@pascal-app/viewer'
-import type { CameraControlsImpl } from '@react-three/drei'
-import { useThree } from '@react-three/fiber'
-import { type RefObject, useCallback, useEffect, useRef } from 'react'
-import type { Camera, OrthographicCamera, PerspectiveCamera } from 'three'
-import { Vector3 } from 'three'
-import { normalizeCameraPose } from '../../lib/camera-pose'
-import { publishCameraPose } from '../../store/camera-pose-store'
-
-const position = new Vector3()
-const target = new Vector3()
-
-function isPerspectiveCamera(camera: Camera): camera is PerspectiveCamera {
-  return (camera as PerspectiveCamera).isPerspectiveCamera === true
-}
-
-function isOrthographicCamera(camera: Camera): camera is OrthographicCamera {
-  return (camera as OrthographicCamera).isOrthographicCamera === true
-}
-
-function cameraViewWidth(camera: Camera, distance: number, width: number, height: number) {
-  if (isPerspectiveCamera(camera)) {
-    const fov = (camera.getEffectiveFOV() * Math.PI) / 180
-    return Math.max(0.001, 2 * distance * Math.tan(fov / 2) * (width / Math.max(height, 1)))
-  }
-  if (isOrthographicCamera(camera)) {
-    return Math.max(0.001, (camera.right - camera.left) / camera.zoom)
-  }
-  return Math.max(0.001, distance)
-}
-
-function applyViewWidth(
-  controls: CameraControlsImpl,
-  camera: Camera,
-  viewWidth: number,
-  width: number,
-  height: number,
-) {
-  if (isPerspectiveCamera(camera)) {
-    const fov = (camera.getEffectiveFOV() * Math.PI) / 180
-    const denominator = 2 * Math.tan(fov / 2) * (width / Math.max(height, 1))
-    if (denominator > 0) controls.dollyTo(Math.max(0.001, viewWidth / denominator), false)
-    return
-  }
-  if (isOrthographicCamera(camera) && viewWidth > 0) {
-    controls.zoomTo(Math.max(0.001, (camera.right - camera.left) / viewWidth), false)
-  }
-}
-
-export function useViewerCameraNavigationSync(controls: RefObject<CameraControlsImpl | null>) {
-  const camera = useThree((state) => state.camera)
-  const size = useThree((state) => state.size)
-  const suppressPublish = useRef(false)
-  const pendingPose = useRef<CameraPose | null>(null)
-
-  const publishCurrentPose = useCallback(() => {
-    const control = controls.current
-    if (!control || suppressPublish.current) return
-    control.getPosition(position, false)
-    control.getTarget(target, false)
-    const projection = isPerspectiveCamera(camera)
-      ? 'perspective'
-      : isOrthographicCamera(camera)
-        ? 'orthographic'
-        : null
-    if (!projection) return
-    const pose = normalizeCameraPose({
-      position: [position.x, position.y, position.z],
-      target: [target.x, target.y, target.z],
-      projection,
-      viewWidth: cameraViewWidth(camera, position.distanceTo(target), size.width, size.height),
-      ...(isPerspectiveCamera(camera) ? { fov: camera.fov } : {}),
-    })
-    if (pose) publishCameraPose(pose)
-  }, [camera, controls, size.height, size.width])
-
-  const applyPendingPose = useCallback(() => {
-    const control = controls.current
-    const pose = pendingPose.current
-    if (!(control && pose)) return
-    const projectionMatches =
-      (pose.projection === 'perspective' && isPerspectiveCamera(camera)) ||
-      (pose.projection === 'orthographic' && isOrthographicCamera(camera))
-    if (!projectionMatches) return
-
-    pendingPose.current = null
-    suppressPublish.current = true
-    try {
-      if (pose.fov !== undefined && isPerspectiveCamera(camera)) {
-        camera.fov = pose.fov
-        camera.updateProjectionMatrix()
-      }
-      control.setLookAt(
-        pose.position[0],
-        pose.position[1],
-        pose.position[2],
-        pose.target[0],
-        pose.target[1],
-        pose.target[2],
-        false,
-      )
-      if (pose.viewWidth !== undefined) {
-        applyViewWidth(control, camera, pose.viewWidth, size.width, size.height)
-      }
-      control.update(0)
-    } finally {
-      suppressPublish.current = false
-      publishCurrentPose()
-    }
-  }, [camera, controls, publishCurrentPose, size.height, size.width])
-
-  useEffect(() => {
-    applyPendingPose()
-  }, [applyPendingPose])
-
-  useEffect(() => {
-    const applyPose = (value: CameraPose) => {
-      const pose = normalizeCameraPose(value)
-      if (!pose) return
-      pendingPose.current = pose
-      if (useViewer.getState().cameraMode !== pose.projection) {
-        useViewer.getState().setCameraMode(pose.projection)
-        return
-      }
-      applyPendingPose()
-    }
-    emitter.on('camera-controls:apply-pose', applyPose)
-    return () => emitter.off('camera-controls:apply-pose', applyPose)
-  }, [applyPendingPose])
-
-  useEffect(() => {
-    const frame = requestAnimationFrame(publishCurrentPose)
-    return () => cancelAnimationFrame(frame)
-  }, [publishCurrentPose])
-
-  return publishCurrentPose
-}

package/src/components/viewer/use-viewer-ui-sounds.test.ts

@@ -1,15 +0,0 @@
-import { expect, test } from 'bun:test'
-import { selectionCue } from './use-viewer-ui-sounds'
-
-type Selection = Parameters<typeof selectionCue>[0]
-const selection = (over: Partial<Record<keyof Selection, unknown>> = {}) =>
-  ({ buildingId: null, levelId: 'level_a', zoneId: null, selectedIds: [], ...over }) as Selection
-
-test('picking a room or an element selects; letting it go deselects', () => {
-  expect(selectionCue(selection(), selection({ zoneId: 'zone_a' }))).toBe('viewerSelect')
-  expect(
-    selectionCue(selection({ zoneId: 'zone_a' }), selection({ selectedIds: ['door_a'] })),
-  ).toBe('viewerSelect')
-  expect(selectionCue(selection({ selectedIds: ['door_a'] }), selection())).toBe('viewerDeselect')
-  expect(selectionCue(selection(), selection())).toBe(null)
-})

package/src/components/viewer/use-viewer-ui-sounds.ts

@@ -1,46 +0,0 @@
-'use client'
-
-import { useViewer } from '@pascal-app/viewer'
-import { useEffect } from 'react'
-import { playSFX } from '../../lib/sfx-player'
-
-type Selection = ReturnType<typeof useViewer.getState>['selection']
-
-/** Which tick a selection change plays: anything newly picked selects, anything let go deselects. */
-export function selectionCue(
-  previous: Selection,
-  next: Selection,
-): 'viewerSelect' | 'viewerDeselect' | null {
-  const picked =
-    (next.levelId && next.levelId !== previous.levelId) ||
-    (next.zoneId && next.zoneId !== previous.zoneId) ||
-    next.selectedIds.some((id) => !previous.selectedIds.includes(id))
-  if (picked) return 'viewerSelect'
-  const released =
-    (previous.levelId && !next.levelId) ||
-    (previous.zoneId && !next.zoneId) ||
-    previous.selectedIds.some((id) => !next.selectedIds.includes(id))
-  return released ? 'viewerDeselect' : null
-}
-
-/**
- * The viewer's pointer ticks, as on the marketing house: a faint one when the
- * pointer finds something new, one on select and a softer one on deselect.
- * Silent in walkthrough, and until the person has interacted with the page, so
- * loading a scene with a default selection makes no sound.
- */
-export function useViewerUiSounds() {
-  useEffect(
-    () =>
-      useViewer.subscribe((state, previous) => {
-        if (state.walkthroughMode || !navigator.userActivation?.hasBeenActive) return
-        if (state.selection !== previous.selection) {
-          const cue = selectionCue(previous.selection, state.selection)
-          if (cue) playSFX(cue)
-        }
-        if (state.hoveredId && state.hoveredId !== previous.hoveredId && !state.cameraDragging)
-          playSFX('viewerHover')
-      }),
-    [],
-  )
-}