babylonjs-loaders 9.6.2 → 9.8.0

package/babylonjs.loaders.module.d.ts

@@ -702,11 +702,13 @@ import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
 import { Nullable } from "babylonjs/types";
 import { Color3 } from "babylonjs/Maths/math.color";
 import { IMaterialLoadingAdapter } from "babylonjs-loaders/glTF/2.0/materialLoadingAdapter";
+import { GLTFLoader } from "babylonjs-loaders/glTF/2.0/glTFLoader";
 /**
  * Material Loading Adapter for PBR materials that provides a unified OpenPBR-like interface.
  */
 export class PBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
     private _material;
+    private _specWorkflow;
     /**
      * Creates a new instance of the PBRMaterialLoadingAdapter.
      * @param material - The PBR material to adapt.
@@ -716,6 +718,11 @@ export class PBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * Gets the underlying material
      */
     get material(): PBRMaterial;
+    /**
+     * No-op: PBRMaterial has no deferred finalization.
+     * @param _loader Unused.
+     */
+    finalizeAsync(_loader: GLTFLoader): Promise<void>;
     /**
      * Whether the material should be treated as unlit
      */
@@ -848,6 +855,10 @@ export class PBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @param enableEdgeColor Whether to enable OpenPBR BRDF models for edge color support
      */
     enableSpecularEdgeColor(enableEdgeColor?: boolean): void;
+    /**
+     * Enable the specular/glossiness workflow and disable metallic/roughness.
+     */
+    configureSpecularGlossiness(): void;
     /**
      * Sets the specular weight (mapped to PBR metallicF0Factor).
      * @param value The specular weight value
@@ -921,6 +932,16 @@ export class PBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @returns The IOR value
      */
     get specularIor(): number;
+    /**
+     * Sets/gets the glossiness (inverted roughness)
+     * ONLY used for specular/glossiness workflow; has no effect when metallic/roughness workflow is active
+     */
+    get glossiness(): number;
+    /**
+     * Sets/gets the glossiness (inverted roughness)
+     * ONLY used for specular/glossiness workflow; has no effect when metallic/roughness workflow is active
+     */
+    set glossiness(value: number);
     /**
      * Sets the emission color (mapped to PBR emissiveColor).
      * @param value The emission color as a Color3
@@ -1154,6 +1175,9 @@ export class PBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * Sets up the material for proper thin-surface transmission behavior.
      */
     configureTransmission(): void;
+    /**
+     * Configures volume properties for PBR material. Nothing to do for PBRMaterial.
+     */
     configureVolume(): void;
     /**
      * Sets whether the material is thin-walled (i.e. non-volumetric) or not.
@@ -1414,11 +1438,13 @@ import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
 import { Nullable } from "babylonjs/types";
 import { Color3 } from "babylonjs/Maths/math.color";
 import { IMaterialLoadingAdapter } from "babylonjs-loaders/glTF/2.0/materialLoadingAdapter";
+import { GLTFLoader } from "babylonjs-loaders/glTF/2.0/glTFLoader";
 /**
  * Material Loading Adapter for OpenPBR materials that provides a unified OpenPBR-like interface.
  */
 export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
     private _material;
+    private _specWorkflow;
     /**
      * Creates a new instance of the OpenPBRMaterialLoadingAdapter.
      * @param material - The OpenPBR material to adapt.
@@ -1561,6 +1587,7 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @param _enableEdgeColor Whether to enable edge color support (ignored for OpenPBR)
      */
     enableSpecularEdgeColor(_enableEdgeColor?: boolean): void;
+    configureSpecularGlossiness(): void;
     /**
      * Sets the specular weight of the OpenPBR material.
      * @param value The specular weight value (0-1)
@@ -1633,6 +1660,11 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @returns The IOR value
      */
     get specularIor(): number;
+    /**
+     * Sets the glossiness (inverted roughness) of the OpenPBR material.
+     */
+    set glossiness(value: number);
+    get glossiness(): number;
     /**
      * Sets the emission color of the OpenPBR material.
      * @param value The emission color as a Color3
@@ -1713,6 +1745,10 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @param value The coat color as a Color3
      */
     set coatColor(value: Color3);
+    /**
+     * Gets the coat color of the OpenPBR material.
+     */
+    get coatColor(): Color3;
     /**
      * Sets the coat color texture of the OpenPBR material.
      * @param value The coat color texture or null
@@ -1742,11 +1778,13 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * Sets the coat index of refraction (IOR) of the OpenPBR material.
      */
     set coatIor(value: number);
