@onerjs/loaders 8.51.5 → 8.51.6

package/glTF/2.0/glTFLoader.d.ts

@@ -72,8 +72,6 @@ type PBRMaterialImplementation = {
 export declare 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 */
@@ -86,7 +84,8 @@ export declare class GLTFLoader implements IGLTFLoader {
     _skipStartAnimationStep: boolean;
     private readonly _parent;
     private readonly _extensions;
-    private _disposed;
+    /** @internal */
+    _disposed: boolean;
     private _rootUrl;
     private _fileName;
     private _uniqueRootUrl;

package/glTF/2.0/glTFLoader.js

@@ -11,6 +11,7 @@ import { Material } from "@onerjs/core/Materials/material.js";
 import { Texture } from "@onerjs/core/Materials/Textures/texture.js";
 import { TransformNode } from "@onerjs/core/Meshes/transformNode.js";
 import { Buffer, VertexBuffer } from "@onerjs/core/Buffers/buffer.js";
+import { VertexBufferForEach, VertexBufferGetTypeByteLength } from "@onerjs/core/Buffers/buffer.pure.js";
 import { Geometry } from "@onerjs/core/Meshes/geometry.js";
 import { AbstractMesh } from "@onerjs/core/Meshes/abstractMesh.js";
 import { Mesh } from "@onerjs/core/Meshes/mesh.js";
@@ -182,8 +183,6 @@ export class GLTFLoader {
     constructor(parent) {
         /** @internal */
         this._completePromises = new Array();
-        /** AbortController used to cancel in-flight finalizeAsync() calls when dispose() is called. */
-        this._finalizeController = null;
         /** @internal */
         this._assetContainer = null;
         /** Storage */
@@ -195,6 +194,7 @@ export class GLTFLoader {
         /** @internal */
         this._skipStartAnimationStep = false;
         this._extensions = new Array();
+        /** @internal */
         this._disposed = false;
         this._rootUrl = null;
         this._fileName = null;
@@ -236,8 +236,6 @@ export class GLTFLoader {
             return;
         }
         this._disposed = true;
-        this._finalizeController?.abort();
-        this._finalizeController = null;
         this._completePromises.length = 0;
         this._extensions.forEach((extension) => extension.dispose && extension.dispose());
         this._extensions.length = 0;
@@ -380,25 +378,10 @@ export class GLTFLoader {
                     }
                 }
                 // Finalize all material adapters. finalizeAsync() may return a Promise for async
-                // work (e.g. GPU texture processing); push any such promises into
-                // _completePromises so they are awaited before the COMPLETE state is reached.
-                // Fall back to the deprecated finalize() for third-party adapters that have not
-                // yet migrated, logging a warning so authors know to update.
-                // An AbortController is created here and aborted in dispose() so that adapters
-                // can detect mid-flight disposal and clean up intermediate resources early.
-                this._finalizeController = new AbortController();
-                const finalizeSignal = this._finalizeController.signal;
+                // work (e.g. GPU texture processing); any returned Promise is pushed into
+                // _completePromises so it is awaited before the COMPLETE state is reached.
                 for (const adapter of Array.from(this._materialAdapters)) {
-                    if (adapter.finalizeAsync) {
-                        const finalizePromise = adapter.finalizeAsync(finalizeSignal);
-                        if (finalizePromise) {
-                            this._completePromises.push(finalizePromise);
-                        }
-                    }
-                    else if (adapter.finalize) {
-                        Logger.Warn("GLTFLoader: IMaterialLoadingAdapter.finalize() is deprecated. Implement finalizeAsync() instead.");
-                        adapter.finalize();
-                    }
+                    this._completePromises.push(adapter.finalizeAsync(this));
                 }
                 this._extensionsOnReady();
                 this._parent._setState(GLTFLoaderState.READY);
@@ -1652,7 +1635,7 @@ export class GLTFLoader {
             return accessor._data;
         }
         const numComponents = GLTFLoader._GetNumComponents(context, accessor.type);
-        const byteStride = numComponents * VertexBuffer.GetTypeByteLength(accessor.componentType);
+        const byteStride = numComponents * VertexBufferGetTypeByteLength(accessor.componentType);
         const length = numComponents * accessor.count;
         if (accessor.bufferView == undefined) {
             accessor._data = Promise.resolve(new constructor(length));
@@ -1665,7 +1648,7 @@ export class GLTFLoader {
                 }
                 else {
                     const typedArray = new constructor(length);
-                    VertexBuffer.ForEach(data, accessor.byteOffset || 0, bufferView.byteStride || byteStride, numComponents, accessor.componentType, typedArray.length, accessor.normalized || false, (value, index) => {
+                    VertexBufferForEach(data, accessor.byteOffset || 0, bufferView.byteStride || byteStride, numComponents, accessor.componentType, typedArray.length, accessor.normalized || false, (value, index) => {
                         typedArray[index] = value;
                     });
                     return typedArray;
@@ -1691,7 +1674,7 @@ export class GLTFLoader {
                     else {
                         const sparseData = GLTFLoader._GetTypedArray(`${context}/sparse/values`, accessor.componentType, valuesData, sparse.values.byteOffset, sparseLength);
                         values = new constructor(sparseLength);
-                        VertexBuffer.ForEach(sparseData, 0, byteStride, numComponents, accessor.componentType, values.length, accessor.normalized || false, (value, index) => {
+                        VertexBufferForEach(sparseData, 0, byteStride, numComponents, accessor.componentType, values.length, accessor.normalized || false, (value, index) => {
                             values[index] = value;
                         });
                     }
@@ -2249,7 +2232,7 @@ export class GLTFLoader {
         const buffer = bufferView.buffer;
         byteOffset = bufferView.byteOffset + (byteOffset || 0);
         const constructor = GLTFLoader._GetTypedArrayConstructor(`${context}/componentType`, componentType);
-        const componentTypeLength = VertexBuffer.GetTypeByteLength(componentType);
+        const componentTypeLength = VertexBufferGetTypeByteLength(componentType);
         if (byteOffset % componentTypeLength !== 0) {
             // HACK: Copy the buffer if byte offset is not a multiple of component type byte length.
             Logger.Warn(`${context}: Copying buffer as byte offset (${byteOffset}) is not a multiple of component type byte length (${componentTypeLength})`);