Skip to content

Commit 411a6ba

Browse files
committed
wip
1 parent 039798c commit 411a6ba

File tree

6 files changed

+158
-16
lines changed

6 files changed

+158
-16
lines changed
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
import * as THREE from 'three'
2+
import * as React from 'react'
3+
4+
import { Vector3 } from 'three'
5+
import { Meta, StoryObj } from '@storybook/react'
6+
7+
import { Setup } from '../Setup'
8+
9+
import { Raycaster } from '../../src'
10+
import { ComponentProps, useRef } from 'react'
11+
import { useFrame } from '@react-three/fiber'
12+
13+
export default {
14+
title: 'Abstractions/Raycaster',
15+
component: Raycaster,
16+
decorators: [
17+
(Story) => (
18+
<Setup cameraPosition={new Vector3(0, 0, 10)}>
19+
<Story />
20+
</Setup>
21+
),
22+
],
23+
argTypes: {
24+
near: { control: { type: 'range', min: 0, max: 15 } },
25+
far: { control: { type: 'range', min: 0, max: 15 } },
26+
helper: { control: { type: 'boolean' } },
27+
},
28+
} satisfies Meta<typeof Raycaster>
29+
30+
type Story = StoryObj<typeof Raycaster>
31+
32+
function RaycasterScene(props: React.ComponentProps<typeof Raycaster>) {
33+
const raycasterRef = useRef<THREE.Raycaster>(null)
34+
35+
React.useEffect(() => {
36+
console.log('raycasterRef', raycasterRef)
37+
})
38+
39+
return (
40+
<>
41+
<color attach="background" args={['#303030']} />
42+
43+
<Raycaster ref={raycasterRef} {...props} />
44+
45+
<Capsule position-x={-2} />
46+
<Capsule />
47+
<Capsule position-x={2} />
48+
</>
49+
)
50+
}
51+
52+
export const RaycasterSt = {
53+
render: (args) => <RaycasterScene {...args} />,
54+
args: {
55+
origin: [-4, 0, 0],
56+
direction: [1, 0, 0],
57+
near: 1,
58+
far: 8,
59+
helper: true,
60+
},
61+
62+
name: 'Default',
63+
} satisfies Story
64+
65+
const Capsule = ({
66+
// layers,
67+
...props
68+
}: ComponentProps<'mesh'>) => {
69+
const meshRef = useRef<THREE.Mesh>(null)
70+
71+
useFrame(({ clock }) => {
72+
if (!meshRef.current) return
73+
meshRef.current.position.y = Math.sin(clock.getElapsedTime() * 0.5 + meshRef.current.position.x)
74+
meshRef.current.rotation.z = Math.sin(clock.getElapsedTime() * 0.5) * Math.PI * 1
75+
})
76+
77+
return (
78+
<mesh ref={meshRef} {...props}>
79+
{/* <Layers layers={layers} /> */}
80+
81+
<capsuleGeometry args={[0.5, 0.5, 4, 32]} />
82+
<meshNormalMaterial side={THREE.DoubleSide} />
83+
</mesh>
84+
)
85+
}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
},
4747
"dependencies": {
4848
"@babel/runtime": "^7.26.0",
49+
"@gsimone/three-raycaster-helper": "^0.1.0",
4950
"@mediapipe/tasks-vision": "0.10.17",
5051
"@monogrid/gainmap-js": "^3.0.6",
5152
"@react-spring/three": "~9.7.5",

src/core/Helper.tsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1+
/* eslint react-hooks/exhaustive-deps: 1 */
12
import * as React from 'react'
23
import { Object3D } from 'three'
34
import { useThree, useFrame } from '@react-three/fiber'
45
import { Falsey } from 'utility-types'
56

6-
type HelperType = Object3D & { update: () => void; dispose: () => void }
7-
type HelperConstructor = new (...args: any[]) => any
8-
type HelperArgs<T> = T extends [infer _, ...infer R] ? R : never
7+
type HelperConstructor = new (...args: any[]) => Object3D & { update: () => void; dispose?: () => void }
8+
type HelperArgs<T> = T extends [any, ...infer R] ? R : never
99

10-
export function useHelper<T extends HelperConstructor>(
11-
object3D: React.MutableRefObject<Object3D> | Falsey,
12-
helperConstructor: T,
13-
...args: HelperArgs<ConstructorParameters<T>>
10+
export function useHelper<H extends HelperConstructor>(
11+
object3D: React.RefObject<ConstructorParameters<H>[0]> | Falsey,
12+
helperConstructor: H,
13+
...args: HelperArgs<ConstructorParameters<H>>
1414
) {
15-
const helper = React.useRef<HelperType>()
15+
const helper = React.useRef<InstanceType<H>>(null!)
1616
const scene = useThree((state) => state.scene)
1717
React.useLayoutEffect(() => {
18-
let currentHelper: HelperType = undefined!
18+
let currentHelper: InstanceType<H> = undefined!
1919

2020
if (object3D && object3D?.current && helperConstructor) {
2121
helper.current = currentHelper = new (helperConstructor as any)(object3D.current, ...args)
@@ -26,28 +26,28 @@ export function useHelper<T extends HelperConstructor>(
2626
currentHelper.traverse((child) => (child.raycast = () => null))
2727
scene.add(currentHelper)
2828
return () => {
29-
helper.current = undefined
29+
helper.current = null!
3030
scene.remove(currentHelper)
3131
currentHelper.dispose?.()
3232
}
3333
}
34-
}, [scene, helperConstructor, object3D, ...args])
34+
}, [scene, helperConstructor, object3D, args])
3535

3636
useFrame(() => void helper.current?.update?.())
3737
return helper
3838
}
3939

4040
//
4141

42-
export type HelperProps<T extends HelperConstructor> = {
43-
type: T
44-
args?: HelperArgs<ConstructorParameters<T>>
42+
export type HelperProps<H extends HelperConstructor> = {
43+
type: H
44+
args?: HelperArgs<ConstructorParameters<H>>
4545
}
4646

47-
export const Helper = <T extends HelperConstructor>({
47+
export const Helper = <H extends HelperConstructor>({
4848
type: helperConstructor,
4949
args = [] as never,
50-
}: HelperProps<T>) => {
50+
}: HelperProps<H>) => {
5151
const thisRef = React.useRef<Object3D>(null!)
5252
const parentRef = React.useRef<Object3D>(null!)
5353

src/core/Raycaster.tsx

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import * as THREE from 'three'
2+
import * as React from 'react'
3+
import { ComponentProps, forwardRef, useRef, useState } from 'react'
4+
import { useFrame, type Vector3 } from '@react-three/fiber'
5+
import { RaycasterHelper } from '@gsimone/three-raycaster-helper'
6+
7+
import { useHelper } from '..'
8+
9+
type RaycasterProps = Omit<ComponentProps<'raycaster'>, 'args'> & {
10+
origin: Vector3
11+
direction: Vector3
12+
} & {
13+
helper?: boolean
14+
}
15+
16+
function toThreeVec3(v: Vector3) {
17+
return v instanceof THREE.Vector3 ? v : new THREE.Vector3(...(typeof v === 'number' ? [v, v, v] : v))
18+
}
19+
20+
export const Raycaster = forwardRef<THREE.Raycaster, RaycasterProps>(
21+
({ origin: _origin, direction: _direction, near, far, helper, ...props }, fref) => {
22+
const origin = toThreeVec3(_origin)
23+
const direction = toThreeVec3(_direction)
24+
25+
const [r] = useState(() => new THREE.Raycaster(origin, direction))
26+
27+
const raycasterRef = useRef<THREE.Raycaster>(null)
28+
const ref = fref || raycasterRef
29+
const isCallbackRef = typeof ref === 'function'
30+
31+
const raycasterHelper = useHelper(helper && !isCallbackRef && ref, RaycasterHelper)
32+
33+
// Update the hits with intersection results
34+
useFrame(({ scene }) => {
35+
if (!helper) return
36+
if (!ref || isCallbackRef) return
37+
38+
if (!raycasterHelper.current || !ref.current) return
39+
// @ts-ignore
40+
raycasterHelper.current.hits = ref.current.intersectObjects(scene.children)
41+
})
42+
43+
return <primitive ref={ref} object={r} {...{ origin, direction, near, far }} {...props} />
44+
}
45+
)

src/core/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export * from './Svg'
2424
export * from './Gltf'
2525
export * from './AsciiRenderer'
2626
export * from './Splat'
27+
export * from './Raycaster'
2728

2829
// Cameras
2930
export * from './OrthographicCamera'

yarn.lock

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,6 +2133,15 @@ __metadata:
21332133
languageName: node
21342134
linkType: hard
21352135

2136+
"@gsimone/three-raycaster-helper@npm:^0.1.0":
2137+
version: 0.1.0
2138+
resolution: "@gsimone/three-raycaster-helper@npm:0.1.0"
2139+
peerDependencies:
2140+
three: ^0.139.2
2141+
checksum: 10c0/adefc5b44a449d0ef1540e46454b81b6ff6c267dfb1ad187a1f64da723d6dabc77158958cdd1cb0a63295ecfd9c2e5a4d08577b6821653963e334ef8e4d54b90
2142+
languageName: node
2143+
linkType: hard
2144+
21362145
"@humanfs/core@npm:^0.19.1":
21372146
version: 0.19.1
21382147
resolution: "@humanfs/core@npm:0.19.1"
@@ -2837,6 +2846,7 @@ __metadata:
28372846
"@eslint/compat": "npm:^1.2.3"
28382847
"@eslint/eslintrc": "npm:^3.2.0"
28392848
"@eslint/js": "npm:^9.15.0"
2849+
"@gsimone/three-raycaster-helper": "npm:^0.1.0"
28402850
"@mediapipe/tasks-vision": "npm:0.10.17"
28412851
"@monogrid/gainmap-js": "npm:^3.0.6"
28422852
"@playwright/test": "npm:^1.45.2"

0 commit comments

Comments
 (0)