+    get coatIor(): number;
     /**
      * Sets the coat darkening value of the OpenPBR material.
      * @param value The coat darkening value
      */
     set coatDarkening(value: number);
+    get coatDarkening(): number;
     /**
      * Sets the coat darkening texture (OpenPBR: coatDarkeningTexture, no PBR equivalent)
      */
@@ -1795,6 +1833,7 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @param value The transmission weight texture or null
      */
     set transmissionWeightTexture(value: Nullable<BaseTexture>);
+    get transmissionWeightTexture(): Nullable<BaseTexture>;
     /**
      * Gets the transmission weight.
      * @returns Currently returns 0 as transmission is not yet available
@@ -1863,6 +1902,9 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @param value The refraction background texture or null
      */
     set refractionBackgroundTexture(value: Nullable<BaseTexture>);
+    /**
+     * Configures volume properties for OpenPBR material.
+     */
     configureVolume(): void;
     /**
      * Sets whether the material is thin-walled (i.e. non-volumetric) or not.
@@ -1895,6 +1937,7 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * Sets the subsurface weight texture
      */
     set subsurfaceWeightTexture(value: Nullable<BaseTexture>);
+    get subsurfaceWeightTexture(): Nullable<BaseTexture>;
     /**
      * Sets the subsurface color.
      * @param value The subsurface tint color as a Color3
@@ -2094,7 +2137,12 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
      * @param value The scale value for the coat normal texture
      */
     set geometryCoatNormalTextureScale(value: number);
-    finalize(): void;
+    /**
+     * Finalizes material properties after all loading is complete.
+     * @param loader The glTF loader; `loader._disposed` is polled between texture passes to bail early on dispose.
+     */
+    finalizeAsync(loader: GLTFLoader): Promise<void>;
+    private copySurfaceToCoatAsync;
 }
 
 }
@@ -2103,6 +2151,7 @@ import { Material } from "babylonjs/Materials/material";
 import { BaseTexture } from "babylonjs/Materials/Textures/baseTexture";
 import { Nullable } from "babylonjs/types";
 import { Color3 } from "babylonjs/Maths/math.color";
+import { GLTFLoader } from "babylonjs-loaders/glTF/2.0/glTFLoader";
 /**
  * Interface for material loading adapters that provides a unified OpenPBR-like interface
  * for both OpenPBR and PBR materials, eliminating conditional branches in extensions.
@@ -2113,9 +2162,16 @@ export interface IMaterialLoadingAdapter {
      */
     readonly material: Material;
     /**
-     * Finalizes material properties after loading is complete.
+     * Finalizes material properties after all loading is complete.
+     * May do async work (e.g. GPU texture processing); the returned Promise is tracked
+     * by the loader and awaited before the COMPLETE state is reached, so callers can rely
+     * on onCompleteObservable for fully processed materials.
+     *
+     * Implementations should check `loader._disposed` between awaits to bail out early
+     * when the loader is disposed mid-flight.
+     * @param loader The glTF loader driving the finalize step.
      */
-    finalize?(): void;
+    finalizeAsync(loader: GLTFLoader): Promise<void>;
     /**
      * Whether the material should be treated as unlit
      */
