@react-three/drei 7.25.2 → 7.26.0

package/materials/MeshReflectorMaterial.js

@@ -15,57 +15,15 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
     this._tDiffuse = {
       value: null
     };
-    this._u_mipmap_0 = {
-      value: null
-    };
-    this._u_mipmap_1 = {
-      value: null
-    };
-    this._u_mipmap_2 = {
-      value: null
-    };
-    this._u_mipmap_3 = {
-      value: null
-    };
-    this._u_mipmap_4 = {
-      value: null
-    };
-    this._u_mipmap_5 = {
-      value: null
-    };
-    this._u_mipmap_6 = {
-      value: null
-    };
-    this._u_mipmap_7 = {
-      value: null
-    };
-    this._u_mipmap_res_0 = {
-      value: null
-    };
-    this._u_mipmap_res_1 = {
-      value: null
-    };
-    this._u_mipmap_res_2 = {
-      value: null
-    };
-    this._u_mipmap_res_3 = {
-      value: null
-    };
-    this._u_mipmap_res_4 = {
-      value: null
-    };
-    this._u_mipmap_res_5 = {
-      value: null
-    };
-    this._u_mipmap_res_6 = {
-      value: null
-    };
-    this._u_mipmap_res_7 = {
+    this._tDiffuseBlur = {
       value: null
     };
     this._textureMatrix = {
       value: null
     };
+    this._hasBlur = {
+      value: false
+    };
     this._mirror = {
       value: 0.0
     };
@@ -101,25 +59,11 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
     }
 
     shader.uniforms.debug = this._debug;
+    shader.uniforms.hasBlur = this._hasBlur;
     shader.uniforms.tDiffuse = this._tDiffuse;
     shader.uniforms.tDepth = this._tDepth;
     shader.uniforms.distortionMap = this._distortionMap;
-    shader.uniforms.u_mipmap_0 = this._u_mipmap_0;
-    shader.uniforms.u_mipmap_1 = this._u_mipmap_1;
-    shader.uniforms.u_mipmap_2 = this._u_mipmap_2;
-    shader.uniforms.u_mipmap_3 = this._u_mipmap_3;
-    shader.uniforms.u_mipmap_4 = this._u_mipmap_4;
-    shader.uniforms.u_mipmap_5 = this._u_mipmap_5;
-    shader.uniforms.u_mipmap_6 = this._u_mipmap_6;
-    shader.uniforms.u_mipmap_7 = this._u_mipmap_7;
-    shader.uniforms.u_mipmap_res_0 = this._u_mipmap_res_0;
-    shader.uniforms.u_mipmap_res_1 = this._u_mipmap_res_1;
-    shader.uniforms.u_mipmap_res_2 = this._u_mipmap_res_2;
-    shader.uniforms.u_mipmap_res_3 = this._u_mipmap_res_3;
-    shader.uniforms.u_mipmap_res_4 = this._u_mipmap_res_4;
-    shader.uniforms.u_mipmap_res_5 = this._u_mipmap_res_5;
-    shader.uniforms.u_mipmap_res_6 = this._u_mipmap_res_6;
-    shader.uniforms.u_mipmap_res_7 = this._u_mipmap_res_7;
+    shader.uniforms.tDiffuseBlur = this._tDiffuseBlur;
     shader.uniforms.textureMatrix = this._textureMatrix;
     shader.uniforms.mirror = this._mirror;
     shader.uniforms.mixBlur = this._mixBlur;
