@react-three/drei 9.117.1 → 9.117.3

package/core/Decal.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("react"),r=require("three"),o=require("@react-three/fiber"),n=require("three-stdlib");function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function i(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var o=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,o.get?o:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var s=a(e),l=i(t),c=i(r);function u(e=[0,0,0]){return function(e){return Array.isArray(e)}(e)?e:e instanceof c.Vector3||e instanceof c.Euler?[e.x,e.y,e.z]:[e,e,e]}const p=l.forwardRef((function({debug:e,depthTest:t=!1,polygonOffsetFactor:r=-10,map:a,mesh:i,children:p,position:f,rotation:m,scale:y,...d},b){const h=l.useRef(null);l.useImperativeHandle(b,(()=>h.current));const g=l.useRef(null);return l.useLayoutEffect((()=>{const e=(null==i?void 0:i.current)||h.current.parent,t=h.current;if(!(e instanceof c.Mesh))throw new Error('Decal must have a Mesh as parent or specify its "mesh" prop');const r={position:new c.Vector3,rotation:new c.Euler,scale:new c.Vector3(1,1,1)};if(e){o.applyProps(r,{position:f,scale:y});const a=e.matrixWorld.clone();if(e.matrixWorld.identity(),m&&"number"!=typeof m)o.applyProps(r,{rotation:m});else{const t=new c.Object3D;t.position.copy(r.position);const n=e.geometry.attributes.position.array;void 0===e.geometry.attributes.normal&&e.geometry.computeVertexNormals();const a=e.geometry.attributes.normal.array;let i=1/0;new c.Vector3;let s=new c.Vector3;const l=t.position.x,u=t.position.y,p=t.position.z,f=n.length;let y=-1;for(let e=0;e<f;e+=3){const t=n[e]-l,r=n[e+1]-u,o=n[e+2]-p,a=t*t+r*r+o*o;a<i&&(i=a,y=e)}s.fromArray(a,y),t.lookAt(t.position.clone().add(s)),t.rotateZ(Math.PI),t.rotateY(Math.PI),"number"==typeof m&&t.rotateZ(m),o.applyProps(r,{rotation:t.rotation})}return t.geometry=new n.DecalGeometry(e,r.position,r.rotation,r.scale),g.current&&(o.applyProps(g.current,r),g.current.traverse((e=>e.raycast=()=>null))),e.matrixWorld=a,()=>{t.geometry.dispose()}}}),[i,e,...u(f),...u(y),...u(m)]),l.createElement("mesh",s.default({ref:h,"material-transparent":!0,"material-polygonOffset":!0,"material-polygonOffsetFactor":r,"material-depthTest":t,"material-map":a},d),p,e&&l.createElement("mesh",{ref:g},l.createElement("boxGeometry",null),l.createElement("meshNormalMaterial",{wireframe:!0}),l.createElement("axesHelper",null)))}));exports.Decal=p;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@babel/runtime/helpers/extends"),t=require("react"),r=require("three"),o=require("@react-three/fiber"),n=require("three-stdlib");function a(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}function i(e){if(e&&e.__esModule)return e;var t=Object.create(null);return e&&Object.keys(e).forEach((function(r){if("default"!==r){var o=Object.getOwnPropertyDescriptor(e,r);Object.defineProperty(t,r,o.get?o:{enumerable:!0,get:function(){return e[r]}})}})),t.default=e,Object.freeze(t)}var c=a(e),s=i(t),l=i(r);function u(e=[0,0,0]){return function(e){return Array.isArray(e)}(e)?e:e instanceof l.Vector3||e instanceof l.Euler?[e.x,e.y,e.z]:[e,e,e]}const p=s.forwardRef((function({debug:e,depthTest:t=!1,polygonOffsetFactor:r=-10,map:a,mesh:i,children:p,position:f,rotation:m,scale:y,...d},b){const h=s.useRef(null);s.useImperativeHandle(b,(()=>h.current));const g=s.useRef(null),w=s.useRef({position:new l.Vector3,rotation:new l.Euler,scale:new l.Vector3(1,1,1)});return s.useLayoutEffect((()=>{const e=(null==i?void 0:i.current)||h.current.parent,t=h.current;if(!(e instanceof l.Mesh))throw new Error('Decal must have a Mesh as parent or specify its "mesh" prop');if(e){o.applyProps(w.current,{position:f,scale:y});const r=e.matrixWorld.clone();if(e.matrixWorld.identity(),m&&"number"!=typeof m)o.applyProps(w.current,{rotation:m});else{const t=new l.Object3D;t.position.copy(w.current.position);const r=e.geometry.attributes.position.array;void 0===e.geometry.attributes.normal&&e.geometry.computeVertexNormals();const n=e.geometry.attributes.normal.array;let a=1/0;new l.Vector3;let i=new l.Vector3;const c=t.position.x,s=t.position.y,u=t.position.z,p=r.length;let f=-1;for(let e=0;e<p;e+=3){const t=r[e]-c,o=r[e+1]-s,n=r[e+2]-u,i=t*t+o*o+n*n;i<a&&(a=i,f=e)}i.fromArray(n,f),t.lookAt(t.position.clone().add(i)),t.rotateZ(Math.PI),t.rotateY(Math.PI),"number"==typeof m&&t.rotateZ(m),o.applyProps(w.current,{rotation:t.rotation})}return t.geometry=new n.DecalGeometry(e,w.current.position,w.current.rotation,w.current.scale),e.matrixWorld=r,()=>{t.geometry.dispose()}}}),[i,...u(f),...u(y),...u(m)]),s.useLayoutEffect((()=>{g.current&&(o.applyProps(g.current,w.current),g.current.traverse((e=>e.raycast=()=>null)))}),[e]),s.createElement("mesh",c.default({ref:h,"material-transparent":!0,"material-polygonOffset":!0,"material-polygonOffsetFactor":r,"material-depthTest":t,"material-map":a},d),p,e&&s.createElement("mesh",{ref:g},s.createElement("boxGeometry",null),s.createElement("meshNormalMaterial",{wireframe:!0}),s.createElement("axesHelper",null)))}));exports.Decal=p;

package/core/Decal.js

@@ -31,19 +31,19 @@ const Decal = /* @__PURE__ */React.forwardRef(function Decal({
   const ref = React.useRef(null);
   React.useImperativeHandle(forwardRef, () => ref.current);
   const helper = React.useRef(null);
+  const state = React.useRef({
+    position: new THREE.Vector3(),
+    rotation: new THREE.Euler(),
+    scale: new THREE.Vector3(1, 1, 1)
+  });
   React.useLayoutEffect(() => {
     const parent = (mesh == null ? void 0 : mesh.current) || ref.current.parent;
     const target = ref.current;
     if (!(parent instanceof THREE.Mesh)) {
       throw new Error('Decal must have a Mesh as parent or specify its "mesh" prop');
     }
-    const state = {
-      position: new THREE.Vector3(),
-      rotation: new THREE.Euler(),
-      scale: new THREE.Vector3(1, 1, 1)
-    };
     if (parent) {
-      applyProps(state, {
+      applyProps(state.current, {
         position,
         scale
       });
@@ -53,7 +53,7 @@ const Decal = /* @__PURE__ */React.forwardRef(function Decal({
       parent.matrixWorld.identity();
       if (!rotation || typeof rotation === 'number') {
         const o = new THREE.Object3D();
-        o.position.copy(state.position);
+        o.position.copy(state.current.position);
 
         // Thanks https://x.com/N8Programs !
         const vertices = parent.geometry.attributes.position.array;
@@ -87,27 +87,29 @@ const Decal = /* @__PURE__ */React.forwardRef(function Decal({
         o.rotateZ(Math.PI);
         o.rotateY(Math.PI);
         if (typeof rotation === 'number') o.rotateZ(rotation);
-        applyProps(state, {
+        applyProps(state.current, {
           rotation: o.rotation
         });
       } else {
-        applyProps(state, {
+        applyProps(state.current, {
           rotation
         });
       }
-      target.geometry = new DecalGeometry(parent, state.position, state.rotation, state.scale);
-      if (helper.current) {
-        applyProps(helper.current, state);
-        // Prevent the helpers from blocking rays
-        helper.current.traverse(child => child.raycast = () => null);
-      }
+      target.geometry = new DecalGeometry(parent, state.current.position, state.current.rotation, state.current.scale);
       // Reset parents matix-world
       parent.matrixWorld = matrixWorld;
       return () => {
         target.geometry.dispose();
       };
     }
-  }, [mesh, debug, ...vecToArray(position), ...vecToArray(scale), ...vecToArray(rotation)]);
+  }, [mesh, ...vecToArray(position), ...vecToArray(scale), ...vecToArray(rotation)]);
+  React.useLayoutEffect(() => {
+    if (helper.current) {
+      applyProps(helper.current, state.current);
+      // Prevent the helpers from blocking rays
+      helper.current.traverse(child => child.raycast = () => null);
+    }
+  }, [debug]);
 
   // <meshStandardMaterial transparent polygonOffset polygonOffsetFactor={-10} {...props} />}
   return /*#__PURE__*/React.createElement("mesh", _extends({

package/core/Text3D.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as THREE from 'three';
 import { MeshProps, Node } from '@react-three/fiber';
 import { TextGeometryParameters } from 'three-stdlib';
-import { useFont } from './useFont';
+import { FontData } from './useFont';
 import { ForwardRefComponent } from '../helpers/ts-utils';
 declare global {
     namespace JSX {
@@ -12,7 +12,7 @@ declare global {
     }
 }
 type Text3DProps = {
-    font: Parameters<typeof useFont>[0];
+    font: FontData | string;
     bevelSegments?: number;
     smooth?: number;
 } & Omit<TextGeometryParameters, 'font'> & MeshProps;

package/core/useFont.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three-stdlib"),r=require("suspend-react");let n=null,t=null;async function a(r){if("string"==typeof r){var n;const u=await fetch(r);if(null!=(n=u.headers.get("Content-Type"))&&n.includes("application/json"))return await u.json();{const r=await u.arrayBuffer();return a=r,t||(t=new e.TTFLoader),t.parse(a)}}return r;var a}async function u(r){return function(r){return n||(n=new e.FontLoader),n.parse(r)}(await a(r))}function s(e){return r.suspend(u,[e])}s.preload=e=>r.preload(u,[e]),s.clear=e=>r.clear([e]),exports.useFont=s;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("three-stdlib"),r=require("suspend-react");let t=null;async function n(r){const n=await async function(e){return"string"==typeof e?await(await fetch(e)).json():e}(r);return a=n,t||(t=new e.FontLoader),t.parse(a);var a}function a(e){return r.suspend(n,[e])}a.preload=e=>r.preload(n,[e]),a.clear=e=>r.clear([e]),exports.useFont=a;

package/core/useFont.js

@@ -1,37 +1,19 @@
-import { FontLoader, TTFLoader } from 'three-stdlib';
+import { FontLoader } from 'three-stdlib';
 import { suspend, preload, clear } from 'suspend-react';
 
 let fontLoader = null;
-let ttfLoader = null;
+async function loadFontData(font) {
+  return typeof font === 'string' ? await (await fetch(font)).json() : font;
+}
 function parseFontData(fontData) {
   if (!fontLoader) {
     fontLoader = new FontLoader();
   }
   return fontLoader.parse(fontData);
 }
-function parseTtfArrayBuffer(ttfData) {
-  if (!ttfLoader) {
-    ttfLoader = new TTFLoader();
-  }
-  return ttfLoader.parse(ttfData);
-}
-async function loadFontData(font) {
-  if (typeof font === 'string') {
-    var _res$headers$get;
-    const res = await fetch(font);
-    if ((_res$headers$get = res.headers.get('Content-Type')) != null && _res$headers$get.includes('application/json')) {
-      return await res.json();
-    } else {
-      const arrayBuffer = await res.arrayBuffer();
-      return parseTtfArrayBuffer(arrayBuffer);
-    }
-  } else {
-    return font;
-  }
-}
 async function loader(font) {
-  const fontData = await loadFontData(font);
-  return parseFontData(fontData);
+  const data = await loadFontData(font);
+  return parseFontData(data);
 }
 function useFont(font) {
   return suspend(loader, [font]);