@react-three/drei 9.83.8 → 9.84.0

package/index.js

@@ -43,6 +43,7 @@ export { PointerLockControls } from './core/PointerLockControls.js';
 export { FirstPersonControls } from './core/FirstPersonControls.js';
 export { CameraControls } from './core/CameraControls.js';
 export { FaceControls, useFaceControls } from './core/FaceControls.js';
+export { MotionPathControls, useMotion } from './core/MotionPathControls.js';
 export { GizmoHelper, useGizmoContext } from './core/GizmoHelper.js';
 export { GizmoViewcube } from './core/GizmoViewcube.js';
 export { GizmoViewport } from './core/GizmoViewport.js';

package/materials/BlurPass.js

@@ -40,7 +40,6 @@ class BlurPass {
     this.screen.frustumCulled = false;
     this.scene.add(this.screen);
   }
-
   render(renderer, inputBuffer, outputBuffer) {
     const scene = this.scene;
     const camera = this.camera;
@@ -52,8 +51,8 @@ class BlurPass {
     const kernel = material.kernel;
     let lastRT = inputBuffer;
     let destRT;
-    let i, l; // Apply the multi-pass blur.
-
+    let i, l;
+    // Apply the multi-pass blur.
     for (i = 0, l = kernel.length - 1; i < l; ++i) {
       // Alternate between targets.
       destRT = (i & 1) === 0 ? renderTargetA : renderTargetB;
@@ -63,13 +62,11 @@ class BlurPass {
       renderer.render(scene, camera);
       lastRT = destRT;
     }
-
     uniforms.kernel.value = kernel[i];
     uniforms.inputBuffer.value = lastRT.texture;
     renderer.setRenderTarget(this.renderToScreen ? null : outputBuffer);
     renderer.render(scene, camera);
   }
-
 }
 
 export { BlurPass };

package/materials/ConvolutionMaterial.js

@@ -84,16 +84,13 @@ class ConvolutionMaterial extends THREE.ShaderMaterial {
     this.setTexelSize(texelSize.x, texelSize.y);
     this.kernel = new Float32Array([0.0, 1.0, 2.0, 2.0, 3.0]);
   }
-
   setTexelSize(x, y) {
     this.uniforms.texelSize.value.set(x, y);
     this.uniforms.halfTexelSize.value.set(x, y).multiplyScalar(0.5);
   }
-
   setResolution(resolution) {
     this.uniforms.resolution.value.copy(resolution);
   }
-
 }
 
 export { ConvolutionMaterial };

package/materials/MeshReflectorMaterial.d.ts

@@ -48,7 +48,7 @@ export declare class MeshReflectorMaterial extends MeshStandardMaterial {
     get mixContrast(): number;
     set mixContrast(v: number);
 }
-export declare type MeshReflectorMaterialProps = {
+export type MeshReflectorMaterialProps = {
     mixBlur: number;
     mixStrength: number;
     mirror: number;

package/materials/MeshReflectorMaterial.js

@@ -50,14 +50,11 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
     };
     this.setValues(parameters);
   }
