Skip to content

Commit

Permalink
Merge branch 'master' into v9
Browse files Browse the repository at this point in the history
  • Loading branch information
CodyJasonBennett committed Dec 9, 2024
2 parents 400b4cd + 5a50800 commit 55e57aa
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/tutorials/events-and-interaction.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ From this we can see that what we need to do is use the old `onClick` event we u
Let's add it then:

```jsx
<mesh onClick={() => alert('Hellooo')} ref={myMesh}>
<mesh onClick={() => alert('Hellooo')}>
<boxGeometry />
<meshPhongMaterial color="royalblue" />
</mesh>
Expand All @@ -52,7 +52,7 @@ const [active, setActive] = useState(false)
After we have this we can set the scale with a ternary operator like so:

```jsx
<mesh scale={active ? 1.5 : 1} onClick={() => setActive(!active)} ref={myMesh}>
<mesh scale={active ? 1.5 : 1} onClick={() => setActive(!active)}>
<boxGeometry />
<meshPhongMaterial color="royalblue" />
</mesh>
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/loading-textures.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Let's then with this information create a small scene where we can use this text
```jsx
import { Suspense } from 'react'
import { Canvas, useLoader } from '@react-three/fiber'
import { TextureLoader } from 'three/src/loaders/TextureLoader'
import { TextureLoader } from 'three'

function Scene() {
const colorMap = useLoader(TextureLoader, 'PavingStones092_1K_Color.jpg')
Expand Down
6 changes: 6 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
> [!WARNING]
> R3F v8 is not compatible with React 19 or Next 15, which uses React 19. Use the R3F v9 RC instead which can be installed with `@react-three/fiber@rc`.
> [!NOTE]
> While we work on R3F v9 you can track compatibility of different libraries and common workarounds [here](https://github.com/verekia/three-gpu-ecosystem-tests).
<h1>@react-three/fiber</h1>

[![Version](https://img.shields.io/npm/v/@react-three/fiber?style=flat&colorA=000000&colorB=000000)](https://npmjs.com/package/@react-three/fiber)
Expand Down

0 comments on commit 55e57aa

Please sign in to comment.