-
-
Notifications
You must be signed in to change notification settings - Fork 164
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #326 from shpowley/main
minecraft example fixes + VR controller support
- Loading branch information
Showing
10 changed files
with
267 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
examples/minecraft/src/Ground.jsx → examples/minecraft/src/Ground.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| import * as THREE from 'three' | ||
| import { useRef } from 'react' | ||
| import { useFrame } from '@react-three/fiber' | ||
| import { useKeyboardControls } from '@react-three/drei' | ||
| import { CapsuleCollider, interactionGroups, RapierRigidBody, RigidBody, useRapier } from '@react-three/rapier' | ||
| import { IfInSessionMode } from '@react-three/xr' | ||
|
|
||
| import { Axe } from './Axe.jsx' | ||
| import { VRPlayerControl } from './VRPlayerControl.jsx' | ||
|
|
||
| const SPEED = 5 | ||
| const direction = new THREE.Vector3() | ||
| const frontVector = new THREE.Vector3() | ||
| const sideVector = new THREE.Vector3() | ||
| const rotation = new THREE.Vector3() | ||
|
|
||
| const vectorHelper = new THREE.Vector3() | ||
|
|
||
| export function Player({ lerp = THREE.MathUtils.lerp }) { | ||
| const axe = useRef<THREE.Group>(null) | ||
| const ref = useRef<RapierRigidBody>(null) | ||
| const { rapier, world } = useRapier() | ||
| const [, getKeys] = useKeyboardControls() | ||
|
|
||
| const playerMove = ({ | ||
| forward, | ||
| backward, | ||
| left, | ||
| right, | ||
| rotation, | ||
| velocity, | ||
| }: { | ||
| forward: boolean | ||
| backward: boolean | ||
| left: boolean | ||
| right: boolean | ||
| rotation: THREE.Euler | ||
| velocity?: any | ||
| }) => { | ||
| if (!velocity) { | ||
| velocity = ref.current?.linvel() | ||
| } | ||
|
|
||
| frontVector.set(0, 0, (backward ? 1 : 0) - (forward ? 1 : 0)) | ||
| sideVector.set((left ? 1 : 0) - (right ? 1 : 0), 0, 0) | ||
| direction.subVectors(frontVector, sideVector).normalize().multiplyScalar(SPEED).applyEuler(rotation) | ||
| ref.current?.setLinvel({ x: direction.x, y: velocity.y, z: direction.z }, true) | ||
| } | ||
|
|
||
| const playerJump = () => { | ||
| if (ref.current == null) { | ||
| return | ||
| } | ||
| const ray = world.castRay( | ||
| new rapier.Ray(ref.current.translation(), { x: 0, y: -1, z: 0 }), | ||
| Infinity, | ||
| false, | ||
| undefined, | ||
| interactionGroups([1, 0], [1]), | ||
| ) | ||
| const grounded = ray != null && Math.abs(ray.timeOfImpact) <= 1.25 | ||
|
|
||
| if (grounded) { | ||
| ref.current.setLinvel({ x: 0, y: 7.5, z: 0 }, true) | ||
| } | ||
| } | ||
|
|
||
| useFrame((state) => { | ||
| if (ref.current == null) { | ||
| return | ||
| } | ||
| const { forward, backward, left, right, jump } = getKeys() | ||
| const velocity = ref.current.linvel() | ||
|
|
||
| vectorHelper.set(velocity.x, velocity.y, velocity.z) | ||
|
|
||
| // update camera | ||
| const { x, y, z } = ref.current.translation() | ||
| state.camera.position.set(x, y, z) | ||
|
|
||
| // update axe | ||
| if (axe.current != null) { | ||
| axe.current.children[0].rotation.x = lerp( | ||
| axe.current.children[0].rotation.x, | ||
| Math.sin((vectorHelper.length() > 1 ? 1 : 0) * state.clock.elapsedTime * 10) / 6, | ||
| 0.1, | ||
| ) | ||
| axe.current.rotation.copy(state.camera.rotation) | ||
| axe.current.position.copy(state.camera.position).add(state.camera.getWorldDirection(rotation).multiplyScalar(1)) | ||
| } | ||
|
|
||
| // movement | ||
| if (ref.current) { | ||
| playerMove({ | ||
| forward, | ||
| backward, | ||
| left, | ||
| right, | ||
| rotation: state.camera.rotation, | ||
| velocity, | ||
| }) | ||
|
|
||
| if (jump) { | ||
| playerJump() | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| return ( | ||
| <> | ||
| <RigidBody | ||
| ref={ref} | ||
| colliders={false} | ||
| mass={1} | ||
| type="dynamic" | ||
| position={[0, 10, 0]} | ||
| enabledRotations={[false, false, false]} | ||
| canSleep={false} | ||
| collisionGroups={interactionGroups([0], [0])} | ||
| > | ||
| <CapsuleCollider args={[0.75, 0.5]} /> | ||
|
|
||
| <IfInSessionMode allow={['immersive-ar', 'immersive-vr']}> | ||
| <VRPlayerControl playerJump={playerJump} playerMove={playerMove} /> | ||
| </IfInSessionMode> | ||
| </RigidBody> | ||
|
|
||
| <IfInSessionMode deny="immersive-vr"> | ||
| <group | ||
| ref={axe} | ||
| onPointerMissed={(e) => { | ||
| if (axe.current == null) { | ||
| return | ||
| } | ||
| axe.current.children[0].rotation.x = -0.5 | ||
| }} | ||
| > | ||
| <Axe position={[0.3, -0.35, 0.5]} /> | ||
| </group> | ||
| </IfInSessionMode> | ||
| </> | ||
| ) | ||
| } |
Oops, something went wrong.