@@ -139,27 +83,13 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
     shader.fragmentShader = `
         uniform int debug;
         uniform sampler2D tDiffuse;
+        uniform sampler2D tDiffuseBlur;
         uniform sampler2D tDepth;
         uniform sampler2D distortionMap;
-        uniform sampler2D u_mipmap_0;
-        uniform sampler2D u_mipmap_1;
-        uniform sampler2D u_mipmap_2;
-        uniform sampler2D u_mipmap_3;
-        uniform sampler2D u_mipmap_4;
-        uniform sampler2D u_mipmap_5;
-        uniform sampler2D u_mipmap_6;
-        uniform sampler2D u_mipmap_7;
-        uniform vec2 u_mipmap_res_0;
-        uniform vec2 u_mipmap_res_1;
-        uniform vec2 u_mipmap_res_2;
-        uniform vec2 u_mipmap_res_3;
-        uniform vec2 u_mipmap_res_4;
-        uniform vec2 u_mipmap_res_5;
-        uniform vec2 u_mipmap_res_6;
-        uniform vec2 u_mipmap_res_7;
         uniform float distortion;
         uniform float cameraNear;
 			  uniform float cameraFar;
+        uniform bool hasBlur;
         uniform float mixBlur;
         uniform float mirror;
         uniform float mixStrength;
@@ -167,145 +97,79 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
         uniform float maxDepthThreshold;
         uniform float depthScale;
         uniform float depthToBlurRatioBias;
-        varying vec4 my_vUv;  
-        
-        // from http://www.java-gaming.org/index.php?topic=35123.0
-        vec4 cubic( float v ) {
-          vec4 n = vec4( 1.0, 2.0, 3.0, 4.0 ) - v;
-          vec4 s = n * n * n;
-          float x = s.x;
-          float y = s.y - 4.0 * s.x;
-          float z = s.z - 4.0 * s.y + 6.0 * s.x;
-          float w = 6.0 - x - y - z;
-          return vec4( x, y, z, w ) * ( 1.0 / 6.0 );
-        }
-        
-        vec4 textureBicubic( sampler2D sampler, vec2 texCoords, vec2 texSize ) {
-          vec2 invTexSize = 1.0 / texSize;
-          texCoords = texCoords * texSize - 0.5;
-          vec2 fxy = fract( texCoords );
-          texCoords -= fxy;
-
-          vec4 xcubic = cubic( fxy.x );
-          vec4 ycubic = cubic( fxy.y );
-          vec4 c = texCoords.xxyy + vec2 ( - 0.5, + 1.5 ).xyxy;
-          vec4 s = vec4( xcubic.xz + xcubic.yw, ycubic.xz + ycubic.yw );
-
-          vec4 offset = c + vec4( xcubic.yw, ycubic.yw ) / s;
-          offset *= invTexSize.xxyy;
-        
-          vec4 sample0 = texture2D( sampler, offset.xz);
-          vec4 sample1 = texture2D( sampler, offset.yz);
-          vec4 sample2 = texture2D( sampler, offset.xw);
-          vec4 sample3 = texture2D( sampler, offset.yw);
-        
-          float sx = s.x / ( s.x + s.y );
-          float sy = s.z / ( s.z + s.w );
-
-          return mix(
-            mix(
-              sample3,
-              sample2,
-              sx
-            ),
-            mix(
-              sample1,
-              sample0,
-              sx
-            ),
-            sy
-          );
-        }
-
-
+        varying vec4 my_vUv;        
         ${shader.fragmentShader}`;
     shader.fragmentShader = shader.fragmentShader.replace('#include <emissivemap_fragment>', `#include <emissivemap_fragment>
     
-      float depthFactor = 1.0;
       float distortionFactor = 0.0;
-      vec3 my_normal = vec3(0.0);
-      float reflectorRoughnessFactor = roughness;
-      vec3 coord = my_vUv.xyz / my_vUv.w;
-
       #ifdef USE_DISTORTION
         distortionFactor = texture2D(distortionMap, vUv).r * distortion;
       #endif
 
+      vec4 new_vUv = my_vUv;
+      new_vUv.x += distortionFactor;
+      new_vUv.y += distortionFactor;
+
+      vec4 base = texture2DProj(tDiffuse, new_vUv);
+      vec4 blur = texture2DProj(tDiffuseBlur, new_vUv);
+      
+      vec4 merge = base;
+      
       #ifdef USE_NORMALMAP
+        vec2 normal_uv = vec2(0.0);
         vec4 normalColor = texture2D(normalMap, vUv * normalScale);
-        my_normal = normalize( vec3( normalColor.r * 2.0 - 1.0, normalColor.b ,  normalColor.g * 2.0 - 1.0 ) );
+        vec3 my_normal = normalize( vec3( normalColor.r * 2.0 - 1.0, normalColor.b,  normalColor.g * 2.0 - 1.0 ) );
+        vec3 coord = new_vUv.xyz / new_vUv.w;
+        normal_uv = coord.xy + coord.z * my_normal.xz * 0.05;
+        vec4 base_normal = texture2D(tDiffuse, normal_uv);
+        vec4 blur_normal = texture2D(tDiffuseBlur, normal_uv);
+        merge = base_normal;
+        blur = blur_normal;
       #endif
 
-      #ifdef USE_ROUGHNESSMAP
-        vec4 reflectorTexelRoughness = texture2D( roughnessMap, vUv );
-        reflectorRoughnessFactor *= reflectorTexelRoughness.g;
-      #endif
-
-      vec2 proj_vUv = coord.xy + coord.z * my_normal.xz * 0.01;
-      proj_vUv.x += distortionFactor;
-      proj_vUv.y += distortionFactor;
-      
-      float lod = 1.0 - min(1.0, mixBlur * reflectorRoughnessFactor);
+      float depthFactor = 0.0001;
+      float blurFactor = 0.0;
 
       #ifdef USE_DEPTH
-        vec4 depth = texture2D(tDepth, proj_vUv);
+        vec4 depth = texture2DProj(tDepth, new_vUv);
         depthFactor = smoothstep(minDepthThreshold, maxDepthThreshold, 1.0-(depth.r * depth.a));
         depthFactor *= depthScale;
-        depthFactor = max(0.0001, min(1.0, depthFactor + depthToBlurRatioBias));
+        depthFactor = max(0.0001, min(1.0, depthFactor));
+
+        #ifdef USE_BLUR
+          blur = blur * min(1.0, depthFactor + depthToBlurRatioBias);
+          merge = merge * min(1.0, depthFactor + 0.5);;
+        #else
+          merge = merge * depthFactor;
+        #endif
+  
       #endif
 
-      vec4 baseColor = texture2D(tDiffuse, proj_vUv);
-      vec4 mixedColor;
-
-      float _lod = (1.0 - pow(1.0 - lod, 4.0)) * 8.0;
-      if (_lod < 1.) {
-        vec4 one = textureBicubic(u_mipmap_7, proj_vUv, u_mipmap_res_7);
-        vec4 two = textureBicubic(u_mipmap_6, proj_vUv, u_mipmap_res_6);
-        mixedColor = mix(one, two, _lod);
-      } else if (_lod < 2.) {
-        vec4 one = textureBicubic(u_mipmap_6, proj_vUv, u_mipmap_res_6);
-        vec4 two = textureBicubic(u_mipmap_5, proj_vUv, u_mipmap_res_5);
-        mixedColor = mix(one, two, _lod - 1.0);
-      } else if (_lod < 3.) {
-        vec4 one = textureBicubic(u_mipmap_5, proj_vUv, u_mipmap_res_5);
-        vec4 two = textureBicubic(u_mipmap_4, proj_vUv, u_mipmap_res_4);
-        mixedColor = mix(one, two, _lod - 2.0);
-      } else if (_lod < 4.) {
-        vec4 one = textureBicubic(u_mipmap_4, proj_vUv, u_mipmap_res_4);
-        vec4 two = textureBicubic(u_mipmap_3, proj_vUv, u_mipmap_res_3);
-        mixedColor = mix(one, two, _lod - 3.0);
-      } else if (_lod < 5.) {
-        vec4 one = textureBicubic(u_mipmap_3, proj_vUv, u_mipmap_res_3);
-        vec4 two = textureBicubic(u_mipmap_2, proj_vUv, u_mipmap_res_2);
-        mixedColor = mix(one, two, _lod - 4.0);
-      } else if (_lod < 6.) {
-        vec4 one = textureBicubic(u_mipmap_2, proj_vUv, u_mipmap_res_2);
-        vec4 two = textureBicubic(u_mipmap_1, proj_vUv, u_mipmap_res_1);
-        mixedColor = mix(one, two, _lod - 5.0);
-      } else if (_lod < 7.) {
-        vec4 one = textureBicubic(u_mipmap_1, proj_vUv, u_mipmap_res_1);
-        vec4 two = textureBicubic(u_mipmap_0, proj_vUv, u_mipmap_res_0);
-        mixedColor = mix(one, two, _lod - 6.0);
-      } else {
-        vec4 one = textureBicubic(u_mipmap_0, proj_vUv, u_mipmap_res_0);
-        mixedColor = mix(one, baseColor, _lod - 7.0);
-      }
+      float reflectorRoughnessFactor = roughness;
+      #ifdef USE_ROUGHNESSMAP
+        vec4 reflectorTexelRoughness = texture2D( roughnessMap, vUv );
+        reflectorRoughnessFactor *= reflectorTexelRoughness.g;
+      #endif
+      
+      #ifdef USE_BLUR
+        blurFactor = min(1.0, mixBlur * reflectorRoughnessFactor);
+        merge = mix(merge, blur, blurFactor);
+      #endif
 
-      mixedColor.rgb *= depthFactor;
-      diffuseColor.rgb = diffuseColor.rgb * ((1.0 - min(1.0, mirror)) + mixedColor.rgb * mixStrength);     
+      diffuseColor.rgb = diffuseColor.rgb * ((1.0 - min(1.0, mirror)) + merge.rgb * mixStrength);           
       diffuseColor = sRGBToLinear(diffuseColor);
-
+      
       if (debug == 1) {
         diffuseColor = sRGBToLinear(vec4(vec3(depthFactor), 1.0));
       }
       if (debug == 2) {
-        diffuseColor = sRGBToLinear(texture2D(tDiffuse, proj_vUv));
+        diffuseColor = sRGBToLinear(vec4(vec3(blurFactor), 1.0));
       }
       if (debug == 3) {
-        diffuseColor = sRGBToLinear(texture2D(distortionMap, vUv));
+        diffuseColor = sRGBToLinear(texture2DProj(tDiffuse, new_vUv));
       }
       if (debug == 4) {
-        diffuseColor = sRGBToLinear(vec4(vec3(lod), 1.0));
+        diffuseColor = sRGBToLinear(texture2DProj(tDiffuseBlur, new_vUv));
       }
       `);
   }
