babylonjs-loaders 8.29.0 → 8.29.2

package/babylonjs.loaders.module.d.ts

@@ -961,6 +961,10 @@ export class PBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @returns The coat roughness texture or null
      */
     get coatRoughnessTexture(): Nullable<BaseTexture>;
+    /**
+     * Sets the coat index of refraction (IOR).
+     */
+    set coatIor(value: number);
     /**
      * Sets the coat darkening value.
      * Note: PBR doesn't have a direct coat darkening property, so this is a no-op.
@@ -1571,6 +1575,10 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @returns The coat roughness texture or null
      */
     get coatRoughnessTexture(): Nullable<BaseTexture>;
+    /**
+     * Sets the coat index of refraction (IOR) of the OpenPBR material.
+     */
+    set coatIor(value: number);
     /**
      * Sets the coat darkening value of the OpenPBR material.
      * @param value The coat darkening value
@@ -1988,6 +1996,10 @@ export interface IMaterialLoadingAdapter {
      * Sets/gets the coat roughness texture (OpenPBR: coatRoughnessTexture, PBR: clearCoat.textureRoughness)
      */
     coatRoughnessTexture: Nullable<BaseTexture>;
+    /**
+     * Sets the coat index of refraction (IOR)
+     */
+    coatIor: number;
     /**
      * Sets the coat darkening (OpenPBR: coatDarkening, no PBR equivalent)
      */
@@ -2678,10 +2690,6 @@ import { Animation } from "babylonjs/Animations/animation";
 import { IAnimatable } from "babylonjs/Animations/animatable.interface";
 import { AnimationGroup } from "babylonjs/Animations/animationGroup";
 import { Material } from "babylonjs/Materials/material";
-import { PBRMaterial } from "babylonjs/Materials/PBR/pbrMaterial";
-import { OpenPBRMaterial } from "babylonjs/Materials/PBR/openPbrMaterial";
-import { OpenPBRMaterialLoadingAdapter } from "babylonjs-loaders/glTF/2.0/openPbrMaterialLoadingAdapter";
-import { PBRMaterialLoadingAdapter } from "babylonjs-loaders/glTF/2.0/pbrMaterialLoadingAdapter";
 import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
 import { TransformNode } from "babylonjs/Meshes/transformNode";
 import { Buffer, VertexBuffer } from "babylonjs/Buffers/buffer";
@@ -2741,6 +2749,10 @@ export interface IAnimationTargetInfo {
 }
 /** @internal */
 export function LoadBoundingInfoFromPositionAccessor(accessor: IAccessor): Nullable<BoundingInfo>;
+type PBRMaterialImplementation = {
+    materialClass: typeof Material;
+    adapterClass: new (material: Material) => IMaterialLoadingAdapter;
+};
 /**
  * The glTF 2.0 loader
  */
