@react-three/drei 9.72.1 → 9.72.2

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");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};
+"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 o=e=>Array.isArray(e);exports.useEnvironment=function({files:i=["/px.png","/nx.png","/py.png","/ny.png","/pz.png","/nz.png"],path:p="",preset:a,encoding:u,extensions:l}={}){let c,d=null,b=!1;if(a){if(!(a in s.presetsObj))throw new Error("Preset must be one of: "+Object.keys(s.presetsObj).join(", "));i=s.presetsObj[a],p="https://raw.githack.com/pmndrs/drei-assets/456060a26bbeb8fdf79326f224b6d99b8bcce736/hdri/"}var f,g;if("object"==typeof(g=i)&&"function"==typeof g.then?(i=t.suspend((async e=>(await e).default),[i]),d=n.EXRLoader):(b=o(i),c=!o(i)&&(null==(f=i.split(".").pop())?void 0:f.toLowerCase()),d=b?r.CubeTextureLoader:"hdr"===c?n.RGBELoader:"exr"===c?n.EXRLoader:null),!d)throw new Error("useEnvironment: Unrecognized file extension: "+i);const h=e.useLoader(d,b?[i]:i,(e=>{null==e.setPath||e.setPath(p),l&&l(e)})),j=b?h[0]:h;return j.mapping=b?r.CubeReflectionMapping:r.EquirectangularReflectionMapping,"colorSpace"in j?j.colorSpace=(null!=u?u:b)?"srgb":"srgb-linear":j.encoding=(null!=u?u:b)?3001:3e3,j};

package/core/useEnvironment.js

@@ -1,5 +1,5 @@
 import { useLoader } from '@react-three/fiber';
-import { CubeTextureLoader, CubeReflectionMapping, EquirectangularReflectionMapping, sRGBEncoding, LinearEncoding } from 'three';
+import { CubeReflectionMapping, EquirectangularReflectionMapping, CubeTextureLoader } from 'three';
 import { EXRLoader, RGBELoader } from 'three-stdlib';
 import { suspend } from 'suspend-react';
 import { presetsObj } from '../helpers/environment-assets.js';
@@ -17,35 +17,44 @@ function useEnvironment({
   encoding = undefined,
   extensions
 } = {}) {
-  var _files$split$pop;
+  let loader = null;
+  let isCubeMap = false;
+  let extension;
 
   if (preset) {
     if (!(preset in presetsObj)) throw new Error('Preset must be one of: ' + Object.keys(presetsObj).join(', '));
     files = presetsObj[preset];
     path = CUBEMAP_ROOT;
-  } // Using promises that return inline-URLs by default
-
+  }
 
   if (isPromise(files)) {
+    // Using promises that return inline-EXR URLs by default
     files = suspend(async promise => {
       const result = await promise;
       return result.default;
     }, [files]);
+    loader = EXRLoader;
+  } else {
+    var _files$split$pop;
+
+    // Everything else
+    isCubeMap = isArray(files);
+    extension = !isArray(files) && ((_files$split$pop = files.split('.').pop()) == null ? void 0 : _files$split$pop.toLowerCase());
+    loader = isCubeMap ? CubeTextureLoader : extension === 'hdr' ? RGBELoader : extension === 'exr' ? EXRLoader : null;
   }
 
-  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);
+    loader.setPath == null ? void 0 : loader.setPath(path);
     if (extensions) extensions(loader);
   });
   const texture = isCubeMap ? // @ts-ignore
   loaderResult[0] : loaderResult;
   texture.mapping = isCubeMap ? CubeReflectionMapping : EquirectangularReflectionMapping;
-  texture.encoding = (encoding !== null && encoding !== void 0 ? encoding : isCubeMap) ? sRGBEncoding : LinearEncoding;
+  const sRGBEncoding = 3001;
+  const LinearEncoding = 3000;
+  if ('colorSpace' in texture) texture.colorSpace = (encoding !== null && encoding !== void 0 ? encoding : isCubeMap) ? 'srgb' : 'srgb-linear';else texture.encoding = (encoding !== null && encoding !== void 0 ? encoding : isCubeMap) ? sRGBEncoding : LinearEncoding;
   return texture;
 }