@react-three/drei 9.71.0 → 9.72.1

package/core/useEnvironment.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@react-three/fiber"),r=require("three"),n=require("three-stdlib"),t=require("suspend-react"),s=require("../helpers/environment-assets.cjs.js");exports.useEnvironment=function({files:i=["/px.png","/nx.png","/py.png","/ny.png","/pz.png","/nz.png"],path:p="",preset:o,encoding:a,extensions:u}={}){if(o){if(!(o in s.presetsObj))throw new Error("Preset must be one of: "+Object.keys(s.presetsObj).join(", "));i=s.presetsObj[o],p="https://raw.githack.com/pmndrs/drei-assets/456060a26bbeb8fdf79326f224b6d99b8bcce736/hdri/"}var c;"object"==typeof(c=i)&&"function"==typeof c.then&&(i=t.suspend((async e=>(await e).default),[i]));const d=Array.isArray(i),b=d?r.CubeTextureLoader:n.RGBELoader,f=e.useLoader(b,d?[i]:i,(e=>{e.setPath(p),u&&u(e)})),g=d?f[0]:f;return g.mapping=d?r.CubeReflectionMapping:r.EquirectangularReflectionMapping,g.encoding=(null!=a?a:d)?r.sRGBEncoding:r.LinearEncoding,g};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@react-three/fiber"),r=require("three"),n=require("three-stdlib"),t=require("suspend-react"),s=require("../helpers/environment-assets.cjs.js");const i=e=>"object"==typeof e&&"function"==typeof e.then,o=e=>Array.isArray(e);exports.useEnvironment=function({files:p=["/px.png","/nx.png","/py.png","/ny.png","/pz.png","/nz.png"],path:a="",preset:u,encoding:c,extensions:d}={}){var f;if(u){if(!(u in s.presetsObj))throw new Error("Preset must be one of: "+Object.keys(s.presetsObj).join(", "));p=s.presetsObj[u],a="https://raw.githack.com/pmndrs/drei-assets/456060a26bbeb8fdf79326f224b6d99b8bcce736/hdri/"}i(p)&&(p=t.suspend((async e=>(await e).default),[p]));const b=o(p),l=!o(p)&&(null==(f=p.split(".").pop())?void 0:f.toLowerCase()),g=b?r.CubeTextureLoader:i(p)||"exr"===l?n.EXRLoader:"hdr"===l?n.RGBELoader:null;if(!g)throw new Error("useEnvironment: Unrecognized file extension: "+p);const h=e.useLoader(g,b?[p]:p,(e=>{e.setPath(a),d&&d(e)})),j=b?h[0]:h;return j.mapping=b?r.CubeReflectionMapping:r.EquirectangularReflectionMapping,j.encoding=(null!=c?c:b)?r.sRGBEncoding:r.LinearEncoding,j};

package/core/useEnvironment.js

@@ -1,6 +1,6 @@
 import { useLoader } from '@react-three/fiber';
-import { CubeReflectionMapping, EquirectangularReflectionMapping, sRGBEncoding, LinearEncoding, CubeTextureLoader } from 'three';
-import { RGBELoader } from 'three-stdlib';
+import { CubeTextureLoader, CubeReflectionMapping, EquirectangularReflectionMapping, sRGBEncoding, LinearEncoding } from 'three';
+import { EXRLoader, RGBELoader } from 'three-stdlib';
 import { suspend } from 'suspend-react';
 import { presetsObj } from '../helpers/environment-assets.js';
 
@@ -8,6 +8,8 @@ const CUBEMAP_ROOT = 'https://raw.githack.com/pmndrs/drei-assets/456060a26bbeb8f
 
 const isPromise = promise => typeof promise === 'object' && typeof promise.then === 'function';
 
+const isArray = arr => Array.isArray(arr);
+
 function useEnvironment({
   files = ['/px.png', '/nx.png', '/py.png', '/ny.png', '/pz.png', '/nz.png'],
   path = '',
@@ -15,6 +17,8 @@ function useEnvironment({
   encoding = undefined,
   extensions
 } = {}) {
+  var _files$split$pop;
+
   if (preset) {
     if (!(preset in presetsObj)) throw new Error('Preset must be one of: ' + Object.keys(presetsObj).join(', '));
     files = presetsObj[preset];
@@ -29,8 +33,10 @@ function useEnvironment({
     }, [files]);
   }
 
-  const isCubeMap = Array.isArray(files);
-  const loader = isCubeMap ? CubeTextureLoader : RGBELoader;
+  const isCubeMap = isArray(files);
+  const extension = !isArray(files) && ((_files$split$pop = files.split('.').pop()) == null ? void 0 : _files$split$pop.toLowerCase());
+  const loader = isCubeMap ? CubeTextureLoader : isPromise(files) || extension === 'exr' ? EXRLoader : extension === 'hdr' ? RGBELoader : null;
+  if (!loader) throw new Error('useEnvironment: Unrecognized file extension: ' + files);
   const loaderResult = useLoader( // @ts-expect-error
   loader, isCubeMap ? [files] : files, loader => {
     loader.setPath(path);