Unverified Commit 6c1cfc10 authored by Henrik Wenz's avatar Henrik Wenz Committed by GitHub

[example] Fix bird animations in with-three-js example (#36053)

* Fix bird animations

* Use memo for birds generation
parent 16f7084e
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
"start": "next start" "start": "next start"
}, },
"dependencies": { "dependencies": {
"@react-three/drei": "7.6.1", "@react-three/drei": "9.3.4",
"@react-three/fiber": "7.0.6", "@react-three/fiber": "8.0.10",
"next": "latest", "next": "latest",
"react": "^17.0.2", "react": "^18.0.0",
"react-dom": "^17.0.2", "react-dom": "^18.0.0",
"three": "0.128.0" "three": "0.139.2"
} }
} }
import { Suspense } from 'react' import { Suspense, useMemo } from 'react'
import { Canvas } from '@react-three/fiber' import { Canvas } from '@react-three/fiber'
import { OrbitControls } from '@react-three/drei' import { OrbitControls } from '@react-three/drei'
import Bird from '../components/Bird' import Bird from '../components/Bird'
export default function BirdsPage() { export default function BirdsPage() {
return ( const birds = useMemo(
<> () =>
<Canvas camera={{ position: [0, 0, 35] }}> new Array(10).fill().map((_, index) => {
<ambientLight intensity={2} />
<pointLight position={[40, 40, 40]} />
<OrbitControls />
<Suspense fallback={null}>
{new Array(6).fill().map((_, i) => {
const x = const x =
(15 + Math.random() * 30) * (Math.round(Math.random()) ? -1 : 1) (15 + Math.random() * 30) * (Math.round(Math.random()) ? -1 : 1)
const y = -10 + Math.random() * 20 const y = -10 + Math.random() * 20
...@@ -19,27 +14,36 @@ export default function BirdsPage() { ...@@ -19,27 +14,36 @@ export default function BirdsPage() {
const bird = ['stork', 'parrot', 'flamingo'][ const bird = ['stork', 'parrot', 'flamingo'][
Math.round(Math.random() * 2) Math.round(Math.random() * 2)
] ]
let speed = bird === 'stork' ? 0.5 : bird === 'flamingo' ? 2 : 5 const speed = bird === 'stork' ? 0.5 : bird === 'flamingo' ? 2 : 5
let factor = const factor =
bird === 'stork' bird === 'stork'
? 0.5 + Math.random() ? 0.5 + Math.random()
: bird === 'flamingo' : bird === 'flamingo'
? 0.25 + Math.random() ? 0.25 + Math.random()
: 1 + Math.random() - 0.5 : 1 + Math.random() - 0.5
return ( return {
<Bird key: index,
key={i} position: [x, y, z],
position={[x, y, z]} rotation: [0, x > 0 ? Math.PI : 0, 0],
rotation={[0, x > 0 ? Math.PI : 0, 0]} speed,
speed={speed} factor,
factor={factor} url: `/glb/${bird}.glb`,
url={`/glb/${bird}.glb`} }
/> }),
[]
) )
})}
return (
<Canvas camera={{ position: [0, 0, 35] }}>
<ambientLight intensity={2} />
<pointLight position={[40, 40, 40]} />
<OrbitControls />
<Suspense fallback={null}>
{birds.map((props) => (
<Bird {...props} key={props.key} />
))}
</Suspense> </Suspense>
</Canvas> </Canvas>
</>
) )
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment