@react-three/drei 8.3.0 → 8.6.0

package/core/useKTX2.js

@@ -0,0 +1,39 @@
+import { useThree, useLoader } from '@react-three/fiber';
+import { useEffect } from 'react';
+import { KTX2Loader } from 'three-stdlib';
+import { IsObject } from './useTexture.js';
+
+const cdn = 'https://cdn.jsdelivr.net/gh/pmndrs/drei-assets@master';
+function useKTX2(input, basisPath = `${cdn}/basis/`) {
+  const gl = useThree(state => state.gl);
+  const textures = useLoader(KTX2Loader, IsObject(input) ? Object.values(input) : input, loader => {
+    loader.detectSupport(gl);
+    loader.setTranscoderPath(basisPath);
+  }); // https://github.com/mrdoob/three.js/issues/22696
+  // Upload the texture to the GPU immediately instead of waiting for the first render
+
+  useEffect(() => {
+    const array = Array.isArray(textures) ? textures : [textures];
+    array.forEach(gl.initTexture);
+  }, [gl, textures]);
+
+  if (IsObject(input)) {
+    const keys = Object.keys(input);
+    const keyed = {};
+    keys.forEach(key => Object.assign(keyed, {
+      [key]: textures[keys.indexOf(key)]
+    }));
+    return keyed;
+  } else {
+    return textures;
+  }
+}
+
+useKTX2.preload = (url, basisPath = `${cdn}/basis/`) => useLoader.preload(KTX2Loader, url, loader => {
+  loader.setTranscoderPath(basisPath);
+}); // @ts-expect-error new in r3f 7.0.5
+
+
+useKTX2.clear = input => useLoader.clear(KTX2Loader, input);
+
+export { useKTX2 };

package/helpers/Position.cjs.js

@@ -1 +1 @@
-"use strict";function e(e){if(e&&e.__esModule)return e;var r=Object.create(null);return e&&Object.keys(e).forEach((function(t){if("default"!==t){var o=Object.getOwnPropertyDescriptor(e,t);Object.defineProperty(r,t,o.get?o:{enumerable:!0,get:function(){return e[t]}})}})),r.default=e,Object.freeze(r)}Object.defineProperty(exports,"__esModule",{value:!0});var r=e(require("three"));class t extends r.Group{constructor(){super(),this.color=new r.Color("white")}}exports.Position=t;
+"use strict";function e(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)}Object.defineProperty(exports,"__esModule",{value:!0});var t=e(require("three"));const r=new t.Matrix4,n=new t.Matrix4,i=[],s=new t.Mesh;class o extends t.Group{constructor(){super(),this.color=new t.Color("white"),this.instance={current:void 0},this.instanceKey={current:void 0}}get geometry(){var e;return null==(e=this.instance.current)?void 0:e.geometry}raycast(e,t){const o=this.instance.current;if(!o)return;if(!o.geometry||!o.material)return;s.geometry=o.geometry;const c=o.matrixWorld;let a=o.userData.instances.indexOf(this.instanceKey);if(-1!==a){o.getMatrixAt(a,r),n.multiplyMatrices(c,r),s.matrixWorld=n,s.raycast(e,i);for(let e=0,r=i.length;e<r;e++){const r=i[e];r.instanceId=a,r.object=this,t.push(r)}i.length=0}}}exports.Position=o;

package/helpers/Position.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import * as THREE from 'three';
 import { ReactThreeFiber } from '@react-three/fiber';
 declare global {
@@ -9,5 +10,9 @@ declare global {
 }
 export declare class Position extends THREE.Group {
     color: THREE.Color;
+    instance: React.MutableRefObject<THREE.InstancedMesh | undefined>;
+    instanceKey: React.MutableRefObject<JSX.IntrinsicElements['position'] | undefined>;
     constructor();
+    get geometry(): THREE.BufferGeometry | undefined;
+    raycast(raycaster: any, intersects: any): void;
 }

package/helpers/Position.js

@@ -1,9 +1,60 @@
 import * as THREE from 'three';
 
+const _instanceLocalMatrix = /*@__PURE__*/new THREE.Matrix4();
+
+const _instanceWorldMatrix = /*@__PURE__*/new THREE.Matrix4();
+
+const _instanceIntersects = [];
+
+const _mesh = /*@__PURE__*/new THREE.Mesh();
+
 class Position extends THREE.Group {
   constructor() {
     super();
     this.color = new THREE.Color('white');
+    this.instance = {
+      current: undefined
+    };
+    this.instanceKey = {
+      current: undefined
+    };
+  } // This will allow the virtual instance have bounds
+
+
+  get geometry() {
+    var _this$instance$curren;
+
+    return (_this$instance$curren = this.instance.current) == null ? void 0 : _this$instance$curren.geometry;
+  } // And this will allow the virtual instance to receive events
+
+
+  raycast(raycaster, intersects) {
+    const parent = this.instance.current;
+    if (!parent) return;
+    if (!parent.geometry || !parent.material) return;
+    _mesh.geometry = parent.geometry;
+    const matrixWorld = parent.matrixWorld;
+    let instanceId = parent.userData.instances.indexOf(this.instanceKey);
+    if (instanceId === -1) return; // calculate the world matrix for each instance
+
+    parent.getMatrixAt(instanceId, _instanceLocalMatrix);
+
+    _instanceWorldMatrix.multiplyMatrices(matrixWorld, _instanceLocalMatrix); // the mesh represents this single instance
+
+
+    _mesh.matrixWorld = _instanceWorldMatrix;
+
+    _mesh.raycast(raycaster, _instanceIntersects); // process the result of raycast
+
+
+    for (let i = 0, l = _instanceIntersects.length; i < l; i++) {
+      const intersect = _instanceIntersects[i];
+      intersect.instanceId = instanceId;
+      intersect.object = this;
+      intersects.push(intersect);
+    }
+
+    _instanceIntersects.length = 0;
   }
 
 }