@react-three/drei 9.108.3 → 9.108.4
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@react-three/fiber"),r=require("three"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@react-three/fiber"),r=require("three"),t=require("three-stdlib"),n=require("@monogrid/gainmap-js"),s=require("../helpers/environment-assets.cjs.js"),i=require("../helpers/deprecated.cjs.js"),o=require("react");const a=e=>Array.isArray(e);exports.useEnvironment=function({files:p=["/px.png","/nx.png","/py.png","/ny.png","/pz.png","/nz.png"],path:l="",preset:c,encoding:d,extensions:u}={}){var g;let b=null,h=!1;if(c){if(!(c in s.presetsObj))throw new Error("Preset must be one of: "+Object.keys(s.presetsObj).join(", "));p=s.presetsObj[c],l="https://raw.githack.com/pmndrs/drei-assets/456060a26bbeb8fdf79326f224b6d99b8bcce736/hdri/"}const j=a(p)&&6===p.length,f=a(p)&&3===p.length&&p.some((e=>e.endsWith("json"))),m=a(p)?p[0]:p;h=a(p);const E=j?"cube":f?"webp":m.startsWith("data:application/exr")?"exr":m.startsWith("data:application/hdr")?"hdr":m.startsWith("data:image/jpeg")?"jpg":null==(g=m.split(".").pop())||null==(g=g.split("?"))||null==(g=g.shift())?void 0:g.toLowerCase();if(b="cube"===E?r.CubeTextureLoader:"hdr"===E?t.RGBELoader:"exr"===E?t.EXRLoader:"jpg"===E||"jpeg"===E?n.HDRJPGLoader:"webp"===E?n.GainMapLoader:null,!b)throw new Error("useEnvironment: Unrecognized file extension: "+p);const w=e.useThree((e=>e.gl));o.useLayoutEffect((()=>{"webp"!==E&&"jpg"!==E&&"jpeg"!==E||w.domElement.addEventListener("webglcontextlost",(function(){e.useLoader.clear(b,h?[p]:p)}),{once:!0})}),[p,w.domElement]);const x=e.useLoader(b,h?[p]:p,(e=>{"webp"!==E&&"jpg"!==E&&"jpeg"!==E||e.setRenderer(w),null==e.setPath||e.setPath(l),u&&u(e)}));let L=h?x[0]:x;var v;return"jpg"!==E&&"jpeg"!==E&&"webp"!==E||(L=null==(v=L.renderTarget)?void 0:v.texture),L.mapping=j?r.CubeReflectionMapping:r.EquirectangularReflectionMapping,"colorSpace"in L?L.colorSpace=(null!=d?d:j)?"srgb":"srgb-linear":L.encoding=(null!=d?d:j)?i.sRGBEncoding:i.LinearEncoding,L};
|
package/core/useEnvironment.js
CHANGED
|
@@ -4,6 +4,7 @@ import { RGBELoader, EXRLoader } from 'three-stdlib';
|
|
|
4
4
|
import { HDRJPGLoader, GainMapLoader } from '@monogrid/gainmap-js';
|
|
5
5
|
import { presetsObj } from '../helpers/environment-assets.js';
|
|
6
6
|
import { sRGBEncoding, LinearEncoding } from '../helpers/deprecated.js';
|
|
7
|
+
import { useLayoutEffect } from 'react';
|
|
7
8
|
|
|
8
9
|
const CUBEMAP_ROOT = 'https://raw.githack.com/pmndrs/drei-assets/456060a26bbeb8fdf79326f224b6d99b8bcce736/hdri/';
|
|
9
10
|
const isArray = arr => Array.isArray(arr);
|
|
@@ -17,7 +18,6 @@ function useEnvironment({
|
|
|
17
18
|
var _firstEntry$split$pop;
|
|
18
19
|
let loader = null;
|
|
19
20
|
let multiFile = false;
|
|
20
|
-
let extension;
|
|
21
21
|
if (preset) {
|
|
22
22
|
if (!(preset in presetsObj)) throw new Error('Preset must be one of: ' + Object.keys(presetsObj).join(', '));
|
|
23
23
|
files = presetsObj[preset];
|
|
@@ -29,10 +29,21 @@ function useEnvironment({
|
|
|
29
29
|
|
|
30
30
|
// Everything else
|
|
31
31
|
multiFile = isArray(files);
|
|
32
|
-
extension = isCubemap ? 'cube' : isGainmap ? 'webp' : firstEntry.startsWith('data:application/exr') ? 'exr' : firstEntry.startsWith('data:application/hdr') ? 'hdr' : firstEntry.startsWith('data:image/jpeg') ? 'jpg' : (_firstEntry$split$pop = firstEntry.split('.').pop()) == null || (_firstEntry$split$pop = _firstEntry$split$pop.split('?')) == null || (_firstEntry$split$pop = _firstEntry$split$pop.shift()) == null ? void 0 : _firstEntry$split$pop.toLowerCase();
|
|
32
|
+
const extension = isCubemap ? 'cube' : isGainmap ? 'webp' : firstEntry.startsWith('data:application/exr') ? 'exr' : firstEntry.startsWith('data:application/hdr') ? 'hdr' : firstEntry.startsWith('data:image/jpeg') ? 'jpg' : (_firstEntry$split$pop = firstEntry.split('.').pop()) == null || (_firstEntry$split$pop = _firstEntry$split$pop.split('?')) == null || (_firstEntry$split$pop = _firstEntry$split$pop.shift()) == null ? void 0 : _firstEntry$split$pop.toLowerCase();
|
|
33
33
|
loader = extension === 'cube' ? CubeTextureLoader : extension === 'hdr' ? RGBELoader : extension === 'exr' ? EXRLoader : extension === 'jpg' || extension === 'jpeg' ? HDRJPGLoader : extension === 'webp' ? GainMapLoader : null;
|
|
34
34
|
if (!loader) throw new Error('useEnvironment: Unrecognized file extension: ' + files);
|
|
35
35
|
const gl = useThree(state => state.gl);
|
|
36
|
+
useLayoutEffect(() => {
|
|
37
|
+
// Only required for gainmap
|
|
38
|
+
if (extension !== 'webp' && extension !== 'jpg' && extension !== 'jpeg') return;
|
|
39
|
+
function clearGainmapTexture() {
|
|
40
|
+
// @ts-expect-error
|
|
41
|
+
useLoader.clear(loader, multiFile ? [files] : files);
|
|
42
|
+
}
|
|
43
|
+
gl.domElement.addEventListener('webglcontextlost', clearGainmapTexture, {
|
|
44
|
+
once: true
|
|
45
|
+
});
|
|
46
|
+
}, [files, gl.domElement]);
|
|
36
47
|
const loaderResult = useLoader(
|
|
37
48
|
// @ts-expect-error
|
|
38
49
|
loader, multiFile ? [files] : files, loader => {
|