diff --git a/eslint.config.js b/eslint.config.js index 319fadbbd5db86..f2893072bd2ba1 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -45,7 +45,7 @@ export default [ jsdoc }, languageOptions: { - ecmaVersion: 2018, + ecmaVersion: 2022, sourceType: 'module', globals: { ...globals.browser, @@ -134,7 +134,7 @@ export default [ name: 'editor rules', files: [ 'editor/**/*.js' ], languageOptions: { - ecmaVersion: 2020, + ecmaVersion: 2022, sourceType: 'module' } } diff --git a/examples/jsm/loaders/GLTFLoader.js b/examples/jsm/loaders/GLTFLoader.js index d5791f06c05579..91629ef9f7a39b 100644 --- a/examples/jsm/loaders/GLTFLoader.js +++ b/examples/jsm/loaders/GLTFLoader.js @@ -1273,6 +1273,8 @@ class GLTFMaterialsIorExtension { materialParams.ior = extension.ior !== undefined ? extension.ior : 1.5; + if ( materialParams.ior === 0 ) materialParams.ior = 1000; // see #26167 + return Promise.resolve(); } diff --git a/src/loaders/DataTextureLoader.js b/src/loaders/DataTextureLoader.js index 2a8de258dfdf35..068b756a46543c 100644 --- a/src/loaders/DataTextureLoader.js +++ b/src/loaders/DataTextureLoader.js @@ -2,6 +2,7 @@ import { LinearFilter, LinearMipmapLinearFilter, ClampToEdgeWrapping } from '../ import { FileLoader } from './FileLoader.js'; import { DataTexture } from '../textures/DataTexture.js'; import { Loader } from './Loader.js'; +import { error } from '../utils.js'; /** * Abstract base class for loading binary texture formats RGBE, EXR or TGA. @@ -57,15 +58,15 @@ class DataTextureLoader extends Loader { texData = scope.parse( buffer ); - } catch ( error ) { + } catch ( e ) { if ( onError !== undefined ) { - onError( error ); + onError( e ); } else { - error( error ); + error( e ); return; }