@@ -334,132 +198,12 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
     this._distortionMap.value = v;
   }
 
-  get u_mipmap_0() {
-    return this._u_mipmap_0.value;
-  }
-
-  set u_mipmap_0(v) {
-    this._u_mipmap_0.value = v;
-  }
-
-  get u_mipmap_1() {
-    return this._u_mipmap_1.value;
-  }
-
-  set u_mipmap_1(v) {
-    this._u_mipmap_1.value = v;
-  }
-
-  get u_mipmap_2() {
-    return this._u_mipmap_2.value;
-  }
-
-  set u_mipmap_2(v) {
-    this._u_mipmap_2.value = v;
-  }
-
-  get u_mipmap_3() {
-    return this._u_mipmap_3.value;
-  }
-
-  set u_mipmap_3(v) {
-    this._u_mipmap_3.value = v;
-  }
-
-  get u_mipmap_4() {
-    return this._u_mipmap_4.value;
-  }
-
-  set u_mipmap_4(v) {
-    this._u_mipmap_4.value = v;
-  }
-
-  get u_mipmap_5() {
-    return this._u_mipmap_5.value;
+  get tDiffuseBlur() {
+    return this._tDiffuseBlur.value;
   }
 
-  set u_mipmap_5(v) {
-    this._u_mipmap_5.value = v;
-  }
-
-  get u_mipmap_6() {
-    return this._u_mipmap_6.value;
-  }
-
-  set u_mipmap_6(v) {
-    this._u_mipmap_6.value = v;
-  }
-
-  get u_mipmap_7() {
-    return this._u_mipmap_7.value;
-  }
-
-  set u_mipmap_7(v) {
-    this._u_mipmap_7.value = v;
-  }
-
-  get u_mipmap_res_0() {
-    return this._u_mipmap_res_0.value;
-  }
-
-  set u_mipmap_res_0(v) {
-    this._u_mipmap_res_0.value = v;
-  }
-
-  get u_mipmap_res_1() {
-    return this._u_mipmap_res_1.value;
-  }
-
-  set u_mipmap_res_1(v) {
-    this._u_mipmap_res_1.value = v;
-  }
-
-  get u_mipmap_res_2() {
-    return this._u_mipmap_res_2.value;
-  }
-
-  set u_mipmap_res_2(v) {
-    this._u_mipmap_res_2.value = v;
-  }
-
-  get u_mipmap_res_3() {
-    return this._u_mipmap_res_3.value;
-  }
-
-  set u_mipmap_res_3(v) {
-    this._u_mipmap_res_3.value = v;
-  }
-
-  get u_mipmap_res_4() {
-    return this._u_mipmap_res_4.value;
-  }
-
-  set u_mipmap_res_4(v) {
-    this._u_mipmap_res_4.value = v;
-  }
-
-  get u_mipmap_res_5() {
-    return this._u_mipmap_res_5.value;
-  }
-
-  set u_mipmap_res_5(v) {
-    this._u_mipmap_res_5.value = v;
-  }
-
-  get u_mipmap_res_6() {
-    return this._u_mipmap_res_6.value;
-  }
-
-  set u_mipmap_res_6(v) {
-    this._u_mipmap_res_6.value = v;
-  }
-
-  get u_mipmap_res_7() {
-    return this._u_mipmap_res_7.value;
-  }
-
-  set u_mipmap_res_7(v) {
-    this._u_mipmap_res_7.value = v;
+  set tDiffuseBlur(v) {
+    this._tDiffuseBlur.value = v;
   }
 
   get textureMatrix() {
@@ -470,6 +214,14 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
     this._textureMatrix.value = v;
   }
 
+  get hasBlur() {
+    return this._hasBlur.value;
+  }
+
+  set hasBlur(v) {
+    this._hasBlur.value = v;
+  }
+
   get mirror() {
     return this._mirror.value;
   }

package/materials/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./MeshReflectorMaterial.cjs.js");require("three"),exports.MeshReflectorMaterial=e.MeshReflectorMaterial;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./BlurPass.cjs.js"),r=require("./MeshReflectorMaterial.cjs.js");require("three"),require("./ConvolutionMaterial.cjs.js"),exports.BlurPass=e.BlurPass,exports.MeshReflectorMaterial=r.MeshReflectorMaterial;

package/materials/index.d.ts

@@ -1 +1,2 @@
+export * from './BlurPass';
 export * from './MeshReflectorMaterial';

package/materials/index.js

@@ -1,2 +1,4 @@
+export { BlurPass } from './BlurPass.js';
 export { MeshReflectorMaterial } from './MeshReflectorMaterial.js';
 import 'three';
+import './ConvolutionMaterial.js';

package/native/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../core/Billboard.cjs.js"),r=require("../core/QuadraticBezierLine.cjs.js"),s=require("../core/CubicBezierLine.cjs.js"),o=require("../core/Line.cjs.js"),t=require("../core/PositionalAudio.cjs.js"),i=require("../core/Text.cjs.js"),c=require("../core/Effects.cjs.js"),u=require("../core/GradientTexture.cjs.js"),a=require("../core/Image.cjs.js"),p=require("../core/OrthographicCamera.cjs.js"),j=require("../core/PerspectiveCamera.cjs.js"),n=require("../core/CubeCamera.cjs.js"),l=require("../core/DeviceOrientationControls.cjs.js"),x=require("../core/FlyControls.cjs.js"),q=require("../core/MapControls.cjs.js"),d=require("../core/OrbitControls.cjs.js"),h=require("../core/TrackballControls.cjs.js"),C=require("../core/ArcballControls.cjs.js"),m=require("../core/TransformControls.cjs.js"),B=require("../core/PointerLockControls.cjs.js"),S=require("../core/FirstPersonControls.cjs.js"),b=require("../core/GizmoHelper.cjs.js"),f=require("../core/GizmoViewcube.cjs.js"),P=require("../core/GizmoViewport.cjs.js"),M=require("../core/useCubeTexture.cjs.js"),T=require("../core/useFBX.cjs.js"),g=require("../core/useGLTF.cjs.js"),v=require("../core/useProgress.cjs.js"),D=require("../core/useTexture.cjs.js"),L=require("../core/Stats.cjs.js"),A=require("../core/DepthBuffer.cjs.js"),G=require("../core/useDepthBuffer.cjs.js"),k=require("../core/useAspect.cjs.js"),F=require("../core/useCamera.cjs.js"),w=require("../core/useDetectGPU.cjs.js"),z=require("../core/useHelper.cjs.js"),I=require("../core/useBVH.cjs.js"),O=require("../core/useContextBridge.cjs.js"),E=require("../core/useAnimations.cjs.js"),y=require("../core/useFBO.cjs.js"),R=require("../core/useIntersect.cjs.js"),H=require("../core/useSimplification.cjs.js"),V=require("../core/useTessellation.cjs.js"),Q=require("../core/useEdgeSplit.cjs.js"),W=require("../core/CurveModifier.cjs.js"),N=require("../core/MeshDistortMaterial.cjs.js"),U=require("../core/MeshWobbleMaterial.cjs.js"),X=require("../core/PointMaterial.cjs.js"),K=require("../core/shaderMaterial.cjs.js"),_=require("../core/softShadows.cjs.js"),J=require("../core/shapes.cjs.js"),Y=require("../core/RoundedBox.cjs.js"),Z=require("../core/ScreenQuad.cjs.js"),$=require("../core/Center.cjs.js"),ee=require("../core/Bounds.cjs.js"),re=require("../core/CameraShake.cjs.js"),se=require("../core/Float.cjs.js"),oe=require("../core/Stage.cjs.js"),te=require("../core/Backdrop.cjs.js"),ie=require("../core/Shadow.cjs.js"),ce=require("../core/ContactShadows.cjs.js"),ue=require("../core/Reflector.cjs.js"),ae=require("../core/SpotLight.cjs.js"),pe=require("../core/Environment.cjs.js"),je=require("../core/Sky.cjs.js"),ne=require("../core/Stars.cjs.js"),le=require("../core/Cloud.cjs.js"),xe=require("../core/useMatcapTexture.cjs.js"),qe=require("../core/useNormalTexture.cjs.js"),de=require("../core/Points.cjs.js"),he=require("../core/Instances.cjs.js"),Ce=require("../core/Segments.cjs.js"),me=require("../core/Detailed.cjs.js"),Be=require("../core/Preload.cjs.js"),Se=require("../core/BakeShadows.cjs.js"),be=require("../core/meshBounds.cjs.js"),fe=require("../core/AdaptiveDpr.cjs.js"),Pe=require("../core/AdaptiveEvents.cjs.js"),Me=require("../materials/MeshReflectorMaterial.cjs.js");require("@babel/runtime/helpers/extends"),require("react"),require("@react-three/fiber"),require("react-merge-refs"),require("three"),require("three-stdlib"),require("troika-three-text"),require("lodash.omit"),require("lodash.pick"),require("zustand"),require("three/examples/js/libs/stats.min"),require("../helpers/useEffectfulState.cjs.js"),require("detect-gpu"),require("use-asset"),require("three-mesh-bvh"),require("../helpers/environment-assets.cjs.js"),require("../materials/SpotLightMaterial.cjs.js"),require("../assets/cloud.base64.cjs.js"),require("../helpers/matcap-assets.cjs.js"),require("../helpers/normal-assets.cjs.js"),require("../helpers/Position.cjs.js"),require("react-composer"),exports.Billboard=e.Billboard,exports.QuadraticBezierLine=r.QuadraticBezierLine,exports.CubicBezierLine=s.CubicBezierLine,exports.Line=o.Line,exports.PositionalAudio=t.PositionalAudio,exports.Text=i.Text,exports.Effects=c.Effects,exports.isWebGL2Available=c.isWebGL2Available,exports.GradientTexture=u.GradientTexture,exports.Image=a.Image,exports.OrthographicCamera=p.OrthographicCamera,exports.PerspectiveCamera=j.PerspectiveCamera,exports.CubeCamera=n.CubeCamera,exports.DeviceOrientationControls=l.DeviceOrientationControls,exports.FlyControls=x.FlyControls,exports.MapControls=q.MapControls,exports.OrbitControls=d.OrbitControls,exports.TrackballControls=h.TrackballControls,exports.ArcballControls=C.ArcballControls,exports.TransformControls=m.TransformControls,exports.PointerLockControls=B.PointerLockControls,exports.FirstPersonControls=S.FirstPersonControls,exports.GizmoHelper=b.GizmoHelper,exports.useGizmoContext=b.useGizmoContext,exports.GizmoViewcube=f.GizmoViewcube,exports.GizmoViewport=P.GizmoViewport,exports.useCubeTexture=M.useCubeTexture,exports.useFBX=T.useFBX,exports.useGLTF=g.useGLTF,exports.useProgress=v.useProgress,exports.IsObject=D.IsObject,exports.useTexture=D.useTexture,exports.Stats=L.Stats,exports.DepthBuffer=A.DepthBuffer,exports.useDepthBuffer=G.useDepthBuffer,exports.useAspect=k.useAspect,exports.useCamera=F.useCamera,exports.useDetectGPU=w.useDetectGPU,exports.useHelper=z.useHelper,exports.useBVH=I.useBVH,exports.useContextBridge=O.useContextBridge,exports.useAnimations=E.useAnimations,exports.useFBO=y.useFBO,exports.useIntersect=R.useIntersect,exports.useSimplification=H.useSimplification,exports.useTessellation=V.useTessellation,exports.useEdgeSplit=Q.useEdgeSplit,exports.CurveModifier=W.CurveModifier,exports.MeshDistortMaterial=N.MeshDistortMaterial,exports.MeshWobbleMaterial=U.MeshWobbleMaterial,exports.PointMaterial=X.PointMaterial,exports.PointMaterialImpl=X.PointMaterialImpl,exports.shaderMaterial=K.shaderMaterial,exports.softShadows=_.softShadows,exports.Box=J.Box,exports.Circle=J.Circle,exports.Cone=J.Cone,exports.Cylinder=J.Cylinder,exports.Dodecahedron=J.Dodecahedron,exports.Extrude=J.Extrude,exports.Icosahedron=J.Icosahedron,exports.Lathe=J.Lathe,exports.Octahedron=J.Octahedron,exports.Parametric=J.Parametric,exports.Plane=J.Plane,exports.Polyhedron=J.Polyhedron,exports.Ring=J.Ring,exports.Sphere=J.Sphere,exports.Tetrahedron=J.Tetrahedron,exports.Torus=J.Torus,exports.TorusKnot=J.TorusKnot,exports.Tube=J.Tube,exports.RoundedBox=Y.RoundedBox,exports.ScreenQuad=Z.ScreenQuad,exports.Center=$.Center,exports.Bounds=ee.Bounds,exports.useBounds=ee.useBounds,exports.CameraShake=re.CameraShake,exports.Float=se.Float,exports.Stage=oe.Stage,exports.Backdrop=te.Backdrop,exports.Shadow=ie.Shadow,exports.ContactShadows=ce.ContactShadows,exports.Reflector=ue.Reflector,exports.SpotLight=ae.SpotLight,exports.Environment=pe.Environment,exports.Sky=je.Sky,exports.calcPosFromAngles=je.calcPosFromAngles,exports.Stars=ne.Stars,exports.Cloud=le.Cloud,exports.useMatcapTexture=xe.useMatcapTexture,exports.useNormalTexture=qe.useNormalTexture,exports.Point=de.Point,exports.Points=de.Points,exports.PointsBuffer=de.PointsBuffer,exports.Instance=he.Instance,exports.Instances=he.Instances,exports.Merged=he.Merged,exports.Segment=Ce.Segment,exports.Segments=Ce.Segments,exports.Detailed=me.Detailed,exports.Preload=Be.Preload,exports.BakeShadows=Se.BakeShadows,exports.meshBounds=be.meshBounds,exports.AdaptiveDpr=fe.AdaptiveDpr,exports.AdaptiveEvents=Pe.AdaptiveEvents,exports.MeshReflectorMaterial=Me.MeshReflectorMaterial;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../core/Billboard.cjs.js"),r=require("../core/QuadraticBezierLine.cjs.js"),s=require("../core/CubicBezierLine.cjs.js"),o=require("../core/Line.cjs.js"),t=require("../core/PositionalAudio.cjs.js"),i=require("../core/Text.cjs.js"),c=require("../core/Effects.cjs.js"),u=require("../core/GradientTexture.cjs.js"),a=require("../core/Image.cjs.js"),j=require("../core/OrthographicCamera.cjs.js"),p=require("../core/PerspectiveCamera.cjs.js"),n=require("../core/CubeCamera.cjs.js"),l=require("../core/DeviceOrientationControls.cjs.js"),x=require("../core/FlyControls.cjs.js"),q=require("../core/MapControls.cjs.js"),d=require("../core/OrbitControls.cjs.js"),h=require("../core/TrackballControls.cjs.js"),C=require("../core/ArcballControls.cjs.js"),m=require("../core/TransformControls.cjs.js"),B=require("../core/PointerLockControls.cjs.js"),S=require("../core/FirstPersonControls.cjs.js"),b=require("../core/GizmoHelper.cjs.js"),f=require("../core/GizmoViewcube.cjs.js"),P=require("../core/GizmoViewport.cjs.js"),M=require("../core/useCubeTexture.cjs.js"),T=require("../core/useFBX.cjs.js"),g=require("../core/useGLTF.cjs.js"),v=require("../core/useProgress.cjs.js"),D=require("../core/useTexture.cjs.js"),L=require("../core/Stats.cjs.js"),A=require("../core/DepthBuffer.cjs.js"),G=require("../core/useDepthBuffer.cjs.js"),k=require("../core/useAspect.cjs.js"),F=require("../core/useCamera.cjs.js"),w=require("../core/useDetectGPU.cjs.js"),z=require("../core/useHelper.cjs.js"),I=require("../core/useBVH.cjs.js"),O=require("../core/useContextBridge.cjs.js"),E=require("../core/useAnimations.cjs.js"),y=require("../core/useFBO.cjs.js"),R=require("../core/useIntersect.cjs.js"),H=require("../core/useSimplification.cjs.js"),V=require("../core/useTessellation.cjs.js"),Q=require("../core/useEdgeSplit.cjs.js"),W=require("../core/CurveModifier.cjs.js"),N=require("../core/MeshDistortMaterial.cjs.js"),U=require("../core/MeshWobbleMaterial.cjs.js"),X=require("../core/PointMaterial.cjs.js"),K=require("../core/shaderMaterial.cjs.js"),_=require("../core/softShadows.cjs.js"),J=require("../core/shapes.cjs.js"),Y=require("../core/RoundedBox.cjs.js"),Z=require("../core/ScreenQuad.cjs.js"),$=require("../core/Center.cjs.js"),ee=require("../core/Bounds.cjs.js"),re=require("../core/CameraShake.cjs.js"),se=require("../core/Float.cjs.js"),oe=require("../core/Stage.cjs.js"),te=require("../core/Backdrop.cjs.js"),ie=require("../core/Shadow.cjs.js"),ce=require("../core/ContactShadows.cjs.js"),ue=require("../core/Reflector.cjs.js"),ae=require("../core/SpotLight.cjs.js"),je=require("../core/Environment.cjs.js"),pe=require("../core/Sky.cjs.js"),ne=require("../core/Stars.cjs.js"),le=require("../core/Cloud.cjs.js"),xe=require("../core/useMatcapTexture.cjs.js"),qe=require("../core/useNormalTexture.cjs.js"),de=require("../core/Points.cjs.js"),he=require("../core/Instances.cjs.js"),Ce=require("../core/Segments.cjs.js"),me=require("../core/Detailed.cjs.js"),Be=require("../core/Preload.cjs.js"),Se=require("../core/BakeShadows.cjs.js"),be=require("../core/meshBounds.cjs.js"),fe=require("../core/AdaptiveDpr.cjs.js"),Pe=require("../core/AdaptiveEvents.cjs.js"),Me=require("../materials/BlurPass.cjs.js"),Te=require("../materials/MeshReflectorMaterial.cjs.js");require("@babel/runtime/helpers/extends"),require("react"),require("@react-three/fiber"),require("react-merge-refs"),require("three"),require("three-stdlib"),require("troika-three-text"),require("lodash.omit"),require("lodash.pick"),require("zustand"),require("three/examples/js/libs/stats.min"),require("../helpers/useEffectfulState.cjs.js"),require("detect-gpu"),require("use-asset"),require("three-mesh-bvh"),require("../helpers/environment-assets.cjs.js"),require("../materials/ConvolutionMaterial.cjs.js"),require("../materials/SpotLightMaterial.cjs.js"),require("../assets/cloud.base64.cjs.js"),require("../helpers/matcap-assets.cjs.js"),require("../helpers/normal-assets.cjs.js"),require("../helpers/Position.cjs.js"),require("react-composer"),exports.Billboard=e.Billboard,exports.QuadraticBezierLine=r.QuadraticBezierLine,exports.CubicBezierLine=s.CubicBezierLine,exports.Line=o.Line,exports.PositionalAudio=t.PositionalAudio,exports.Text=i.Text,exports.Effects=c.Effects,exports.isWebGL2Available=c.isWebGL2Available,exports.GradientTexture=u.GradientTexture,exports.Image=a.Image,exports.OrthographicCamera=j.OrthographicCamera,exports.PerspectiveCamera=p.PerspectiveCamera,exports.CubeCamera=n.CubeCamera,exports.DeviceOrientationControls=l.DeviceOrientationControls,exports.FlyControls=x.FlyControls,exports.MapControls=q.MapControls,exports.OrbitControls=d.OrbitControls,exports.TrackballControls=h.TrackballControls,exports.ArcballControls=C.ArcballControls,exports.TransformControls=m.TransformControls,exports.PointerLockControls=B.PointerLockControls,exports.FirstPersonControls=S.FirstPersonControls,exports.GizmoHelper=b.GizmoHelper,exports.useGizmoContext=b.useGizmoContext,exports.GizmoViewcube=f.GizmoViewcube,exports.GizmoViewport=P.GizmoViewport,exports.useCubeTexture=M.useCubeTexture,exports.useFBX=T.useFBX,exports.useGLTF=g.useGLTF,exports.useProgress=v.useProgress,exports.IsObject=D.IsObject,exports.useTexture=D.useTexture,exports.Stats=L.Stats,exports.DepthBuffer=A.DepthBuffer,exports.useDepthBuffer=G.useDepthBuffer,exports.useAspect=k.useAspect,exports.useCamera=F.useCamera,exports.useDetectGPU=w.useDetectGPU,exports.useHelper=z.useHelper,exports.useBVH=I.useBVH,exports.useContextBridge=O.useContextBridge,exports.useAnimations=E.useAnimations,exports.useFBO=y.useFBO,exports.useIntersect=R.useIntersect,exports.useSimplification=H.useSimplification,exports.useTessellation=V.useTessellation,exports.useEdgeSplit=Q.useEdgeSplit,exports.CurveModifier=W.CurveModifier,exports.MeshDistortMaterial=N.MeshDistortMaterial,exports.MeshWobbleMaterial=U.MeshWobbleMaterial,exports.PointMaterial=X.PointMaterial,exports.PointMaterialImpl=X.PointMaterialImpl,exports.shaderMaterial=K.shaderMaterial,exports.softShadows=_.softShadows,exports.Box=J.Box,exports.Circle=J.Circle,exports.Cone=J.Cone,exports.Cylinder=J.Cylinder,exports.Dodecahedron=J.Dodecahedron,exports.Extrude=J.Extrude,exports.Icosahedron=J.Icosahedron,exports.Lathe=J.Lathe,exports.Octahedron=J.Octahedron,exports.Parametric=J.Parametric,exports.Plane=J.Plane,exports.Polyhedron=J.Polyhedron,exports.Ring=J.Ring,exports.Sphere=J.Sphere,exports.Tetrahedron=J.Tetrahedron,exports.Torus=J.Torus,exports.TorusKnot=J.TorusKnot,exports.Tube=J.Tube,exports.RoundedBox=Y.RoundedBox,exports.ScreenQuad=Z.ScreenQuad,exports.Center=$.Center,exports.Bounds=ee.Bounds,exports.useBounds=ee.useBounds,exports.CameraShake=re.CameraShake,exports.Float=se.Float,exports.Stage=oe.Stage,exports.Backdrop=te.Backdrop,exports.Shadow=ie.Shadow,exports.ContactShadows=ce.ContactShadows,exports.Reflector=ue.Reflector,exports.SpotLight=ae.SpotLight,exports.Environment=je.Environment,exports.Sky=pe.Sky,exports.calcPosFromAngles=pe.calcPosFromAngles,exports.Stars=ne.Stars,exports.Cloud=le.Cloud,exports.useMatcapTexture=xe.useMatcapTexture,exports.useNormalTexture=qe.useNormalTexture,exports.Point=de.Point,exports.Points=de.Points,exports.PointsBuffer=de.PointsBuffer,exports.Instance=he.Instance,exports.Instances=he.Instances,exports.Merged=he.Merged,exports.Segment=Ce.Segment,exports.Segments=Ce.Segments,exports.Detailed=me.Detailed,exports.Preload=Be.Preload,exports.BakeShadows=Se.BakeShadows,exports.meshBounds=be.meshBounds,exports.AdaptiveDpr=fe.AdaptiveDpr,exports.AdaptiveEvents=Pe.AdaptiveEvents,exports.BlurPass=Me.BlurPass,exports.MeshReflectorMaterial=Te.MeshReflectorMaterial;