-
   onBeforeCompile(shader) {
     var _shader$defines;
-
     if (!((_shader$defines = shader.defines) != null && _shader$defines.USE_UV)) {
       shader.defines.USE_UV = '';
     }
-
     shader.uniforms.hasBlur = this._hasBlur;
     shader.uniforms.tDiffuse = this._tDiffuse;
     shader.uniforms.tDepth = this._tDepth;
@@ -164,127 +161,96 @@ class MeshReflectorMaterial extends MeshStandardMaterial {
       diffuseColor.rgb = diffuseColor.rgb * ((1.0 - min(1.0, mirror)) + newMerge.rgb * mixStrength);
       `);
   }
-
   get tDiffuse() {
     return this._tDiffuse.value;
   }
-
   set tDiffuse(v) {
     this._tDiffuse.value = v;
   }
-
   get tDepth() {
     return this._tDepth.value;
   }
-
   set tDepth(v) {
     this._tDepth.value = v;
   }
-
   get distortionMap() {
     return this._distortionMap.value;
   }
-
   set distortionMap(v) {
     this._distortionMap.value = v;
   }
-
   get tDiffuseBlur() {
     return this._tDiffuseBlur.value;
   }
-
   set tDiffuseBlur(v) {
     this._tDiffuseBlur.value = v;
   }
-
   get textureMatrix() {
     return this._textureMatrix.value;
   }
-
   set textureMatrix(v) {
     this._textureMatrix.value = v;
   }
-
   get hasBlur() {
     return this._hasBlur.value;
   }
-
   set hasBlur(v) {
     this._hasBlur.value = v;
   }
-
   get mirror() {
     return this._mirror.value;
   }
-
   set mirror(v) {
     this._mirror.value = v;
   }
-
   get mixBlur() {
     return this._mixBlur.value;
   }
-
   set mixBlur(v) {
     this._mixBlur.value = v;
   }
-
   get mixStrength() {
     return this._blurStrength.value;
   }
-
   set mixStrength(v) {
     this._blurStrength.value = v;
   }
-
   get minDepthThreshold() {
     return this._minDepthThreshold.value;
   }
-
   set minDepthThreshold(v) {
     this._minDepthThreshold.value = v;
   }
-
   get maxDepthThreshold() {
     return this._maxDepthThreshold.value;
   }
-
   set maxDepthThreshold(v) {
     this._maxDepthThreshold.value = v;
   }
-
   get depthScale() {
     return this._depthScale.value;
   }
-
   set depthScale(v) {
     this._depthScale.value = v;
   }
-
   get depthToBlurRatioBias() {
     return this._depthToBlurRatioBias.value;
   }
-
   set depthToBlurRatioBias(v) {
     this._depthToBlurRatioBias.value = v;
   }
-
   get distortion() {
     return this._distortion.value;
   }
-
   set distortion(v) {
     this._distortion.value = v;
   }
-
   get mixContrast() {
     return this._mixContrast.value;
   }
-
   set mixContrast(v) {
     this._mixContrast.value = v;
   }
-
 }
 
 export { MeshReflectorMaterial };

package/materials/MeshRefractionMaterial.js

@@ -15,9 +15,7 @@ const MeshRefractionMaterial = shaderMaterial({
   resolution: new THREE.Vector2(),
   viewMatrixInverse: new THREE.Matrix4(),
   projectionMatrixInverse: new THREE.Matrix4()
-},
-/*glsl*/
-`
+}, /*glsl*/`
   uniform mat4 viewMatrixInverse;
 
   varying vec3 vWorldPosition;  
@@ -49,9 +47,7 @@ const MeshRefractionMaterial = shaderMaterial({
     vWorldPosition = (modelMatrix * transformedPosition).xyz;
     vNormal = normalize((viewMatrixInverse * vec4(normalMatrix * transformedNormal.xyz, 0.0)).xyz);
     gl_Position = projectionMatrix * viewMatrix * modelMatrix * transformedPosition;
-  }`,
-/*glsl*/
-`
+  }`, /*glsl*/`
   #define ENVMAP_TYPE_CUBE_UV
   precision highp isampler2D;
   precision highp usampler2D;

package/materials/SpotLightMaterial.js

@@ -34,9 +34,7 @@ class SpotLightMaterial extends THREE.ShaderMaterial {
       },
       transparent: true,
       depthWrite: false,
-      vertexShader:
-      /* glsl */
-      `
+      vertexShader: /* glsl */`
       varying vec3 vNormal;
       varying vec3 vWorldPosition;
       varying float vViewZ;
@@ -58,9 +56,7 @@ class SpotLightMaterial extends THREE.ShaderMaterial {
         gl_Position	= projectionMatrix * viewPosition;
 
       }`,
-      fragmentShader:
-      /* glsl */
-      `
+      fragmentShader: /* glsl */`
       #include <packing>
 
       varying vec3 vNormal;
@@ -105,7 +101,6 @@ class SpotLightMaterial extends THREE.ShaderMaterial {
       }`
     });
   }
-
 }
 
 export { SpotLightMaterial };

package/materials/WireframeMaterial.js

@@ -20,9 +20,7 @@ const WireframeMaterialShaders = {
     backfaceStroke: new THREE.Color('#0000ff'),
     fill: new THREE.Color('#00ff00')
   },
-  vertex:
-  /* glsl */
-  `
+  vertex: /* glsl */`
 	  attribute vec3 barycentric;
 	
 		varying vec3 v_edges_Barycentric;
@@ -33,9 +31,7 @@ const WireframeMaterialShaders = {
 			v_edges_Position = position.xyz;
 		}
 	  `,
-  fragment:
-  /* glsl */
-  `
+  fragment: /* glsl */`
 		#ifndef PI
 	  	#define PI 3.1415926535897932384626433832795
 		#endif
@@ -122,16 +118,12 @@ const WireframeMaterialShaders = {
 	  }
 	  `
 };
-const WireframeMaterial = shaderMaterial(WireframeMaterialShaders.uniforms, WireframeMaterialShaders.vertex +
-/* glsl */
-`
+const WireframeMaterial = shaderMaterial(WireframeMaterialShaders.uniforms, WireframeMaterialShaders.vertex + /* glsl */`
   	void main() {
 		initWireframe();
 		gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
 	}
-  `, WireframeMaterialShaders.fragment +
-/* glsl */
-`
+  `, WireframeMaterialShaders.fragment + /* glsl */`
   void main () {
 		// Compute color
 
@@ -150,7 +142,8 @@ const WireframeMaterial = shaderMaterial(WireframeMaterialShaders.uniforms, Wire
   `);
 function setWireframeOverride(material, uniforms) {
   material.onBeforeCompile = shader => {
-    shader.uniforms = { ...shader.uniforms,
+    shader.uniforms = {
+      ...shader.uniforms,
       ...uniforms
     };
     shader.vertexShader = shader.vertexShader.replace('void main() {', `
@@ -162,9 +155,7 @@ function setWireframeOverride(material, uniforms) {
 		  ${WireframeMaterialShaders.fragment}
 		  void main() {
 		`);
-    shader.fragmentShader = shader.fragmentShader.replace('#include <color_fragment>',
-    /* glsl */
-    `
+    shader.fragmentShader = shader.fragmentShader.replace('#include <color_fragment>', /* glsl */`
 		  #include <color_fragment>
 			  float edge = getWireframe();
 		  vec4 colorStroke = vec4(stroke, edge);
@@ -178,29 +169,24 @@ function setWireframeOverride(material, uniforms) {
 		  diffuseColor.a *= outColor.a;
 		`);
   };
-
   material.side = THREE.DoubleSide;
   material.transparent = true;
 }
 function useWireframeUniforms(uniforms, props) {
   React.useEffect(() => {
     var _props$fillOpacity;
-
     return void (uniforms.fillOpacity.value = (_props$fillOpacity = props.fillOpacity) !== null && _props$fillOpacity !== void 0 ? _props$fillOpacity : uniforms.fillOpacity.value);
   }, [props.fillOpacity]);
   React.useEffect(() => {
     var _props$fillMix;
-
     return void (uniforms.fillMix.value = (_props$fillMix = props.fillMix) !== null && _props$fillMix !== void 0 ? _props$fillMix : uniforms.fillMix.value);
   }, [props.fillMix]);
   React.useEffect(() => {
     var _props$strokeOpacity;
-
     return void (uniforms.strokeOpacity.value = (_props$strokeOpacity = props.strokeOpacity) !== null && _props$strokeOpacity !== void 0 ? _props$strokeOpacity : uniforms.strokeOpacity.value);
   }, [props.strokeOpacity]);
   React.useEffect(() => {
     var _props$thickness;
-
     return void (uniforms.thickness.value = (_props$thickness = props.thickness) !== null && _props$thickness !== void 0 ? _props$thickness : uniforms.thickness.value);
   }, [props.thickness]);
   React.useEffect(() => void (uniforms.colorBackfaces.value = !!props.colorBackfaces), [props.colorBackfaces]);
@@ -208,23 +194,19 @@ function useWireframeUniforms(uniforms, props) {
   React.useEffect(() => void (uniforms.dashInvert.value = !!props.dashInvert), [props.dashInvert]);
   React.useEffect(() => {
     var _props$dashRepeats;
-
     return void (uniforms.dashRepeats.value = (_props$dashRepeats = props.dashRepeats) !== null && _props$dashRepeats !== void 0 ? _props$dashRepeats : uniforms.dashRepeats.value);
   }, [props.dashRepeats]);
   React.useEffect(() => {
     var _props$dashLength;
-
     return void (uniforms.dashLength.value = (_props$dashLength = props.dashLength) !== null && _props$dashLength !== void 0 ? _props$dashLength : uniforms.dashLength.value);
   }, [props.dashLength]);
   React.useEffect(() => void (uniforms.squeeze.value = !!props.squeeze), [props.squeeze]);
   React.useEffect(() => {
     var _props$squeezeMin;
-
     return void (uniforms.squeezeMin.value = (_props$squeezeMin = props.squeezeMin) !== null && _props$squeezeMin !== void 0 ? _props$squeezeMin : uniforms.squeezeMin.value);
   }, [props.squeezeMin]);
   React.useEffect(() => {
     var _props$squeezeMax;
-
     return void (uniforms.squeezeMax.value = (_props$squeezeMax = props.squeezeMax) !== null && _props$squeezeMax !== void 0 ? _props$squeezeMax : uniforms.squeezeMax.value);
   }, [props.squeezeMax]);
   React.useEffect(() => void (uniforms.stroke.value = props.stroke ? new THREE.Color(props.stroke) : uniforms.stroke.value), [props.stroke]);

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/ScreenSpace.cjs.js"),s=require("../core/QuadraticBezierLine.cjs.js"),o=require("../core/CubicBezierLine.cjs.js"),t=require("../core/CatmullRomLine.cjs.js"),i=require("../core/Line.cjs.js"),a=require("../core/PositionalAudio.cjs.js"),c=require("../core/Text.cjs.js"),u=require("../core/Text3D.cjs.js"),n=require("../core/Effects.cjs.js"),j=require("../core/GradientTexture.cjs.js"),p=require("../core/Image.cjs.js"),l=require("../core/Edges.cjs.js"),x=require("../core/Outlines.cjs.js"),q=require("../core/Trail.cjs.js"),m=require("../core/Sampler.cjs.js"),d=require("../core/ComputedAttribute.cjs.js"),h=require("../core/Clone.cjs.js"),C=require("../core/MarchingCubes.cjs.js"),M=require("../core/Decal.cjs.js"),S=require("../core/Svg.cjs.js"),f=require("../core/Gltf.cjs.js"),T=require("../core/AsciiRenderer.cjs.js"),P=require("../core/OrthographicCamera.cjs.js"),b=require("../core/PerspectiveCamera.cjs.js"),B=require("../core/CubeCamera.cjs.js"),g=require("../core/DeviceOrientationControls.cjs.js"),v=require("../core/FlyControls.cjs.js"),F=require("../core/MapControls.cjs.js"),L=require("../core/OrbitControls.cjs.js"),A=require("../core/TrackballControls.cjs.js"),k=require("../core/ArcballControls.cjs.js"),D=require("../core/TransformControls.cjs.js"),E=require("../core/PointerLockControls.cjs.js"),G=require("../core/FirstPersonControls.cjs.js"),R=require("../core/CameraControls.cjs.js"),w=require("../core/FaceControls.cjs.js"),z=require("../core/GizmoHelper.cjs.js"),O=require("../core/GizmoViewcube.cjs.js"),y=require("../core/GizmoViewport.cjs.js"),I=require("../core/Grid.cjs.js"),H=require("../core/useCubeTexture.cjs.js"),V=require("../core/useFBX.cjs.js"),W=require("../core/useGLTF.cjs.js"),Q=require("../core/useKTX2.cjs.js"),X=require("../core/useProgress.cjs.js"),K=require("../core/useTexture.cjs.js"),N=require("../core/useVideoTexture.cjs.js"),U=require("../core/useFont.cjs.js"),_=require("../core/Stats.cjs.js"),J=require("../core/StatsGl.cjs.js"),Y=require("../core/useDepthBuffer.cjs.js"),Z=require("../core/useAspect.cjs.js"),$=require("../core/useCamera.cjs.js"),ee=require("../core/useDetectGPU.cjs.js"),re=require("../core/useHelper.cjs.js"),se=require("../core/useBVH.cjs.js"),oe=require("../core/useContextBridge.cjs.js"),te=require("../core/useAnimations.cjs.js"),ie=require("../core/useFBO.cjs.js"),ae=require("../core/useIntersect.cjs.js"),ce=require("../core/useBoxProjectedEnv.cjs.js"),ue=require("../core/BBAnchor.cjs.js"),ne=require("../core/useTrailTexture.cjs.js"),je=require("../core/useCubeCamera.cjs.js"),pe=require("../core/Example.cjs.js"),le=require("../core/SpriteAnimator.cjs.js"),xe=require("../core/FaceLandmarker.cjs.js"),qe=require("../core/CurveModifier.cjs.js"),me=require("../core/MeshDistortMaterial.cjs.js"),de=require("../core/MeshWobbleMaterial.cjs.js"),he=require("../core/MeshReflectorMaterial.cjs.js"),Ce=require("../core/MeshRefractionMaterial.cjs.js"),Me=require("../core/MeshTransmissionMaterial.cjs.js"),Se=require("../core/MeshDiscardMaterial.cjs.js"),fe=require("../core/PointMaterial.cjs.js"),Te=require("../core/shaderMaterial.cjs.js"),Pe=require("../core/softShadows.cjs.js"),be=require("../core/shapes.cjs.js"),Be=require("../core/Facemesh.cjs.js"),ge=require("../core/RoundedBox.cjs.js"),ve=require("../core/ScreenQuad.cjs.js"),Fe=require("../core/Center.cjs.js"),Le=require("../core/Resize.cjs.js"),Ae=require("../core/Bounds.cjs.js"),ke=require("../core/CameraShake.cjs.js"),De=require("../core/Float.cjs.js"),Ee=require("../core/Stage.cjs.js"),Ge=require("../core/Backdrop.cjs.js"),Re=require("../core/Shadow.cjs.js"),we=require("../core/Caustics.cjs.js"),ze=require("../core/ContactShadows.cjs.js"),Oe=require("../core/AccumulativeShadows.cjs.js"),ye=require("../core/Reflector.cjs.js"),Ie=require("../core/SpotLight.cjs.js"),He=require("../core/Environment.cjs.js"),Ve=require("../core/Lightformer.cjs.js"),We=require("../core/Sky.cjs.js"),Qe=require("../core/Stars.cjs.js"),Xe=require("../core/Cloud.cjs.js"),Ke=require("../core/Sparkles.cjs.js"),Ne=require("../core/useEnvironment.cjs.js"),Ue=require("../core/useMatcapTexture.cjs.js"),_e=require("../core/useNormalTexture.cjs.js"),Je=require("../core/Wireframe.cjs.js"),Ye=require("../core/Points.cjs.js"),Ze=require("../core/Instances.cjs.js"),$e=require("../core/Segments.cjs.js"),er=require("../core/Detailed.cjs.js"),rr=require("../core/Preload.cjs.js"),sr=require("../core/BakeShadows.cjs.js"),or=require("../core/meshBounds.cjs.js"),tr=require("../core/AdaptiveDpr.cjs.js"),ir=require("../core/AdaptiveEvents.cjs.js"),ar=require("../core/PerformanceMonitor.cjs.js"),cr=require("../core/RenderTexture.cjs.js"),ur=require("../core/Mask.cjs.js"),nr=require("../core/Hud.cjs.js"),jr=require("../core/MeshPortalMaterial.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("suspend-react"),require("meshline"),require("lodash.pick"),require("lodash.omit"),require("camera-controls"),require("maath"),require("@mediapipe/tasks-vision"),require("zustand"),require("stats.js"),require("../helpers/useEffectfulState.cjs.js"),require("stats-gl"),require("detect-gpu"),require("three-mesh-bvh"),require("../materials/BlurPass.cjs.js"),require("../materials/ConvolutionMaterial.cjs.js"),require("../materials/MeshReflectorMaterial.cjs.js"),require("../materials/MeshRefractionMaterial.cjs.js"),require("../materials/DiscardMaterial.cjs.js"),require("../helpers/environment-assets.cjs.js"),require("../materials/SpotLightMaterial.cjs.js"),require("../materials/WireframeMaterial.cjs.js"),require("react-composer"),exports.Billboard=e.Billboard,exports.ScreenSpace=r.ScreenSpace,exports.QuadraticBezierLine=s.QuadraticBezierLine,exports.CubicBezierLine=o.CubicBezierLine,exports.CatmullRomLine=t.CatmullRomLine,exports.Line=i.Line,exports.PositionalAudio=a.PositionalAudio,exports.Text=c.Text,exports.Text3D=u.Text3D,exports.Effects=n.Effects,exports.isWebGL2Available=n.isWebGL2Available,exports.GradientTexture=j.GradientTexture,exports.GradientType=j.GradientType,exports.Image=p.Image,exports.Edges=l.Edges,exports.Outlines=x.Outlines,exports.Trail=q.Trail,exports.useTrail=q.useTrail,exports.Sampler=m.Sampler,exports.useSurfaceSampler=m.useSurfaceSampler,exports.ComputedAttribute=d.ComputedAttribute,exports.Clone=h.Clone,exports.MarchingCube=C.MarchingCube,exports.MarchingCubes=C.MarchingCubes,exports.MarchingPlane=C.MarchingPlane,exports.Decal=M.Decal,exports.Svg=S.Svg,exports.Gltf=f.Gltf,exports.AsciiRenderer=T.AsciiRenderer,exports.OrthographicCamera=P.OrthographicCamera,exports.PerspectiveCamera=b.PerspectiveCamera,exports.CubeCamera=B.CubeCamera,exports.DeviceOrientationControls=g.DeviceOrientationControls,exports.FlyControls=v.FlyControls,exports.MapControls=F.MapControls,exports.OrbitControls=L.OrbitControls,exports.TrackballControls=A.TrackballControls,exports.ArcballControls=k.ArcballControls,exports.TransformControls=D.TransformControls,exports.PointerLockControls=E.PointerLockControls,exports.FirstPersonControls=G.FirstPersonControls,exports.CameraControls=R.CameraControls,exports.FaceControls=w.FaceControls,exports.useFaceControls=w.useFaceControls,exports.GizmoHelper=z.GizmoHelper,exports.useGizmoContext=z.useGizmoContext,exports.GizmoViewcube=O.GizmoViewcube,exports.GizmoViewport=y.GizmoViewport,exports.Grid=I.Grid,exports.useCubeTexture=H.useCubeTexture,exports.useFBX=V.useFBX,exports.useGLTF=W.useGLTF,exports.useKTX2=Q.useKTX2,exports.useProgress=X.useProgress,exports.IsObject=K.IsObject,exports.useTexture=K.useTexture,exports.useVideoTexture=N.useVideoTexture,exports.useFont=U.useFont,exports.Stats=_.Stats,exports.StatsGl=J.StatsGl,exports.useDepthBuffer=Y.useDepthBuffer,exports.useAspect=Z.useAspect,exports.useCamera=$.useCamera,exports.useDetectGPU=ee.useDetectGPU,exports.useHelper=re.useHelper,exports.Bvh=se.Bvh,exports.useBVH=se.useBVH,exports.useContextBridge=oe.useContextBridge,exports.useAnimations=te.useAnimations,exports.useFBO=ie.useFBO,exports.useIntersect=ae.useIntersect,exports.useBoxProjectedEnv=ce.useBoxProjectedEnv,exports.BBAnchor=ue.BBAnchor,exports.useTrailTexture=ne.useTrailTexture,exports.useCubeCamera=je.useCubeCamera,exports.Example=pe.Example,exports.SpriteAnimator=le.SpriteAnimator,exports.FaceLandmarker=xe.FaceLandmarker,exports.FaceLandmarkerDefaults=xe.FaceLandmarkerDefaults,exports.useFaceLandmarker=xe.useFaceLandmarker,exports.CurveModifier=qe.CurveModifier,exports.MeshDistortMaterial=me.MeshDistortMaterial,exports.MeshWobbleMaterial=de.MeshWobbleMaterial,exports.MeshReflectorMaterial=he.MeshReflectorMaterial,exports.MeshRefractionMaterial=Ce.MeshRefractionMaterial,exports.MeshTransmissionMaterial=Me.MeshTransmissionMaterial,exports.MeshDiscardMaterial=Se.MeshDiscardMaterial,exports.PointMaterial=fe.PointMaterial,exports.PointMaterialImpl=fe.PointMaterialImpl,exports.shaderMaterial=Te.shaderMaterial,exports.SoftShadows=Pe.SoftShadows,exports.Box=be.Box,exports.Capsule=be.Capsule,exports.Circle=be.Circle,exports.Cone=be.Cone,exports.Cylinder=be.Cylinder,exports.Dodecahedron=be.Dodecahedron,exports.Extrude=be.Extrude,exports.Icosahedron=be.Icosahedron,exports.Lathe=be.Lathe,exports.Octahedron=be.Octahedron,exports.Plane=be.Plane,exports.Polyhedron=be.Polyhedron,exports.Ring=be.Ring,exports.Shape=be.Shape,exports.Sphere=be.Sphere,exports.Tetrahedron=be.Tetrahedron,exports.Torus=be.Torus,exports.TorusKnot=be.TorusKnot,exports.Tube=be.Tube,exports.Facemesh=Be.Facemesh,exports.FacemeshDatas=Be.FacemeshDatas,exports.FacemeshEye=Be.FacemeshEye,exports.FacemeshEyeDefaults=Be.FacemeshEyeDefaults,exports.RoundedBox=ge.RoundedBox,exports.ScreenQuad=ve.ScreenQuad,exports.Center=Fe.Center,exports.Resize=Le.Resize,exports.Bounds=Ae.Bounds,exports.useBounds=Ae.useBounds,exports.CameraShake=ke.CameraShake,exports.Float=De.Float,exports.Stage=Ee.Stage,exports.Backdrop=Ge.Backdrop,exports.Shadow=Re.Shadow,exports.Caustics=we.Caustics,exports.ContactShadows=ze.ContactShadows,exports.AccumulativeShadows=Oe.AccumulativeShadows,exports.RandomizedLight=Oe.RandomizedLight,exports.accumulativeContext=Oe.accumulativeContext,exports.Reflector=ye.Reflector,exports.SpotLight=Ie.SpotLight,exports.SpotLightShadow=Ie.SpotLightShadow,exports.Environment=He.Environment,exports.EnvironmentCube=He.EnvironmentCube,exports.EnvironmentMap=He.EnvironmentMap,exports.EnvironmentPortal=He.EnvironmentPortal,exports.Lightformer=Ve.Lightformer,exports.Sky=We.Sky,exports.calcPosFromAngles=We.calcPosFromAngles,exports.Stars=Qe.Stars,exports.Cloud=Xe.Cloud,exports.Sparkles=Ke.Sparkles,exports.useEnvironment=Ne.useEnvironment,exports.useMatcapTexture=Ue.useMatcapTexture,exports.useNormalTexture=_e.useNormalTexture,exports.Wireframe=Je.Wireframe,exports.Point=Ye.Point,exports.Points=Ye.Points,exports.PointsBuffer=Ye.PointsBuffer,exports.PositionPoint=Ye.PositionPoint,exports.Instance=Ze.Instance,exports.Instances=Ze.Instances,exports.Merged=Ze.Merged,exports.Segment=$e.Segment,exports.SegmentObject=$e.SegmentObject,exports.Segments=$e.Segments,exports.Detailed=er.Detailed,exports.Preload=rr.Preload,exports.BakeShadows=sr.BakeShadows,exports.meshBounds=or.meshBounds,exports.AdaptiveDpr=tr.AdaptiveDpr,exports.AdaptiveEvents=ir.AdaptiveEvents,exports.PerformanceMonitor=ar.PerformanceMonitor,exports.usePerformanceMonitor=ar.usePerformanceMonitor,exports.RenderTexture=cr.RenderTexture,exports.Mask=ur.Mask,exports.useMask=ur.useMask,exports.Hud=nr.Hud,exports.MeshPortalMaterial=jr.MeshPortalMaterial;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../core/Billboard.cjs.js"),r=require("../core/ScreenSpace.cjs.js"),s=require("../core/QuadraticBezierLine.cjs.js"),o=require("../core/CubicBezierLine.cjs.js"),t=require("../core/CatmullRomLine.cjs.js"),i=require("../core/Line.cjs.js"),a=require("../core/PositionalAudio.cjs.js"),c=require("../core/Text.cjs.js"),u=require("../core/Text3D.cjs.js"),n=require("../core/Effects.cjs.js"),j=require("../core/GradientTexture.cjs.js"),p=require("../core/Image.cjs.js"),l=require("../core/Edges.cjs.js"),x=require("../core/Outlines.cjs.js"),q=require("../core/Trail.cjs.js"),m=require("../core/Sampler.cjs.js"),d=require("../core/ComputedAttribute.cjs.js"),h=require("../core/Clone.cjs.js"),C=require("../core/MarchingCubes.cjs.js"),M=require("../core/Decal.cjs.js"),S=require("../core/Svg.cjs.js"),f=require("../core/Gltf.cjs.js"),P=require("../core/AsciiRenderer.cjs.js"),T=require("../core/OrthographicCamera.cjs.js"),b=require("../core/PerspectiveCamera.cjs.js"),B=require("../core/CubeCamera.cjs.js"),g=require("../core/DeviceOrientationControls.cjs.js"),v=require("../core/FlyControls.cjs.js"),F=require("../core/MapControls.cjs.js"),L=require("../core/OrbitControls.cjs.js"),A=require("../core/TrackballControls.cjs.js"),k=require("../core/ArcballControls.cjs.js"),D=require("../core/TransformControls.cjs.js"),E=require("../core/PointerLockControls.cjs.js"),G=require("../core/FirstPersonControls.cjs.js"),R=require("../core/CameraControls.cjs.js"),w=require("../core/FaceControls.cjs.js"),z=require("../core/MotionPathControls.cjs.js"),O=require("../core/GizmoHelper.cjs.js"),y=require("../core/GizmoViewcube.cjs.js"),I=require("../core/GizmoViewport.cjs.js"),H=require("../core/Grid.cjs.js"),V=require("../core/useCubeTexture.cjs.js"),W=require("../core/useFBX.cjs.js"),Q=require("../core/useGLTF.cjs.js"),X=require("../core/useKTX2.cjs.js"),K=require("../core/useProgress.cjs.js"),N=require("../core/useTexture.cjs.js"),U=require("../core/useVideoTexture.cjs.js"),_=require("../core/useFont.cjs.js"),J=require("../core/Stats.cjs.js"),Y=require("../core/StatsGl.cjs.js"),Z=require("../core/useDepthBuffer.cjs.js"),$=require("../core/useAspect.cjs.js"),ee=require("../core/useCamera.cjs.js"),re=require("../core/useDetectGPU.cjs.js"),se=require("../core/useHelper.cjs.js"),oe=require("../core/useBVH.cjs.js"),te=require("../core/useContextBridge.cjs.js"),ie=require("../core/useAnimations.cjs.js"),ae=require("../core/useFBO.cjs.js"),ce=require("../core/useIntersect.cjs.js"),ue=require("../core/useBoxProjectedEnv.cjs.js"),ne=require("../core/BBAnchor.cjs.js"),je=require("../core/useTrailTexture.cjs.js"),pe=require("../core/useCubeCamera.cjs.js"),le=require("../core/Example.cjs.js"),xe=require("../core/SpriteAnimator.cjs.js"),qe=require("../core/FaceLandmarker.cjs.js"),me=require("../core/CurveModifier.cjs.js"),de=require("../core/MeshDistortMaterial.cjs.js"),he=require("../core/MeshWobbleMaterial.cjs.js"),Ce=require("../core/MeshReflectorMaterial.cjs.js"),Me=require("../core/MeshRefractionMaterial.cjs.js"),Se=require("../core/MeshTransmissionMaterial.cjs.js"),fe=require("../core/MeshDiscardMaterial.cjs.js"),Pe=require("../core/PointMaterial.cjs.js"),Te=require("../core/shaderMaterial.cjs.js"),be=require("../core/softShadows.cjs.js"),Be=require("../core/shapes.cjs.js"),ge=require("../core/Facemesh.cjs.js"),ve=require("../core/RoundedBox.cjs.js"),Fe=require("../core/ScreenQuad.cjs.js"),Le=require("../core/Center.cjs.js"),Ae=require("../core/Resize.cjs.js"),ke=require("../core/Bounds.cjs.js"),De=require("../core/CameraShake.cjs.js"),Ee=require("../core/Float.cjs.js"),Ge=require("../core/Stage.cjs.js"),Re=require("../core/Backdrop.cjs.js"),we=require("../core/Shadow.cjs.js"),ze=require("../core/Caustics.cjs.js"),Oe=require("../core/ContactShadows.cjs.js"),ye=require("../core/AccumulativeShadows.cjs.js"),Ie=require("../core/Reflector.cjs.js"),He=require("../core/SpotLight.cjs.js"),Ve=require("../core/Environment.cjs.js"),We=require("../core/Lightformer.cjs.js"),Qe=require("../core/Sky.cjs.js"),Xe=require("../core/Stars.cjs.js"),Ke=require("../core/Cloud.cjs.js"),Ne=require("../core/Sparkles.cjs.js"),Ue=require("../core/useEnvironment.cjs.js"),_e=require("../core/useMatcapTexture.cjs.js"),Je=require("../core/useNormalTexture.cjs.js"),Ye=require("../core/Wireframe.cjs.js"),Ze=require("../core/Points.cjs.js"),$e=require("../core/Instances.cjs.js"),er=require("../core/Segments.cjs.js"),rr=require("../core/Detailed.cjs.js"),sr=require("../core/Preload.cjs.js"),or=require("../core/BakeShadows.cjs.js"),tr=require("../core/meshBounds.cjs.js"),ir=require("../core/AdaptiveDpr.cjs.js"),ar=require("../core/AdaptiveEvents.cjs.js"),cr=require("../core/PerformanceMonitor.cjs.js"),ur=require("../core/RenderTexture.cjs.js"),nr=require("../core/Mask.cjs.js"),jr=require("../core/Hud.cjs.js"),pr=require("../core/MeshPortalMaterial.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("suspend-react"),require("meshline"),require("lodash.pick"),require("lodash.omit"),require("camera-controls"),require("maath"),require("@mediapipe/tasks-vision"),require("zustand"),require("stats.js"),require("../helpers/useEffectfulState.cjs.js"),require("stats-gl"),require("detect-gpu"),require("three-mesh-bvh"),require("../materials/BlurPass.cjs.js"),require("../materials/ConvolutionMaterial.cjs.js"),require("../materials/MeshReflectorMaterial.cjs.js"),require("../materials/MeshRefractionMaterial.cjs.js"),require("../materials/DiscardMaterial.cjs.js"),require("../helpers/environment-assets.cjs.js"),require("../materials/SpotLightMaterial.cjs.js"),require("../materials/WireframeMaterial.cjs.js"),require("react-composer"),exports.Billboard=e.Billboard,exports.ScreenSpace=r.ScreenSpace,exports.QuadraticBezierLine=s.QuadraticBezierLine,exports.CubicBezierLine=o.CubicBezierLine,exports.CatmullRomLine=t.CatmullRomLine,exports.Line=i.Line,exports.PositionalAudio=a.PositionalAudio,exports.Text=c.Text,exports.Text3D=u.Text3D,exports.Effects=n.Effects,exports.isWebGL2Available=n.isWebGL2Available,exports.GradientTexture=j.GradientTexture,exports.GradientType=j.GradientType,exports.Image=p.Image,exports.Edges=l.Edges,exports.Outlines=x.Outlines,exports.Trail=q.Trail,exports.useTrail=q.useTrail,exports.Sampler=m.Sampler,exports.useSurfaceSampler=m.useSurfaceSampler,exports.ComputedAttribute=d.ComputedAttribute,exports.Clone=h.Clone,exports.MarchingCube=C.MarchingCube,exports.MarchingCubes=C.MarchingCubes,exports.MarchingPlane=C.MarchingPlane,exports.Decal=M.Decal,exports.Svg=S.Svg,exports.Gltf=f.Gltf,exports.AsciiRenderer=P.AsciiRenderer,exports.OrthographicCamera=T.OrthographicCamera,exports.PerspectiveCamera=b.PerspectiveCamera,exports.CubeCamera=B.CubeCamera,exports.DeviceOrientationControls=g.DeviceOrientationControls,exports.FlyControls=v.FlyControls,exports.MapControls=F.MapControls,exports.OrbitControls=L.OrbitControls,exports.TrackballControls=A.TrackballControls,exports.ArcballControls=k.ArcballControls,exports.TransformControls=D.TransformControls,exports.PointerLockControls=E.PointerLockControls,exports.FirstPersonControls=G.FirstPersonControls,exports.CameraControls=R.CameraControls,exports.FaceControls=w.FaceControls,exports.useFaceControls=w.useFaceControls,exports.MotionPathControls=z.MotionPathControls,exports.useMotion=z.useMotion,exports.GizmoHelper=O.GizmoHelper,exports.useGizmoContext=O.useGizmoContext,exports.GizmoViewcube=y.GizmoViewcube,exports.GizmoViewport=I.GizmoViewport,exports.Grid=H.Grid,exports.useCubeTexture=V.useCubeTexture,exports.useFBX=W.useFBX,exports.useGLTF=Q.useGLTF,exports.useKTX2=X.useKTX2,exports.useProgress=K.useProgress,exports.IsObject=N.IsObject,exports.useTexture=N.useTexture,exports.useVideoTexture=U.useVideoTexture,exports.useFont=_.useFont,exports.Stats=J.Stats,exports.StatsGl=Y.StatsGl,exports.useDepthBuffer=Z.useDepthBuffer,exports.useAspect=$.useAspect,exports.useCamera=ee.useCamera,exports.useDetectGPU=re.useDetectGPU,exports.useHelper=se.useHelper,exports.Bvh=oe.Bvh,exports.useBVH=oe.useBVH,exports.useContextBridge=te.useContextBridge,exports.useAnimations=ie.useAnimations,exports.useFBO=ae.useFBO,exports.useIntersect=ce.useIntersect,exports.useBoxProjectedEnv=ue.useBoxProjectedEnv,exports.BBAnchor=ne.BBAnchor,exports.useTrailTexture=je.useTrailTexture,exports.useCubeCamera=pe.useCubeCamera,exports.Example=le.Example,exports.SpriteAnimator=xe.SpriteAnimator,exports.FaceLandmarker=qe.FaceLandmarker,exports.FaceLandmarkerDefaults=qe.FaceLandmarkerDefaults,exports.useFaceLandmarker=qe.useFaceLandmarker,exports.CurveModifier=me.CurveModifier,exports.MeshDistortMaterial=de.MeshDistortMaterial,exports.MeshWobbleMaterial=he.MeshWobbleMaterial,exports.MeshReflectorMaterial=Ce.MeshReflectorMaterial,exports.MeshRefractionMaterial=Me.MeshRefractionMaterial,exports.MeshTransmissionMaterial=Se.MeshTransmissionMaterial,exports.MeshDiscardMaterial=fe.MeshDiscardMaterial,exports.PointMaterial=Pe.PointMaterial,exports.PointMaterialImpl=Pe.PointMaterialImpl,exports.shaderMaterial=Te.shaderMaterial,exports.SoftShadows=be.SoftShadows,exports.Box=Be.Box,exports.Capsule=Be.Capsule,exports.Circle=Be.Circle,exports.Cone=Be.Cone,exports.Cylinder=Be.Cylinder,exports.Dodecahedron=Be.Dodecahedron,exports.Extrude=Be.Extrude,exports.Icosahedron=Be.Icosahedron,exports.Lathe=Be.Lathe,exports.Octahedron=Be.Octahedron,exports.Plane=Be.Plane,exports.Polyhedron=Be.Polyhedron,exports.Ring=Be.Ring,exports.Shape=Be.Shape,exports.Sphere=Be.Sphere,exports.Tetrahedron=Be.Tetrahedron,exports.Torus=Be.Torus,exports.TorusKnot=Be.TorusKnot,exports.Tube=Be.Tube,exports.Facemesh=ge.Facemesh,exports.FacemeshDatas=ge.FacemeshDatas,exports.FacemeshEye=ge.FacemeshEye,exports.FacemeshEyeDefaults=ge.FacemeshEyeDefaults,exports.RoundedBox=ve.RoundedBox,exports.ScreenQuad=Fe.ScreenQuad,exports.Center=Le.Center,exports.Resize=Ae.Resize,exports.Bounds=ke.Bounds,exports.useBounds=ke.useBounds,exports.CameraShake=De.CameraShake,exports.Float=Ee.Float,exports.Stage=Ge.Stage,exports.Backdrop=Re.Backdrop,exports.Shadow=we.Shadow,exports.Caustics=ze.Caustics,exports.ContactShadows=Oe.ContactShadows,exports.AccumulativeShadows=ye.AccumulativeShadows,exports.RandomizedLight=ye.RandomizedLight,exports.accumulativeContext=ye.accumulativeContext,exports.Reflector=Ie.Reflector,exports.SpotLight=He.SpotLight,exports.SpotLightShadow=He.SpotLightShadow,exports.Environment=Ve.Environment,exports.EnvironmentCube=Ve.EnvironmentCube,exports.EnvironmentMap=Ve.EnvironmentMap,exports.EnvironmentPortal=Ve.EnvironmentPortal,exports.Lightformer=We.Lightformer,exports.Sky=Qe.Sky,exports.calcPosFromAngles=Qe.calcPosFromAngles,exports.Stars=Xe.Stars,exports.Cloud=Ke.Cloud,exports.Sparkles=Ne.Sparkles,exports.useEnvironment=Ue.useEnvironment,exports.useMatcapTexture=_e.useMatcapTexture,exports.useNormalTexture=Je.useNormalTexture,exports.Wireframe=Ye.Wireframe,exports.Point=Ze.Point,exports.Points=Ze.Points,exports.PointsBuffer=Ze.PointsBuffer,exports.PositionPoint=Ze.PositionPoint,exports.Instance=$e.Instance,exports.Instances=$e.Instances,exports.Merged=$e.Merged,exports.Segment=er.Segment,exports.SegmentObject=er.SegmentObject,exports.Segments=er.Segments,exports.Detailed=rr.Detailed,exports.Preload=sr.Preload,exports.BakeShadows=or.BakeShadows,exports.meshBounds=tr.meshBounds,exports.AdaptiveDpr=ir.AdaptiveDpr,exports.AdaptiveEvents=ar.AdaptiveEvents,exports.PerformanceMonitor=cr.PerformanceMonitor,exports.usePerformanceMonitor=cr.usePerformanceMonitor,exports.RenderTexture=ur.RenderTexture,exports.Mask=nr.Mask,exports.useMask=nr.useMask,exports.Hud=jr.Hud,exports.MeshPortalMaterial=pr.MeshPortalMaterial;

package/native/index.js

@@ -35,6 +35,7 @@ export { PointerLockControls } from '../core/PointerLockControls.js';
 export { FirstPersonControls } from '../core/FirstPersonControls.js';
 export { CameraControls } from '../core/CameraControls.js';
 export { FaceControls, useFaceControls } from '../core/FaceControls.js';
+export { MotionPathControls, useMotion } from '../core/MotionPathControls.js';
 export { GizmoHelper, useGizmoContext } from '../core/GizmoHelper.js';
 export { GizmoViewcube } from '../core/GizmoViewcube.js';
 export { GizmoViewport } from '../core/GizmoViewport.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/drei",
-  "version": "9.83.8",
+  "version": "9.84.0",
   "private": false,
   "description": "useful add-ons for react-three-fiber",
   "keywords": [
@@ -50,7 +50,7 @@
     "lodash.clamp": "^4.0.3",
     "lodash.omit": "^4.5.0",
     "lodash.pick": "^4.4.0",
-    "maath": "^0.6.0",
+    "maath": "^0.9.0",
     "meshline": "^3.1.6",
     "react-composer": "^5.0.3",
     "react-merge-refs": "^1.1.0",

package/web/CycleRaycast.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import * as THREE from 'three';
-export declare type CycleRaycastProps = {
+export type CycleRaycastProps = {
     onChanged?: (hits: THREE.Intersection[], cycle: number) => null;
     preventDefault?: boolean;
     scroll?: boolean;

package/web/CycleRaycast.js

@@ -14,68 +14,64 @@ function CycleRaycast({
   const gl = useThree(state => state.gl);
   React.useEffect(() => {
     var _portal$current;
-
     let hits = [];
     let lastEvent = undefined;
     const prev = get().events.filter;
-    const target = (_portal$current = portal == null ? void 0 : portal.current) !== null && _portal$current !== void 0 ? _portal$current : gl.domElement.parentNode; // Render custom status
-
-    const renderStatus = () => target && onChanged && onChanged(hits, Math.round(cycle.current) % hits.length); // Overwrite the raycasters custom filter (this only exists in r3f)
+    const target = (_portal$current = portal == null ? void 0 : portal.current) !== null && _portal$current !== void 0 ? _portal$current : gl.domElement.parentNode;
 
+    // Render custom status
+    const renderStatus = () => target && onChanged && onChanged(hits, Math.round(cycle.current) % hits.length);
 
+    // Overwrite the raycasters custom filter (this only exists in r3f)
     setEvents({
       filter: (intersections, state) => {
         // Reset cycle when the intersections change
         let clone = [...intersections];
-
         if (clone.length !== hits.length || !hits.every(hit => clone.map(e => e.object.uuid).includes(hit.object.uuid))) {
           cycle.current = 0;
           hits = clone;
           renderStatus();
-        } // Run custom filter if there is one
-
-
-        if (prev) clone = prev(clone, state); // Cycle through the actual raycast intersects
-
+        }
+        // Run custom filter if there is one
+        if (prev) clone = prev(clone, state);
+        // Cycle through the actual raycast intersects
         for (let i = 0; i < Math.round(cycle.current) % clone.length; i++) {
           const first = clone.shift();
           clone = [...clone, first];
         }
-
         return clone;
       }
-    }); // Cycle, refresh events and render status
+    });
 
+    // Cycle, refresh events and render status
     const refresh = fn => {
       var _get$events$handlers, _get$events$handlers2;
-
-      cycle.current = fn(cycle.current); // Cancel hovered elements and fake a pointer-move
-
-      (_get$events$handlers = get().events.handlers) == null ? void 0 : _get$events$handlers.onPointerCancel(undefined);
-      (_get$events$handlers2 = get().events.handlers) == null ? void 0 : _get$events$handlers2.onPointerMove(lastEvent);
+      cycle.current = fn(cycle.current);
+      // Cancel hovered elements and fake a pointer-move
+      (_get$events$handlers = get().events.handlers) == null || _get$events$handlers.onPointerCancel(undefined);
+      (_get$events$handlers2 = get().events.handlers) == null || _get$events$handlers2.onPointerMove(lastEvent);
       renderStatus();
-    }; // Key events
-
+    };
 
+    // Key events
     const tabEvent = event => {
       if (event.keyCode || event.which === keyCode) {
         if (preventDefault) event.preventDefault();
         if (hits.length > 1) refresh(current => current + 1);
       }
-    }; // Wheel events
-
+    };
 
+    // Wheel events
     const wheelEvent = event => {
       if (preventDefault) event.preventDefault();
       let delta = 0;
       if (!event) event = window.event;
       if (event.wheelDelta) delta = event.wheelDelta / 120;else if (event.detail) delta = -event.detail / 3;
       if (hits.length > 1) refresh(current => Math.abs(current - delta));
-    }; // Catch last move event and position custom status
-
+    };
 
+    // Catch last move event and position custom status
     const moveEvent = event => lastEvent = event;
-
     document.addEventListener('pointermove', moveEvent, {
       passive: true
     });

package/web/Html.d.ts

@@ -7,8 +7,8 @@ declare function defaultCalculatePosition(el: Object3D, camera: Camera, size: {
     width: number;
     height: number;
 }): number[];
-export declare type CalculatePosition = typeof defaultCalculatePosition;
-declare type PointerEventsProperties = 'auto' | 'none' | 'visiblePainted' | 'visibleFill' | 'visibleStroke' | 'visible' | 'painted' | 'fill' | 'stroke' | 'all' | 'inherit';
+export type CalculatePosition = typeof defaultCalculatePosition;
+type PointerEventsProperties = 'auto' | 'none' | 'visiblePainted' | 'visibleFill' | 'visibleStroke' | 'visible' | 'painted' | 'fill' | 'stroke' | 'all' | 'inherit';
 export interface HtmlProps extends Omit<Assign<React.HTMLAttributes<HTMLDivElement>, ReactThreeFiber.Object3DNode<Group, typeof Group>>, 'ref'> {
     prepend?: boolean;
     center?: boolean;