camera controls enhancement

This commit is contained in:
wass08
2026-02-17 08:52:58 +09:00
parent 06e6ccb88f
commit 144a2bd18f
6 changed files with 171 additions and 22 deletions
@@ -3,15 +3,15 @@
import {
type AnyNode,
type BuildingNode,
emitter,
type ItemNode,
type LevelNode,
type NodeEvent,
type WallNode,
type ZoneNode,
emitter,
pointInPolygon,
sceneRegistry,
useScene,
type WallNode,
type ZoneNode,
} from '@pascal-app/core'
import { useThree } from '@react-three/fiber'
import { useEffect, useRef } from 'react'
@@ -23,14 +23,23 @@ const tempWorldPos = new Vector3()
// Tolerance for edge detection (in meters)
const EDGE_TOLERANCE = 0.5
type SelectableNodeType = 'building' | 'level' | 'zone' | 'wall' | 'item' | 'slab' | 'ceiling' | 'roof'
type SelectableNodeType =
| 'building'
| 'level'
| 'zone'
| 'wall'
| 'item'
| 'slab'
| 'ceiling'
| 'roof'
// Expand polygon outward by a small amount to include items on edges
const expandPolygon = (polygon: [number, number][], tolerance: number): [number, number][] => {
if (polygon.length < 3) return polygon
// Calculate centroid
let cx = 0, cz = 0
let cx = 0,
cz = 0
for (const [x, z] of polygon) {
cx += x
cz += z
@@ -50,7 +59,11 @@ const expandPolygon = (polygon: [number, number][], tolerance: number): [number,
}
// Check if point is in polygon with tolerance for edges
const pointInPolygonWithTolerance = (x: number, z: number, polygon: [number, number][]): boolean => {
const pointInPolygonWithTolerance = (
x: number,
z: number,
polygon: [number, number][],
): boolean => {
// First try exact check
if (pointInPolygon(x, z, polygon)) return true
// Then try with expanded polygon for edge tolerance
@@ -186,7 +199,9 @@ const getStrategy = (): SelectionStrategy | null => {
const { selectedIds } = useViewer.getState().selection
// Toggle selection - if already selected, deselect; otherwise select
if (selectedIds.includes(node.id)) {
useViewer.getState().setSelection({ selectedIds: selectedIds.filter((id) => id !== node.id) })
useViewer
.getState()
.setSelection({ selectedIds: selectedIds.filter((id) => id !== node.id) })
} else {
useViewer.getState().setSelection({ selectedIds: [node.id] })
}
@@ -244,7 +259,16 @@ export const SelectionManager = () => {
}
// Subscribe to all node types
const allTypes: SelectableNodeType[] = ['building', 'level', 'zone', 'wall', 'item', 'slab', 'ceiling', 'roof']
const allTypes: SelectableNodeType[] = [
'building',
'level',
'zone',
'wall',
'item',
'slab',
'ceiling',
'roof',
]
for (const type of allTypes) {
emitter.on(`${type}:enter`, onEnter)
emitter.on(`${type}:leave`, onLeave)
@@ -258,7 +282,7 @@ export const SelectionManager = () => {
emitter.off(`${type}:click`, onClick)
}
}
}, [selection])
}, [])
return (
<>
@@ -268,12 +292,17 @@ export const SelectionManager = () => {
)
}
const PointerMissedHandler = ({ clickHandledRef }: { clickHandledRef: React.MutableRefObject<boolean> }) => {
const PointerMissedHandler = ({
clickHandledRef,
}: {
clickHandledRef: React.MutableRefObject<boolean>
}) => {
const gl = useThree((s) => s.gl)
useEffect(() => {
const handleClick = (event: MouseEvent) => {
// Only handle left clicks
if (useViewer.getState().cameraDragging) return
if (event.button !== 0) return
// Use requestAnimationFrame to check after R3F event handlers