@@ -2771,9 +2783,7 @@ export class GLTFLoader implements IGLTFLoader {
     private readonly _postSceneLoadActions;
     private readonly _materialAdapterCache;
     /** @internal */
-    _pbrMaterialClass: typeof PBRMaterial | typeof OpenPBRMaterial | null;
-    /** @internal */
-    _pbrMaterialAdapterClass: typeof OpenPBRMaterialLoadingAdapter | typeof PBRMaterialLoadingAdapter | null;
+    _pbrMaterialImpl: Nullable<Readonly<PBRMaterialImplementation>> | false;
     /**
      * The default glTF sampler.
      */
@@ -3426,9 +3436,6 @@ export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_lights_punctual";
 export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_pbrSpecularGlossiness";
 export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_unlit";
 export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_clearcoat";
-export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_clearcoat_darkening";
-export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_clearcoat_color";
-export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_clearcoat_anisotropy";
 export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_iridescence";
 export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_anisotropy";
 export * from "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_emissive_strength";
@@ -4652,142 +4659,6 @@ export class KHR_materials_diffuse_roughness implements IGLTFLoaderExtension {
     private _loadDiffuseRoughnessPropertiesAsync;
 }
 
-}
-declare module "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_clearcoat_darkening" {
-import { Nullable } from "babylonjs/types";
-import { Material } from "babylonjs/Materials/material";
-import { IMaterial } from "babylonjs-loaders/glTF/2.0/glTFLoaderInterfaces";
-import { IGLTFLoaderExtension } from "babylonjs-loaders/glTF/2.0/glTFLoaderExtension";
-import { GLTFLoader } from "babylonjs-loaders/glTF/2.0/glTFLoader";
-module "babylonjs-loaders/glTF/glTFFileLoader" {
-    interface GLTFLoaderExtensionOptions {
-        /**
-         * Defines options for the KHR_materials_clearcoat_darkening extension.
-         */
-        ["KHR_materials_clearcoat_darkening"]: {};
-    }
-}
-/**
- * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/2518)
- * !!! Experimental Extension Subject to Changes !!!
- */
-export class KHR_materials_clearcoat_darkening implements IGLTFLoaderExtension {
-    /**
-     * The name of this extension.
-     */
-    readonly name: string;
-    /**
-     * Defines whether this extension is enabled.
-     */
-    enabled: boolean;
-    /**
-     * Defines a number that determines the order the extensions are applied.
-     */
-    order: number;
-    private _loader;
-    /**
-     * @internal
-     */
-    constructor(loader: GLTFLoader);
-    /** @internal */
-    dispose(): void;
-    /**
-     * @internal
-     */
-    loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;
-    private _loadDarkeningPropertiesAsync;
-}
-
-}
-declare module "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_clearcoat_color" {
-import { Nullable } from "babylonjs/types";
-import { Material } from "babylonjs/Materials/material";
-import { IMaterial } from "babylonjs-loaders/glTF/2.0/glTFLoaderInterfaces";
-import { IGLTFLoaderExtension } from "babylonjs-loaders/glTF/2.0/glTFLoaderExtension";
-import { GLTFLoader } from "babylonjs-loaders/glTF/2.0/glTFLoader";
-module "babylonjs-loaders/glTF/glTFFileLoader" {
-    interface GLTFLoaderExtensionOptions {
-        /**
-         * Defines options for the KHR_materials_clearcoat_color extension.
-         */
-        ["KHR_materials_clearcoat_color"]: {};
-    }
-}
-/**
- * !!! Experimental Extension Subject to Changes !!!
- */
-export class KHR_materials_clearcoat_color implements IGLTFLoaderExtension {
-    /**
-     * The name of this extension.
-     */
-    readonly name: string;
-    /**
-     * Defines whether this extension is enabled.
-     */
-    enabled: boolean;
-    /**
-     * Defines a number that determines the order the extensions are applied.
-     */
-    order: number;
-    private _loader;
-    /**
-     * @internal
-     */
-    constructor(loader: GLTFLoader);
-    /** @internal */
-    dispose(): void;
-    /**
-     * @internal
-     */
-    loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;
-    private _loadColorPropertiesAsync;
-}
-
-}
-declare module "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_clearcoat_anisotropy" {
-import { Nullable } from "babylonjs/types";
-import { Material } from "babylonjs/Materials/material";
-import { IMaterial } from "babylonjs-loaders/glTF/2.0/glTFLoaderInterfaces";
-import { IGLTFLoaderExtension } from "babylonjs-loaders/glTF/2.0/glTFLoaderExtension";
-import { GLTFLoader } from "babylonjs-loaders/glTF/2.0/glTFLoader";
-module "babylonjs-loaders/glTF/glTFFileLoader" {
-    interface GLTFLoaderExtensionOptions {
-        /**
-         * Defines options for the KHR_materials_clearcoat_anisotropy extension.
-         */
-        ["KHR_materials_clearcoat_anisotropy"]: {};
-    }
-}
-/**
- * [Specification](https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_clearcoat_anisotropy)
- */
-export class KHR_materials_clearcoat_anisotropy implements IGLTFLoaderExtension {
-    /**
-     * The name of this extension.
-     */
-    readonly name: string;
-    /**
-     * Defines whether this extension is enabled.
-     */
-    enabled: boolean;
-    /**
-     * Defines a number that determines the order the extensions are applied.
-     */
-    order: number;
-    private _loader;
-    /**
-     * @internal
-     */
-    constructor(loader: GLTFLoader);
-    /** @internal */
-    dispose(): void;
-    /**
-     * @internal
-     */
-    loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;
-    private _loadAnisotropyPropertiesAsync;
-}
-
 }
 declare module "babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_clearcoat" {
 import { Nullable } from "babylonjs/types";
@@ -4832,6 +4703,9 @@ export class KHR_materials_clearcoat implements IGLTFLoaderExtension {
      */
     loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;
     private _loadClearCoatPropertiesAsync;
+    private _loadClearCoatDarkeningPropertiesAsync;
+    private _loadClearCoatColorPropertiesAsync;
+    private _loadClearCoatAnisotropyPropertiesAsync;
 }
 
 }
