Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
abernier committed Dec 11, 2024
1 parent 039798c commit bfd631a
Show file tree
Hide file tree
Showing 6 changed files with 158 additions and 15 deletions.
85 changes: 85 additions & 0 deletions .storybook/stories/Raycaster.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import * as THREE from 'three'
import * as React from 'react'

import { Vector3 } from 'three'
import { Meta, StoryObj } from '@storybook/react'

import { Setup } from '../Setup'

import { Raycaster } from '../../src'
import { ComponentProps, useRef } from 'react'
import { useFrame } from '@react-three/fiber'

export default {
title: 'Abstractions/Raycaster',
component: Raycaster,
decorators: [
(Story) => (
<Setup cameraPosition={new Vector3(0, 0, 10)}>
<Story />
</Setup>
),
],
argTypes: {
near: { control: { type: 'range', min: 0, max: 15 } },
far: { control: { type: 'range', min: 0, max: 15 } },
helper: { control: { type: 'boolean' } },
},
} satisfies Meta<typeof Raycaster>

type Story = StoryObj<typeof Raycaster>

function RaycasterScene(props: React.ComponentProps<typeof Raycaster>) {
const raycasterRef = useRef<THREE.Raycaster>(null)

React.useEffect(() => {
console.log('raycasterRef', raycasterRef)
})

return (
<>
<color attach="background" args={['#303030']} />

<Raycaster ref={raycasterRef} {...props} />

<Capsule position-x={-2} />
<Capsule />
<Capsule position-x={2} />
</>
)
}

export const RaycasterSt = {
render: (args) => <RaycasterScene {...args} />,
args: {
origin: [-4, 0, 0],
direction: [1, 0, 0],
near: 1,
far: 8,
helper: true,
},

name: 'Default',
} satisfies Story

const Capsule = ({
// layers,
...props
}: ComponentProps<'mesh'>) => {
const meshRef = useRef<THREE.Mesh>(null)

useFrame(({ clock }) => {
if (!meshRef.current) return
meshRef.current.position.y = Math.sin(clock.getElapsedTime() * 0.5 + meshRef.current.position.x)
meshRef.current.rotation.z = Math.sin(clock.getElapsedTime() * 0.5) * Math.PI * 1
})

return (
<mesh ref={meshRef} {...props}>
{/* <Layers layers={layers} /> */}

<capsuleGeometry args={[0.5, 0.5, 4, 32]} />
<meshNormalMaterial side={THREE.DoubleSide} />
</mesh>
)
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
},
"dependencies": {
"@babel/runtime": "^7.26.0",
"@gsimone/three-raycaster-helper": "^0.1.0",
"@mediapipe/tasks-vision": "0.10.17",
"@monogrid/gainmap-js": "^3.0.6",
"@react-spring/three": "~9.7.5",
Expand Down
31 changes: 16 additions & 15 deletions src/core/Helper.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
/* eslint react-hooks/exhaustive-deps: 1 */
import * as React from 'react'
import { Object3D } from 'three'
import { useThree, useFrame } from '@react-three/fiber'
import { Falsey } from 'utility-types'

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

export function useHelper<T extends HelperConstructor>(
object3D: React.MutableRefObject<Object3D> | Falsey,
helperConstructor: T,
...args: HelperArgs<ConstructorParameters<T>>
export function useHelper<T extends HelperType, H extends HelperConstructor<T>>(
object3D: React.RefObject<ConstructorParameters<H>[0]> | Falsey,
helperConstructor: H,
...args: HelperArgs<ConstructorParameters<H>>
) {
const helper = React.useRef<HelperType>()
const helper = React.useRef<T>()
const scene = useThree((state) => state.scene)
React.useLayoutEffect(() => {
let currentHelper: HelperType = undefined!
let currentHelper: T = undefined!

if (object3D && object3D?.current && helperConstructor) {
helper.current = currentHelper = new (helperConstructor as any)(object3D.current, ...args)
Expand All @@ -31,23 +32,23 @@ export function useHelper<T extends HelperConstructor>(
currentHelper.dispose?.()
}
}
}, [scene, helperConstructor, object3D, ...args])
}, [scene, helperConstructor, object3D, args])

useFrame(() => void helper.current?.update?.())
return helper
}