package/native/index.js

@@ -76,6 +76,7 @@ export { BakeShadows } from '../core/BakeShadows.js';
 export { meshBounds } from '../core/meshBounds.js';
 export { AdaptiveDpr } from '../core/AdaptiveDpr.js';
 export { AdaptiveEvents } from '../core/AdaptiveEvents.js';
+export { BlurPass } from '../materials/BlurPass.js';
 export { MeshReflectorMaterial } from '../materials/MeshReflectorMaterial.js';
 import '@babel/runtime/helpers/esm/extends';
 import 'react';
@@ -93,6 +94,7 @@ import 'detect-gpu';
 import 'use-asset';
 import 'three-mesh-bvh';
 import '../helpers/environment-assets.js';
+import '../materials/ConvolutionMaterial.js';
 import '../materials/SpotLightMaterial.js';
 import '../assets/cloud.base64.js';
 import '../helpers/matcap-assets.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/drei",
-  "version": "7.25.2",
+  "version": "7.26.0",
   "private": false,
   "description": "useful add-ons for react-three-fiber",
   "keywords": [
@@ -40,6 +40,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.11.2",
+    "@react-spring/three": "^9.3.1",
+    "@use-gesture/react": "^10.2.0",
     "detect-gpu": "^3.1.28",
     "glsl-noise": "^0.0.0",
     "lodash.omit": "^4.5.0",
@@ -48,7 +50,7 @@
     "react-merge-refs": "^1.1.0",
     "stats.js": "^0.17.0",
     "three-mesh-bvh": "^0.5.2",
-    "three-stdlib": "^2.6.0",
+    "three-stdlib": "^2.6.1",
     "troika-three-text": "^0.44.0",
     "use-asset": "^1.0.4",
     "utility-types": "^3.10.0",

package/web/PresentationControls.cjs.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("three"),r=require("react"),o=require("@react-three/fiber"),a=require("@react-spring/three"),n=require("@use-gesture/react");function s(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var i=s(e);exports.PresentationControls=function({snap:e,global:s,children:u,speed:c=1,rotation:l=[0,0,0],zoom:f=1,polar:m=[0,Math.PI/2],azimuth:d=[-1/0,1/0],config:g={mass:1,tension:170,friction:26}}){const{size:h,gl:p}=o.useThree(),b=r.useMemo((()=>[l[0]+m[0],l[0]+m[1]]),[l[0],m[0],m[1]]),M=r.useMemo((()=>[l[1]+d[0],l[1]+d[1]]),[l[1],d[0],d[1]]),y=r.useMemo((()=>[t.MathUtils.clamp(l[0],...b),t.MathUtils.clamp(l[1],...M),l[2]]),[l[0],l[1],l[2],b,M]),[q,v]=a.useSpring((()=>({scale:1,rotation:y,config:g})));r.useEffect((()=>{v.start({scale:1,rotation:y,config:g})}),[y]),r.useEffect((()=>{s&&(document.body.style.cursor="grab")}),[s]);const P=n.useGesture({onHover:({last:e})=>{s||(document.body.style.cursor=e?"auto":"grab")},onDrag:({down:r,delta:[o,a],memo:[n,s]=q.rotation.animation.to||y})=>{document.body.style.cursor=r?"grabbing":"grab",o=t.MathUtils.clamp(s+o/h.width*Math.PI*c,...M),a=t.MathUtils.clamp(n+a/h.height*Math.PI*c,...b);const i=e&&!r&&"boolean"!=typeof e?e:g;return v.start({scale:r&&a>b[1]/2?f:1,rotation:e&&!r?y:[a,o,0],config:e=>"scale"===e?{...i,friction:3*i.friction}:i}),[a,o]}},{target:s&&p.domElement});return React.createElement(a.a.group,i.default({},null==P?void 0:P(),q),u)};

package/web/PresentationControls.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+declare type Props = {
+    snap?: boolean;
+    global?: boolean;
+    speed?: number;
+    zoom?: number;
+    rotation?: [number, number, number];
+    polar?: [number, number];
+    azimuth?: [number, number];
+    config?: any;
+    children?: React.ReactNode;
+};
+export declare function PresentationControls({ snap, global, children, speed, rotation, zoom, polar, azimuth, config, }: Props): JSX.Element;
+export {};

package/web/PresentationControls.js

@@ -0,0 +1,73 @@
+import _extends from '@babel/runtime/helpers/esm/extends';
+import { MathUtils } from 'three';
+import { useMemo, useEffect } from 'react';
+import { useThree } from '@react-three/fiber';
+import { useSpring, a } from '@react-spring/three';
+import { useGesture } from '@use-gesture/react';
+
+function PresentationControls({
+  snap,
+  global,
+  children,
+  speed = 1,
+  rotation = [0, 0, 0],
+  zoom = 1,
+  polar = [0, Math.PI / 2],
+  azimuth = [-Infinity, Infinity],
+  config = {
+    mass: 1,
+    tension: 170,
+    friction: 26
+  }
+}) {
+  const {
+    size,
+    gl
+  } = useThree();
+  const rPolar = useMemo(() => [rotation[0] + polar[0], rotation[0] + polar[1]], [rotation[0], polar[0], polar[1]]);
+  const rAzimuth = useMemo(() => [rotation[1] + azimuth[0], rotation[1] + azimuth[1]], [rotation[1], azimuth[0], azimuth[1]]);
+  const rInitial = useMemo(() => [MathUtils.clamp(rotation[0], ...rPolar), MathUtils.clamp(rotation[1], ...rAzimuth), rotation[2]], [rotation[0], rotation[1], rotation[2], rPolar, rAzimuth]);
+  const [spring, api] = useSpring(() => ({
+    scale: 1,
+    rotation: rInitial,
+    config
+  }));
+  useEffect(() => void api.start({
+    scale: 1,
+    rotation: rInitial,
+    config
+  }), [rInitial]);
+  useEffect(() => {
+    if (global) document.body.style.cursor = 'grab';
+  }, [global]);
+  const bind = useGesture({
+    onHover: ({
+      last
+    }) => {
+      if (!global) document.body.style.cursor = last ? 'auto' : 'grab';
+    },
+    onDrag: ({
+      down,
+      delta: [x, y],
+      memo: [oldY, oldX] = spring.rotation.animation.to || rInitial
+    }) => {
+      document.body.style.cursor = down ? 'grabbing' : 'grab';
+      x = MathUtils.clamp(oldX + x / size.width * Math.PI * speed, ...rAzimuth);
+      y = MathUtils.clamp(oldY + y / size.height * Math.PI * speed, ...rPolar);
+      const sConfig = snap && !down && typeof snap !== 'boolean' ? snap : config;
+      api.start({
+        scale: down && y > rPolar[1] / 2 ? zoom : 1,
+        rotation: snap && !down ? rInitial : [y, x, 0],
+        config: n => n === 'scale' ? { ...sConfig,
+          friction: sConfig.friction * 3
+        } : sConfig
+      });
+      return [y, x];
+    }
+  }, {
+    target: global && gl.domElement
+  });
+  return /*#__PURE__*/React.createElement(a.group, _extends({}, bind == null ? void 0 : bind(), spring), children);
+}
+
+export { PresentationControls };