@@ -8314,6 +8188,10 @@ declare module BABYLON.GLTF2 {
          * @returns The coat roughness texture or null
          */
         get coatRoughnessTexture(): Nullable<BaseTexture>;
+        /**
+         * Sets the coat index of refraction (IOR).
+         */
+        set coatIor(value: number);
         /**
          * Sets the coat darkening value.
          * Note: PBR doesn't have a direct coat darkening property, so this is a no-op.
@@ -8924,6 +8802,10 @@ declare module BABYLON.GLTF2 {
          * @returns The coat roughness texture or null
          */
         get coatRoughnessTexture(): Nullable<BaseTexture>;
+        /**
+         * Sets the coat index of refraction (IOR) of the OpenPBR material.
+         */
+        set coatIor(value: number);
         /**
          * Sets the coat darkening value of the OpenPBR material.
          * @param value The coat darkening value
@@ -9343,6 +9225,10 @@ declare module BABYLON.GLTF2 {
          * Sets/gets the coat roughness texture (OpenPBR: coatRoughnessTexture, PBR: clearCoat.textureRoughness)
          */
         coatRoughnessTexture: Nullable<BaseTexture>;
+        /**
+         * Sets the coat index of refraction (IOR)
+         */
+        coatIor: number;
         /**
          * Sets the coat darkening (OpenPBR: coatDarkening, no PBR equivalent)
          */
@@ -10061,6 +9947,10 @@ declare module BABYLON.GLTF2 {
     }
     /** @internal */
     export function LoadBoundingInfoFromPositionAccessor(accessor: BABYLON.GLTF2.Loader.IAccessor): Nullable<BoundingInfo>;
+    type PBRMaterialImplementation = {
+        materialClass: typeof Material;
+        adapterClass: new (material: Material) => BABYLON.GLTF2.IMaterialLoadingAdapter;
+    };
     /**
      * The glTF 2.0 loader
      */
@@ -10091,9 +9981,7 @@ declare module BABYLON.GLTF2 {
         private readonly _postSceneLoadActions;
         private readonly _materialAdapterCache;
         /** @internal */
-        _pbrMaterialClass: typeof PBRMaterial | typeof OpenPBRMaterial | null;
-        /** @internal */
-        _pbrMaterialAdapterClass: typeof BABYLON.GLTF2.OpenPBRMaterialLoadingAdapter | typeof BABYLON.GLTF2.PBRMaterialLoadingAdapter | null;
+        _pbrMaterialImpl: Nullable<Readonly<PBRMaterialImplementation>> | false;
         /**
          * The default glTF sampler.
          */
@@ -11898,136 +11786,6 @@ declare module BABYLON {
         ["KHR_materials_diffuse_roughness"]: {};
     }
 
-}
-declare module BABYLON.GLTF2.Loader.Extensions {
-        /**
-     * [Proposed Specification](https://github.com/KhronosGroup/glTF/pull/2518)
-     * !!! Experimental Extension Subject to Changes !!!
-     */
-    export class KHR_materials_clearcoat_darkening implements BABYLON.GLTF2.IGLTFLoaderExtension {
-        /**
-         * The name of this extension.
-         */
-        readonly name = "KHR_materials_clearcoat_darkening";
-        /**
-         * Defines whether this extension is enabled.
-         */
-        enabled: boolean;
-        /**
-         * Defines a number that determines the order the extensions are applied.
-         */
-        order: number;
-        private _loader;
-        /**
-         * @internal
-         */
-        constructor(loader: BABYLON.GLTF2.GLTFLoader);
-        /** @internal */
-        dispose(): void;
-        /**
-         * @internal
-         */
-        loadMaterialPropertiesAsync(context: string, material: BABYLON.GLTF2.Loader.IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;
-        private _loadDarkeningPropertiesAsync;
-    }
-
-
-
-}
-declare module BABYLON {
-    interface GLTFLoaderExtensionOptions {
-        /**
-         * Defines options for the KHR_materials_clearcoat_darkening extension.
-         */
-        ["KHR_materials_clearcoat_darkening"]: {};
-    }
-
-}
-declare module BABYLON.GLTF2.Loader.Extensions {
-        /**
-     * !!! Experimental Extension Subject to Changes !!!
-     */
-    export class KHR_materials_clearcoat_color implements BABYLON.GLTF2.IGLTFLoaderExtension {
-        /**
-         * The name of this extension.
-         */
-        readonly name = "KHR_materials_clearcoat_color";
-        /**
-         * Defines whether this extension is enabled.
-         */
-        enabled: boolean;
-        /**
-         * Defines a number that determines the order the extensions are applied.
-         */
-        order: number;
-        private _loader;
-        /**
-         * @internal
-         */
-        constructor(loader: BABYLON.GLTF2.GLTFLoader);
-        /** @internal */
-        dispose(): void;
-        /**
-         * @internal
-         */
-        loadMaterialPropertiesAsync(context: string, material: BABYLON.GLTF2.Loader.IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;
-        private _loadColorPropertiesAsync;
-    }
-
-
-
-}
-declare module BABYLON {
-    interface GLTFLoaderExtensionOptions {
-        /**
-         * Defines options for the KHR_materials_clearcoat_color extension.
-         */
-        ["KHR_materials_clearcoat_color"]: {};
-    }
-
-}
-declare module BABYLON.GLTF2.Loader.Extensions {
-        /**
-     * [Specification](https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_clearcoat_anisotropy)
-     */
-    export class KHR_materials_clearcoat_anisotropy implements BABYLON.GLTF2.IGLTFLoaderExtension {
-        /**
-         * The name of this extension.
-         */
-        readonly name = "KHR_materials_clearcoat_anisotropy";
-        /**
-         * Defines whether this extension is enabled.
-         */
-        enabled: boolean;
-        /**
-         * Defines a number that determines the order the extensions are applied.
-         */
-        order: number;
-        private _loader;
-        /**
-         * @internal
-         */
-        constructor(loader: BABYLON.GLTF2.GLTFLoader);
-        /** @internal */
-        dispose(): void;
-        /**
-         * @internal
-         */
-        loadMaterialPropertiesAsync(context: string, material: BABYLON.GLTF2.Loader.IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;
-        private _loadAnisotropyPropertiesAsync;
-    }
-
-
-
-}
-declare module BABYLON {
-    interface GLTFLoaderExtensionOptions {
-        /**
-         * Defines options for the KHR_materials_clearcoat_anisotropy extension.
-         */
-        ["KHR_materials_clearcoat_anisotropy"]: {};
-    }
-
 }
 declare module BABYLON.GLTF2.Loader.Extensions {
         /**
@@ -12059,6 +11817,9 @@ declare module BABYLON.GLTF2.Loader.Extensions {
          */
         loadMaterialPropertiesAsync(context: string, material: BABYLON.GLTF2.Loader.IMaterial, babylonMaterial: Material): Nullable<Promise<void>>;
         private _loadClearCoatPropertiesAsync;
+        private _loadClearCoatDarkeningPropertiesAsync;
+        private _loadClearCoatColorPropertiesAsync;
+        private _loadClearCoatAnisotropyPropertiesAsync;
     }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "babylonjs-loaders",
-    "version": "8.29.0",
+    "version": "8.29.2",
     "main": "babylonjs.loaders.min.js",
     "types": "babylonjs.loaders.module.d.ts",
     "files": [
@@ -15,8 +15,8 @@
         "test:escheck": "es-check es6 ./babylonjs.loaders.js"
     },
     "dependencies": {
-        "babylonjs": "^8.29.0",
-        "babylonjs-gltf2interface": "^8.29.0"
+        "babylonjs": "^8.29.2",
+        "babylonjs-gltf2interface": "^8.29.2"
     },
     "devDependencies": {
         "@dev/build-tools": "1.0.0",