@react-three/drei 10.2.0 → 10.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/CameraControls.cjs.js +1 -1
- package/core/CameraControls.d.ts +1 -0
- package/core/CameraControls.js +25 -22
- package/index.cjs.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("three"),r=require("react"),n=require("@react-three/fiber"),o=require("camera-controls");function
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("three"),r=require("react"),n=require("@react-three/fiber"),o=require("camera-controls");function l(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}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)}var s=l(e),u=a(r),c=l(o);const i=r.forwardRef(((e,o)=>{const{impl:l,camera:a,domElement:i,makeDefault:d,onControlStart:f,onControl:m,onControlEnd:v,onTransitionStart:p,onUpdate:E,onWake:h,onRest:L,onSleep:b,onStart:C,onEnd:T,onChange:g,regress:j,...x}=e,y=null!=l?l:c.default;r.useMemo((()=>{const e={Box3:t.Box3,MathUtils:{clamp:t.MathUtils.clamp},Matrix4:t.Matrix4,Quaternion:t.Quaternion,Raycaster:t.Raycaster,Sphere:t.Sphere,Spherical:t.Spherical,Vector2:t.Vector2,Vector3:t.Vector3,Vector4:t.Vector4};y.install({THREE:e}),n.extend({CameraControlsImpl:y})}),[y]);const M=n.useThree((e=>e.camera)),O=n.useThree((e=>e.gl)),S=n.useThree((e=>e.invalidate)),V=n.useThree((e=>e.events)),k=n.useThree((e=>e.setEvents)),q=n.useThree((e=>e.set)),w=n.useThree((e=>e.get)),R=n.useThree((e=>e.performance)),P=a||M,_=i||V.connected||O.domElement,U=r.useMemo((()=>new y(P)),[y,P]);return n.useFrame(((e,t)=>{U.update(t)}),-1),r.useEffect((()=>(U.connect(_),()=>{U.disconnect()})),[_,U]),r.useEffect((()=>{function e(){S(),j&&R.regress()}const t=t=>{e(),null==f||f(t),null==C||C(t)},r=t=>{e(),null==m||m(t),null==g||g(t)},n=e=>{null==v||v(e),null==T||T(e)},o=t=>{e(),null==p||p(t),null==g||g(t)},l=t=>{e(),null==E||E(t),null==g||g(t)},a=t=>{e(),null==h||h(t),null==g||g(t)},s=e=>{null==L||L(e)},u=e=>{null==b||b(e)};return U.addEventListener("controlstart",t),U.addEventListener("control",r),U.addEventListener("controlend",n),U.addEventListener("transitionstart",o),U.addEventListener("update",l),U.addEventListener("wake",a),U.addEventListener("rest",s),U.addEventListener("sleep",u),()=>{U.removeEventListener("controlstart",t),U.removeEventListener("control",r),U.removeEventListener("controlend",n),U.removeEventListener("transitionstart",o),U.removeEventListener("update",l),U.removeEventListener("wake",a),U.removeEventListener("rest",s),U.removeEventListener("sleep",u)}}),[U,S,k,j,R,f,m,v,p,E,h,L,b,g,C,T]),r.useEffect((()=>{if(d){const e=w().controls;return q({controls:U}),()=>q({controls:e})}}),[d,U]),u.createElement("primitive",s.default({ref:o,object:U},x))}));Object.defineProperty(exports,"CameraControlsImpl",{enumerable:!0,get:function(){return c.default}}),exports.CameraControls=i;
|
package/core/CameraControls.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { ThreeElement } from '@react-three/fiber';
|
|
|
3
3
|
import CameraControlsImpl from 'camera-controls';
|
|
4
4
|
import { ForwardRefComponent, Overwrite } from '../helpers/ts-utils';
|
|
5
5
|
export type CameraControlsProps = Omit<Overwrite<ThreeElement<typeof CameraControlsImpl>, {
|
|
6
|
+
impl?: typeof CameraControlsImpl;
|
|
6
7
|
camera?: PerspectiveCamera | OrthographicCamera;
|
|
7
8
|
domElement?: HTMLElement;
|
|
8
9
|
makeDefault?: boolean;
|
package/core/CameraControls.js
CHANGED
|
@@ -7,6 +7,27 @@ import CameraControlsImpl from 'camera-controls';
|
|
|
7
7
|
export { default as CameraControlsImpl } from 'camera-controls';
|
|
8
8
|
|
|
9
9
|
const CameraControls = /* @__PURE__ */forwardRef((props, ref) => {
|
|
10
|
+
const {
|
|
11
|
+
impl: SubclassImpl,
|
|
12
|
+
camera,
|
|
13
|
+
domElement,
|
|
14
|
+
makeDefault,
|
|
15
|
+
onControlStart,
|
|
16
|
+
onControl,
|
|
17
|
+
onControlEnd,
|
|
18
|
+
onTransitionStart,
|
|
19
|
+
onUpdate,
|
|
20
|
+
onWake,
|
|
21
|
+
onRest,
|
|
22
|
+
onSleep,
|
|
23
|
+
onStart,
|
|
24
|
+
onEnd,
|
|
25
|
+
onChange,
|
|
26
|
+
regress,
|
|
27
|
+
...restProps
|
|
28
|
+
} = props;
|
|
29
|
+
const Impl = SubclassImpl !== null && SubclassImpl !== void 0 ? SubclassImpl : CameraControlsImpl;
|
|
30
|
+
|
|
10
31
|
// useMemo is used here instead of useEffect, otherwise the useMemo below runs first and throws
|
|
11
32
|
useMemo(() => {
|
|
12
33
|
// to allow for tree shaking, we only import the subset of THREE that is used by camera-controls
|
|
@@ -25,31 +46,13 @@ const CameraControls = /* @__PURE__ */forwardRef((props, ref) => {
|
|
|
25
46
|
Vector3,
|
|
26
47
|
Vector4
|
|
27
48
|
};
|
|
28
|
-
|
|
49
|
+
Impl.install({
|
|
29
50
|
THREE: subsetOfTHREE
|
|
30
51
|
});
|
|
31
52
|
extend({
|
|
32
|
-
CameraControlsImpl
|
|
53
|
+
CameraControlsImpl: Impl
|
|
33
54
|
});
|
|
34
|
-
}, []);
|
|
35
|
-
const {
|
|
36
|
-
camera,
|
|
37
|
-
domElement,
|
|
38
|
-
makeDefault,
|
|
39
|
-
onControlStart,
|
|
40
|
-
onControl,
|
|
41
|
-
onControlEnd,
|
|
42
|
-
onTransitionStart,
|
|
43
|
-
onUpdate,
|
|
44
|
-
onWake,
|
|
45
|
-
onRest,
|
|
46
|
-
onSleep,
|
|
47
|
-
onStart,
|
|
48
|
-
onEnd,
|
|
49
|
-
onChange,
|
|
50
|
-
regress,
|
|
51
|
-
...restProps
|
|
52
|
-
} = props;
|
|
55
|
+
}, [Impl]);
|
|
53
56
|
const defaultCamera = useThree(state => state.camera);
|
|
54
57
|
const gl = useThree(state => state.gl);
|
|
55
58
|
const invalidate = useThree(state => state.invalidate);
|
|
@@ -60,7 +63,7 @@ const CameraControls = /* @__PURE__ */forwardRef((props, ref) => {
|
|
|
60
63
|
const performance = useThree(state => state.performance);
|
|
61
64
|
const explCamera = camera || defaultCamera;
|
|
62
65
|
const explDomElement = domElement || events.connected || gl.domElement;
|
|
63
|
-
const controls = useMemo(() => new
|
|
66
|
+
const controls = useMemo(() => new Impl(explCamera), [Impl, explCamera]);
|
|
64
67
|
useFrame((state, delta) => {
|
|
65
68
|
controls.update(delta);
|
|
66
69
|
}, -1);
|