Fix particles prop in Emitter

hmans · Aug 2, 2022 · bfd1588 · bfd1588
1 parent d68c614
commit bfd1588
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.changeset/strong-bikes-bathe.md b/.changeset/strong-bikes-bathe.md
@@ -0,0 +1,5 @@
+---
+"vfx-composer": patch
+---
+
+**Fixed:** `<Emitter>` could no longer work with `<Particles>` refs passed into its `particles` prop. Woops!
diff --git a/packages/vfx-composer/src/fiber/Emitter.tsx b/packages/vfx-composer/src/fiber/Emitter.tsx
@@ -35,7 +35,7 @@ export const Emitter = forwardRef<Object3D, EmitterProps>(
     ref
   ) => {
     const object = useRef<Object3D>(null!)
-    const particles = particlesProp?.current || useParticlesContext()
+    const particlesFromContext = useParticlesContext()
 
     const emitterSetup = useCallback<InstanceSetupCallback>(
       (props) => {
@@ -46,17 +46,22 @@ export const Emitter = forwardRef<Object3D, EmitterProps>(
 
         setup?.(props)
       },
-      [particles, setup]
+      [setup]
     )
 
     useEffect(() => {
+      const particles = particlesProp?.current || particlesFromContext
+
       if (!particles) return
       if (continuous) return
+
       particlesMatrix.copy(particles!.matrixWorld).invert()
       particles.emit(count, emitterSetup)
-    }, [particles])
+    }, [])
 
     useFrame(() => {
+      const particles = particlesProp?.current || particlesFromContext
+
       if (!particles) return
       if (!continuous) return
       particlesMatrix.copy(particles!.matrixWorld).invert()