@@ -2177,6 +2233,10 @@ export interface IMaterialLoadingAdapter {
      * @param enableEdgeColor - Whether to enable edge color support
      */
     enableSpecularEdgeColor(enableEdgeColor?: boolean): void;
+    /**
+     * Enable the specular/glossiness workflow and disable metallic/roughness.
+     */
+    configureSpecularGlossiness(): void;
     /**
      * Sets/gets the specular weight
      */
@@ -2205,6 +2265,11 @@ export interface IMaterialLoadingAdapter {
      * Sets/gets the specular IOR
      */
     specularIor: number;
+    /**
+     * Sets/gets the glossiness (inverted roughness)
+     * ONLY used for specular/glossiness workflow; has no effect when metallic/roughness workflow is active
+     */
+    glossiness: number;
     /**
      * Sets/gets the emissive color
      */
@@ -2321,6 +2386,9 @@ export interface IMaterialLoadingAdapter {
      * Configures transmission for thin-surface transmission (KHR_materials_transmission)
      */
     configureTransmission(): void;
+    /**
+     * Configures volume properties for volumetric transmission (KHR_materials_volume)
+     */
     configureVolume(): void;
     /**
      * Sets whether the material is thin-walled (i.e. non-volumetric) or not.
@@ -3080,7 +3148,8 @@ export class GLTFLoader implements IGLTFLoader {
     _skipStartAnimationStep: boolean;
     private readonly _parent;
     private readonly _extensions;
-    private _disposed;
+    /** @internal */
+    _disposed: boolean;
     private _rootUrl;
     private _fileName;
     private _uniqueRootUrl;
@@ -8543,6 +8612,7 @@ declare namespace BABYLON.GLTF2 {
      */
     export class PBRMaterialLoadingAdapter implements BABYLON.GLTF2.IMaterialLoadingAdapter {
         private _material;
+        private _specWorkflow;
         /**
          * Creates a new instance of the PBRMaterialLoadingAdapter.
          * @param material - The PBR material to adapt.
@@ -8552,6 +8622,11 @@ declare namespace BABYLON.GLTF2 {
          * Gets the underlying material
          */
         get material(): PBRMaterial;
+        /**
+         * No-op: PBRMaterial has no deferred finalization.
+         * @param _loader Unused.
+         */
+        finalizeAsync(_loader: BABYLON.GLTF2.GLTFLoader): Promise<void>;
         /**
          * Whether the material should be treated as unlit
          */
@@ -8684,6 +8759,10 @@ declare namespace BABYLON.GLTF2 {
          * @param enableEdgeColor Whether to enable OpenPBR BRDF models for edge color support
          */
         enableSpecularEdgeColor(enableEdgeColor?: boolean): void;
+        /**
+         * Enable the specular/glossiness workflow and disable metallic/roughness.
+         */
+        configureSpecularGlossiness(): void;
         /**
          * Sets the specular weight (mapped to PBR metallicF0Factor).
          * @param value The specular weight value
@@ -8757,6 +8836,16 @@ declare namespace BABYLON.GLTF2 {
          * @returns The IOR value
          */
         get specularIor(): number;
+        /**
+         * Sets/gets the glossiness (inverted roughness)
+         * ONLY used for specular/glossiness workflow; has no effect when metallic/roughness workflow is active
+         */
+        get glossiness(): number;
+        /**
+         * Sets/gets the glossiness (inverted roughness)
+         * ONLY used for specular/glossiness workflow; has no effect when metallic/roughness workflow is active
+         */
+        set glossiness(value: number);
         /**
          * Sets the emission color (mapped to PBR emissiveColor).
          * @param value The emission color as a Color3
@@ -8990,6 +9079,9 @@ declare namespace BABYLON.GLTF2 {
          * Sets up the material for proper thin-surface transmission behavior.
          */
         configureTransmission(): void;
+        /**
+         * Configures volume properties for PBR material. Nothing to do for PBRMaterial.
+         */
         configureVolume(): void;
         /**
          * Sets whether the material is thin-walled (i.e. non-volumetric) or not.
@@ -9255,6 +9347,7 @@ declare namespace BABYLON.GLTF2 {
      */
     export class OpenPBRMaterialLoadingAdapter implements BABYLON.GLTF2.IMaterialLoadingAdapter {
         private _material;
+        private _specWorkflow;
         /**
          * Creates a new instance of the OpenPBRMaterialLoadingAdapter.
          * @param material - The OpenPBR material to adapt.
@@ -9397,6 +9490,7 @@ declare namespace BABYLON.GLTF2 {
          * @param _enableEdgeColor Whether to enable edge color support (ignored for OpenPBR)
          */
         enableSpecularEdgeColor(_enableEdgeColor?: boolean): void;
+        configureSpecularGlossiness(): void;
         /**
          * Sets the specular weight of the OpenPBR material.
          * @param value The specular weight value (0-1)
@@ -9469,6 +9563,11 @@ declare namespace BABYLON.GLTF2 {
          * @returns The IOR value
          */
         get specularIor(): number;
+        /**
+         * Sets the glossiness (inverted roughness) of the OpenPBR material.
+         */
+        set glossiness(value: number);
+        get glossiness(): number;
         /**
          * Sets the emission color of the OpenPBR material.
          * @param value The emission color as a Color3
@@ -9549,6 +9648,10 @@ declare namespace BABYLON.GLTF2 {
          * @param value The coat color as a Color3
          */
         set coatColor(value: Color3);
+        /**
+         * Gets the coat color of the OpenPBR material.
+         */
+        get coatColor(): Color3;
         /**
          * Sets the coat color texture of the OpenPBR material.
          * @param value The coat color texture or null
@@ -9578,11 +9681,13 @@ declare namespace BABYLON.GLTF2 {
          * Sets the coat index of refraction (IOR) of the OpenPBR material.
          */
         set coatIor(value: number);
+        get coatIor(): number;
         /**
          * Sets the coat darkening value of the OpenPBR material.
          * @param value The coat darkening value
          */
         set coatDarkening(value: number);
+        get coatDarkening(): number;
         /**
          * Sets the coat darkening texture (OpenPBR: coatDarkeningTexture, no PBR equivalent)
          */
@@ -9631,6 +9736,7 @@ declare namespace BABYLON.GLTF2 {
          * @param value The transmission weight texture or null
          */
         set transmissionWeightTexture(value: Nullable<BaseTexture>);
+        get transmissionWeightTexture(): Nullable<BaseTexture>;
         /**
          * Gets the transmission weight.
          * @returns Currently returns 0 as transmission is not yet available
@@ -9699,6 +9805,9 @@ declare namespace BABYLON.GLTF2 {
          * @param value The refraction background texture or null
          */
         set refractionBackgroundTexture(value: Nullable<BaseTexture>);
+        /**
+         * Configures volume properties for OpenPBR material.
+         */
         configureVolume(): void;
         /**
          * Sets whether the material is thin-walled (i.e. non-volumetric) or not.
@@ -9731,6 +9840,7 @@ declare namespace BABYLON.GLTF2 {
          * Sets the subsurface weight texture
          */
         set subsurfaceWeightTexture(value: Nullable<BaseTexture>);
+        get subsurfaceWeightTexture(): Nullable<BaseTexture>;
         /**
          * Sets the subsurface color.
          * @param value The subsurface tint color as a Color3
@@ -9930,7 +10040,12 @@ declare namespace BABYLON.GLTF2 {
          * @param value The scale value for the coat normal texture
          */
         set geometryCoatNormalTextureScale(value: number);
-        finalize(): void;
+        /**
+         * Finalizes material properties after all loading is complete.
+         * @param loader The glTF loader; `loader._disposed` is polled between texture passes to bail early on dispose.
+         */
+        finalizeAsync(loader: BABYLON.GLTF2.GLTFLoader): Promise<void>;
+        private copySurfaceToCoatAsync;
     }
 
 
@@ -9951,9 +10066,16 @@ declare namespace BABYLON.GLTF2 {
          */
         readonly material: Material;
         /**
-         * Finalizes material properties after loading is complete.
+         * Finalizes material properties after all loading is complete.
+         * May do async work (e.g. GPU texture processing); the returned Promise is tracked
+         * by the loader and awaited before the COMPLETE state is reached, so callers can rely
+         * on onCompleteObservable for fully processed materials.
+         *
+         * Implementations should check `loader._disposed` between awaits to bail out early
+         * when the loader is disposed mid-flight.
+         * @param loader The glTF loader driving the finalize step.
          */
-        finalize?(): void;
+        finalizeAsync(loader: BABYLON.GLTF2.GLTFLoader): Promise<void>;
         /**
          * Whether the material should be treated as unlit
          */
@@ -10015,6 +10137,10 @@ declare namespace BABYLON.GLTF2 {
          * @param enableEdgeColor - Whether to enable edge color support
          */
         enableSpecularEdgeColor(enableEdgeColor?: boolean): void;
+        /**
+         * Enable the specular/glossiness workflow and disable metallic/roughness.
+         */
+        configureSpecularGlossiness(): void;
         /**
          * Sets/gets the specular weight
          */
@@ -10043,6 +10169,11 @@ declare namespace BABYLON.GLTF2 {
          * Sets/gets the specular IOR
          */
         specularIor: number;
+        /**
+         * Sets/gets the glossiness (inverted roughness)
+         * ONLY used for specular/glossiness workflow; has no effect when metallic/roughness workflow is active
+         */
+        glossiness: number;
         /**
          * Sets/gets the emissive color
          */
@@ -10159,6 +10290,9 @@ declare namespace BABYLON.GLTF2 {
          * Configures transmission for thin-surface transmission (KHR_materials_transmission)
          */
         configureTransmission(): void;
+        /**
+         * Configures volume properties for volumetric transmission (KHR_materials_volume)
+         */
         configureVolume(): void;
         /**
          * Sets whether the material is thin-walled (i.e. non-volumetric) or not.
@@ -10888,7 +11022,8 @@ declare namespace BABYLON.GLTF2 {
         _skipStartAnimationStep: boolean;
         private readonly _parent;
         private readonly _extensions;
-        private _disposed;
+        /** @internal */
+        _disposed: boolean;
         private _rootUrl;
         private _fileName;
         private _uniqueRootUrl;

package/package.json

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