babylonjs-loaders 9.7.0 → 9.8.0

package/babylonjs.loaders.module.d.ts

@@ -702,6 +702,7 @@ 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.
  */
@@ -717,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
      */
@@ -1432,6 +1438,7 @@ 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.
  */
@@ -2132,10 +2139,9 @@ export class OpenPBRMaterialLoadingAdapter implements IMaterialLoadingAdapter {
     set geometryCoatNormalTextureScale(value: number);
     /**
      * Finalizes material properties after all loading is complete.
-     * @param signal An AbortSignal that fires when the loader is disposed. Intermediate
-     *   textures are disposed and the method returns early when aborted.
+     * @param loader The glTF loader; `loader._disposed` is polled between texture passes to bail early on dispose.
      */
-    finalizeAsync(signal: AbortSignal): Promise<void>;
+    finalizeAsync(loader: GLTFLoader): Promise<void>;
     private copySurfaceToCoatAsync;
 }
 
@@ -2145,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.
@@ -2154,20 +2161,17 @@ export interface IMaterialLoadingAdapter {
      * Gets the underlying material
      */
     readonly material: Material;
-    /** @deprecated Use finalizeAsync instead. */
-    finalize?(): void;
     /**
      * Finalizes material properties after all loading is complete.
-     * May return a Promise for async work (e.g. GPU texture processing). Any 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.
+     * 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.
      *
-     * The loader passes an AbortSignal that is aborted when the loader is disposed.
-     * Implementations should check `signal.aborted` after each await point and, if
-     * aborted, release any intermediate resources and return early.
-     * @param signal An AbortSignal that fires when the loader is disposed mid-flight.
+     * 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.
      */
-    finalizeAsync?(signal: AbortSignal): Promise<void> | void;
+    finalizeAsync(loader: GLTFLoader): Promise<void>;
     /**
      * Whether the material should be treated as unlit
      */
@@ -3132,8 +3136,6 @@ type PBRMaterialImplementation = {
 export class GLTFLoader implements IGLTFLoader {
     /** @internal */
     readonly _completePromises: Promise<unknown>[];
-    /** AbortController used to cancel in-flight finalizeAsync() calls when dispose() is called. */
-    private _finalizeController;
     /** @internal */
     _assetContainer: Nullable<AssetContainer>;
     /** Storage */
@@ -3146,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;
@@ -8619,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
          */
@@ -10034,10 +10042,9 @@ declare namespace BABYLON.GLTF2 {
         set geometryCoatNormalTextureScale(value: number);
         /**
          * Finalizes material properties after all loading is complete.
-         * @param signal An AbortSignal that fires when the loader is disposed. Intermediate
-         *   textures are disposed and the method returns early when aborted.
+         * @param loader The glTF loader; `loader._disposed` is polled between texture passes to bail early on dispose.
          */
-        finalizeAsync(signal: AbortSignal): Promise<void>;
+        finalizeAsync(loader: BABYLON.GLTF2.GLTFLoader): Promise<void>;
         private copySurfaceToCoatAsync;
     }
 
@@ -10058,20 +10065,17 @@ declare namespace BABYLON.GLTF2 {
          * Gets the underlying material
          */
         readonly material: Material;
-        /** @deprecated Use finalizeAsync instead. */
-        finalize?(): void;
         /**
          * Finalizes material properties after all loading is complete.
-         * May return a Promise for async work (e.g. GPU texture processing). Any 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.
+         * 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.
          *
-         * The loader passes an AbortSignal that is aborted when the loader is disposed.
-         * Implementations should check `signal.aborted` after each await point and, if
-         * aborted, release any intermediate resources and return early.
-         * @param signal An AbortSignal that fires when the loader is disposed mid-flight.
+         * 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.
          */
-        finalizeAsync?(signal: AbortSignal): Promise<void> | void;
+        finalizeAsync(loader: BABYLON.GLTF2.GLTFLoader): Promise<void>;
         /**
          * Whether the material should be treated as unlit
          */
@@ -11006,8 +11010,6 @@ declare namespace BABYLON.GLTF2 {
     export class GLTFLoader implements IGLTFLoader {
         /** @internal */
         readonly _completePromises: Promise<unknown>[];
-        /** AbortController used to cancel in-flight finalizeAsync() calls when dispose() is called. */
-        private _finalizeController;
         /** @internal */
         _assetContainer: Nullable<AssetContainer>;
         /** Storage */
@@ -11020,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.7.0",
+    "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.7.0",
-        "babylonjs-gltf2interface": "9.7.0"
+        "babylonjs": "9.8.0",
+        "babylonjs-gltf2interface": "9.8.0"
     },
     "devDependencies": {
         "@dev/build-tools": "1.0.0",