//

export type HelperProps<T extends HelperConstructor> = {
type: T
args?: HelperArgs<ConstructorParameters<T>>
export type HelperProps<H extends HelperConstructor> = {
type: H
args?: HelperArgs<ConstructorParameters<H>>
}

export const Helper = <T extends HelperConstructor>({
export const Helper = <H extends HelperConstructor>({
type: helperConstructor,
args = [] as never,
}: HelperProps<T>) => {
}: HelperProps<H>) => {
const thisRef = React.useRef<Object3D>(null!)
const parentRef = React.useRef<Object3D>(null!)

Expand Down
45 changes: 45 additions & 0 deletions src/core/Raycaster.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import * as THREE from 'three'
import * as React from 'react'
import { ComponentProps, forwardRef, useRef, useState } from 'react'
import { useFrame, type Vector3 } from '@react-three/fiber'
import { RaycasterHelper } from '@gsimone/three-raycaster-helper'

import { useHelper } from '..'

type RaycasterProps = Omit<ComponentProps<'raycaster'>, 'args'> & {
origin: Vector3
direction: Vector3
} & {
helper?: boolean
}

function toThreeVec3(v: Vector3) {
return v instanceof THREE.Vector3 ? v : new THREE.Vector3(...(typeof v === 'number' ? [v, v, v] : v))
}

export const Raycaster = forwardRef<THREE.Raycaster, RaycasterProps>(
({ origin: _origin, direction: _direction, near, far, helper, ...props }, fref) => {
const origin = toThreeVec3(_origin)
const direction = toThreeVec3(_direction)

const [r] = useState(() => new THREE.Raycaster(origin, direction))

const raycasterRef = useRef<THREE.Raycaster>(null)
const ref = fref || raycasterRef
const isCallbackRef = typeof ref === 'function'

const raycasterHelper = useHelper(helper && !isCallbackRef && ref, RaycasterHelper)

// Update the hits with intersection results
useFrame(({ scene }) => {
if (!helper) return
if (!ref || isCallbackRef) return

if (!raycasterHelper.current || !ref.current) return
// @ts-ignore
raycasterHelper.current.hits = ref.current.intersectObjects(scene.children)
})

return <primitive ref={ref} object={r} {...{ origin, direction, near, far }} {...props} />
}
)
1 change: 1 addition & 0 deletions src/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export * from './Svg'
export * from './Gltf'
export * from './AsciiRenderer'
export * from './Splat'
export * from './Raycaster'

// Cameras
export * from './OrthographicCamera'
Expand Down
10 changes: 10 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2133,6 +2133,15 @@ __metadata:
languageName: node
linkType: hard

"@gsimone/three-raycaster-helper@npm:^0.1.0":
version: 0.1.0
resolution: "@gsimone/three-raycaster-helper@npm:0.1.0"
peerDependencies:
three: ^0.139.2
checksum: 10c0/adefc5b44a449d0ef1540e46454b81b6ff6c267dfb1ad187a1f64da723d6dabc77158958cdd1cb0a63295ecfd9c2e5a4d08577b6821653963e334ef8e4d54b90
languageName: node
linkType: hard

"@humanfs/core@npm:^0.19.1":
version: 0.19.1
resolution: "@humanfs/core@npm:0.19.1"
Expand Down Expand Up @@ -2837,6 +2846,7 @@ __metadata:
"@eslint/compat": "npm:^1.2.3"
"@eslint/eslintrc": "npm:^3.2.0"
"@eslint/js": "npm:^9.15.0"
"@gsimone/three-raycaster-helper": "npm:^0.1.0"
"@mediapipe/tasks-vision": "npm:0.10.17"
"@monogrid/gainmap-js": "npm:^3.0.6"
"@playwright/test": "npm:^1.45.2"
Expand Down

0 comments on commit bfd631a

Please sign in to comment.