@react-three/drei 7.17.2 → 7.18.0

package/core/Stage.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("three"),r=require("@react-three/fiber"),n=require("./Environment.cjs.js"),i=require("./ContactShadows.cjs.js");function a(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var n=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,n.get?n:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}require("three-stdlib"),require("use-asset"),require("../helpers/environment-assets.cjs.js"),require("@babel/runtime/helpers/extends");var o=a(e),s=a(t);const u={rembrandt:{main:[1,2,1],fill:[-2,-.5,-2]},portrait:{main:[-1,2,.5],fill:[-1,.5,-1.5]},upfront:{main:[0,2,1],fill:[-1,.5,-1.5]},soft:{main:[-2,4,4],fill:[-1,.5,-1.5]}};exports.Stage=function({children:e,controls:t,shadows:a=!0,adjustCamera:c=!0,environment:l="city",contactShadow:h=!0,intensity:d=1,preset:f="rembrandt",shadowBias:m=0,contactShadowBlur:p=2,contactShadowOpacity:b=.5,...g}){const w=u[f],y=r.useThree((e=>e.camera)),j=r.useThree((e=>e.controls)),E=o.useRef(null),x=o.useRef(null),[{radius:v,width:S,height:q},O]=o.useState({radius:0,width:0,height:0});return o.useLayoutEffect((()=>{E.current.position.set(0,0,0),E.current.updateWorldMatrix(!0,!0);const e=(new s.Box3).setFromObject(x.current),t=new s.Vector3,r=new s.Sphere,n=e.max.y-e.min.y,i=e.max.x-e.min.x;e.getCenter(t),e.getBoundingSphere(r),O({radius:r.radius,width:i,height:n}),E.current.position.set(-t.x,-t.y+n/2,-t.z)}),[e]),o.useLayoutEffect((()=>{if(c){const e=v/(q>S?1.5:2.5);y.position.set(0,.5*v,2.5*v),y.near=.1,y.far=Math.max(5e3,4*v),y.lookAt(0,e,0);const r=j||(null==t?void 0:t.current);r&&(r.target.set(0,e,0),r.update())}}),[j,v,q,S,c]),o.createElement("group",g,o.createElement("group",{ref:E},o.createElement("group",{ref:x},e)),h&&o.createElement(i.ContactShadows,{"rotation-x":Math.PI/2,opacity:b,width:2*v,height:2*v,blur:p,far:v/2}),l&&o.createElement(n.Environment,{preset:l}),o.createElement("ambientLight",{intensity:d/3}),o.createElement("spotLight",{penumbra:1,position:[w.main[0]*v,w.main[1]*v,w.main[2]*v],intensity:2*d,castShadow:a,"shadow-bias":m}),o.createElement("pointLight",{position:[w.fill[0]*v,w.fill[1]*v,w.fill[2]*v],intensity:d}))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("react"),r=require("three"),n=require("@react-three/fiber"),i=require("./Environment.cjs.js"),a=require("./ContactShadows.cjs.js");function o(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function s(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var n=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,n.get?n:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}require("three-stdlib"),require("use-asset"),require("../helpers/environment-assets.cjs.js");var u=o(e),c=s(t),l=s(r);const f={rembrandt:{main:[1,2,1],fill:[-2,-.5,-2]},portrait:{main:[-1,2,.5],fill:[-1,.5,-1.5]},upfront:{main:[0,2,1],fill:[-1,.5,-1.5]},soft:{main:[-2,4,4],fill:[-1,.5,-1.5]}};exports.Stage=function({children:e,controls:t,shadows:r=!0,adjustCamera:o=!0,environment:s="city",intensity:d=1,preset:h="rembrandt",shadowBias:m=0,contactShadow:p={blur:2,opacity:.5,position:[0,0,0]},...b}){const g=f[h],y=n.useThree((e=>e.camera)),j=n.useThree((e=>e.controls)),w=c.useRef(null),E=c.useRef(null),[{radius:x,width:v,height:q},O]=c.useState({radius:0,width:0,height:0});return c.useLayoutEffect((()=>{w.current.position.set(0,0,0),w.current.updateWorldMatrix(!0,!0);const e=(new l.Box3).setFromObject(E.current),t=new l.Vector3,r=new l.Sphere,n=e.max.y-e.min.y,i=e.max.x-e.min.x;e.getCenter(t),e.getBoundingSphere(r),O({radius:r.radius,width:i,height:n}),w.current.position.set(-t.x,-t.y+n/2,-t.z)}),[e]),c.useLayoutEffect((()=>{if(o){const e=x/(q>v?1.5:2.5);y.position.set(0,.5*x,2.5*x),y.near=.1,y.far=Math.max(5e3,4*x),y.lookAt(0,e,0);const r=j||(null==t?void 0:t.current);r&&(r.target.set(0,e,0),r.update())}}),[j,x,q,v,o]),c.createElement("group",b,c.createElement("group",{ref:w},c.createElement("group",{ref:E},e)),p&&c.createElement(a.ContactShadows,u.default({"rotation-x":Math.PI/2,width:2*x,height:2*x,far:x/2},p)),s&&c.createElement(i.Environment,{preset:s}),c.createElement("ambientLight",{intensity:d/3}),c.createElement("spotLight",{penumbra:1,position:[g.main[0]*x,g.main[1]*x,g.main[2]*x],intensity:2*d,castShadow:r,"shadow-bias":m}),c.createElement("pointLight",{position:[g.fill[0]*x,g.fill[1]*x,g.fill[2]*x],intensity:d}))};

package/core/Stage.d.ts

@@ -24,7 +24,6 @@ declare type ControlsProto = {
     target: THREE.Vector3;
 };
 declare type Props = JSX.IntrinsicElements['group'] & {
-    contactShadow?: boolean;
     shadows?: boolean;
     adjustCamera?: boolean;
     environment?: PresetsType;
@@ -33,8 +32,11 @@ declare type Props = JSX.IntrinsicElements['group'] & {
     controls?: React.MutableRefObject<ControlsProto>;
     preset?: keyof typeof presets;
     shadowBias?: number;
-    contactShadowBlur?: number;
-    contactShadowOpacity?: number;
+    contactShadow?: {
+        blur: number;
+        opacity?: number;
+        position?: [x: number, y: number, z: number];
+    } | false;
 };
-export declare function Stage({ children, controls, shadows, adjustCamera, environment, contactShadow, intensity, preset, shadowBias, contactShadowBlur, contactShadowOpacity, ...props }: Props): JSX.Element;
+export declare function Stage({ children, controls, shadows, adjustCamera, environment, intensity, preset, shadowBias, contactShadow, ...props }: Props): JSX.Element;
 export {};

package/core/Stage.js

@@ -1,3 +1,4 @@
+import _extends from '@babel/runtime/helpers/esm/extends';
 import * as React from 'react';
 import * as THREE from 'three';
 import { useThree } from '@react-three/fiber';
@@ -28,12 +29,14 @@ function Stage({
   shadows = true,
   adjustCamera = true,
   environment = 'city',
-  contactShadow = true,
   intensity = 1,
   preset = 'rembrandt',
   shadowBias = 0,
-  contactShadowBlur = 2,
-  contactShadowOpacity = 0.5,
+  contactShadow = {
+    blur: 2,
+    opacity: 0.5,
+    position: [0, 0, 0]
+  },
   ...props
 }) {
   const config = presets[preset];
@@ -88,14 +91,12 @@ function Stage({
     ref: outer
   }, /*#__PURE__*/React.createElement("group", {
     ref: inner
-  }, children)), contactShadow && /*#__PURE__*/React.createElement(ContactShadows, {
+  }, children)), contactShadow && /*#__PURE__*/React.createElement(ContactShadows, _extends({
     "rotation-x": Math.PI / 2,
-    opacity: contactShadowOpacity,
     width: radius * 2,
     height: radius * 2,
-    blur: contactShadowBlur,
     far: radius / 2
-  }), environment && /*#__PURE__*/React.createElement(Environment, {
+  }, contactShadow)), environment && /*#__PURE__*/React.createElement(Environment, {
     preset: environment
   }), /*#__PURE__*/React.createElement("ambientLight", {
     intensity: intensity / 3