@react-three/drei 9.0.0-beta.3 → 9.0.0-beta.4

package/core/useFBO.js

@@ -1,17 +1,15 @@
-import { useMemo, useEffect } from 'react';
+import * as React from 'react';
 import * as THREE from 'three';
 import { useThree } from '@react-three/fiber';
 
 // 👇 uncomment when TS version supports function overloads
 // export function useFBO(settings?: FBOSettings)
 function useFBO(width, height, settings) {
-  const gl = useThree(({
-    gl
-  }) => gl);
-  const size = useThree(({
+  const {
+    gl,
     size
-  }) => size);
-  const dpr = useMemo(() => gl.getPixelRatio(), [gl]);
+  } = useThree();
+  const dpr = React.useMemo(() => gl.getPixelRatio(), [gl]);
 
   const _width = typeof width === 'number' ? width : size.width * dpr;
 
@@ -19,27 +17,27 @@ function useFBO(width, height, settings) {
 
   const _settings = (typeof width === 'number' ? settings : width) || {};
 
-  const target = useMemo(() => {
-    const {
-      multisample,
-      samples,
-      ...targetSettings
-    } = _settings;
+  const {
+    samples,
+    ...targetSettings
+  } = _settings;
+  const target = React.useMemo(() => {
     let target;
-
-    if (multisample && gl.capabilities.isWebGL2) {
-      target = new THREE.WebGLMultisampleRenderTarget(_width, _height, targetSettings);
-      if (samples) target.samples = samples;
-    } else {
-      target = new THREE.WebGLRenderTarget(_width, _height, targetSettings);
-    }
-
+    target = new THREE.WebGLRenderTarget(_width, _height, {
+      minFilter: THREE.LinearFilter,
+      magFilter: THREE.LinearFilter,
+      encoding: gl.outputEncoding,
+      type: THREE.HalfFloatType,
+      ...targetSettings
+    });
+    target.samples = samples;
     return target;
   }, []);
-  useEffect(() => {
+  React.useLayoutEffect(() => {
     target.setSize(_width, _height);
-  }, [target, _width, _height]);
-  useEffect(() => {
+    if (samples) target.samples = samples;
+  }, [samples, target, _width, _height]);
+  React.useEffect(() => {
     return () => target.dispose();
   }, []);
   return target;

package/core/useGLTF.d.ts

@@ -1,5 +1,5 @@
 import { GLTFLoader } from 'three-stdlib';
-export declare function useGLTF<T extends string | string[]>(path: T, useDraco?: boolean | string, useMeshOpt?: boolean, extendLoader?: (loader: GLTFLoader) => void): T extends any[] ? (import("three/examples/jsm/loaders/GLTFLoader").GLTF & import("@react-three/fiber").ObjectMap)[] : import("three/examples/jsm/loaders/GLTFLoader").GLTF & import("@react-three/fiber").ObjectMap;
+export declare function useGLTF<T extends string | string[]>(path: T, useDraco?: boolean | string, useMeshOpt?: boolean, extendLoader?: (loader: GLTFLoader) => void): T extends any[] ? import("three-stdlib").GLTF[] : import("three-stdlib").GLTF;
 export declare namespace useGLTF {
     var preload: (path: string | string[], useDraco?: string | boolean, useMeshOpt?: boolean, extendLoader?: ((loader: GLTFLoader) => void) | undefined) => undefined;
     var clear: (input: string | string[]) => void;

package/core/useHelper.d.ts

@@ -4,5 +4,7 @@ import { Falsey } from 'utility-types';
 declare type Helper = Object3D & {
     update: () => void;
 };
-export declare function useHelper<T>(object3D: React.MutableRefObject<Object3D | undefined> | Falsey | undefined, helperConstructor: T, ...args: any[]): React.MutableRefObject<Helper | undefined>;
+declare type Constructor = new (...args: any[]) => any;
+declare type Rest<T> = T extends [infer _, ...infer R] ? R : never;
+export declare function useHelper<T extends Constructor>(object3D: React.MutableRefObject<Object3D | undefined> | Falsey | undefined, helperConstructor: T, ...args: Rest<ConstructorParameters<T>>): React.MutableRefObject<Helper | undefined>;
 export {};