@babylonjs/loaders 5.0.0-alpha.9 → 5.0.0-beta.4

package/glTF/2.0/glTFLoaderInterfaces.d.ts

@@ -3,7 +3,7 @@ import { Bone } from "@babylonjs/core/Bones/bone";
 import { Skeleton } from "@babylonjs/core/Bones/skeleton";
 import { Material } from "@babylonjs/core/Materials/material";
 import { TransformNode } from "@babylonjs/core/Meshes/transformNode";
-import { Buffer, VertexBuffer } from "@babylonjs/core/Meshes/buffer";
+import { Buffer, VertexBuffer } from "@babylonjs/core/Buffers/buffer";
 import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh";
 import { Mesh } from "@babylonjs/core/Meshes/mesh";
 import * as GLTF2 from "babylonjs-gltf2interface";
@@ -23,7 +23,9 @@ export interface IAccessor extends GLTF2.IAccessor, IArrayItem {
     /** @hidden */
     _data?: Promise<ArrayBufferView>;
     /** @hidden */
-    _babylonVertexBuffer?: Promise<VertexBuffer>;
+    _babylonVertexBuffer?: {
+        [kind: string]: Promise<VertexBuffer>;
+    };
 }
 /**
  * Loader interface with additional members.

package/glTF/2.0/glTFLoaderInterfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"glTFLoaderInterfaces.js","sourceRoot":"","sources":["../../../../sourceES6/loaders/src/glTF/2.0/glTFLoaderInterfaces.ts"],"names":[],"mappings":"","sourcesContent":["import { AnimationGroup } from \"@babylonjs/core/Animations/animationGroup\";\r\nimport { Bone } from \"@babylonjs/core/Bones/bone\";\r\nimport { Skeleton } from \"@babylonjs/core/Bones/skeleton\";\r\nimport { Material } from \"@babylonjs/core/Materials/material\";\r\nimport { TransformNode } from \"@babylonjs/core/Meshes/transformNode\";\r\nimport { Buffer, VertexBuffer } from \"@babylonjs/core/Meshes/buffer\";\r\nimport { AbstractMesh } from \"@babylonjs/core/Meshes/abstractMesh\";\r\nimport { Mesh } from \"@babylonjs/core/Meshes/mesh\";\r\n\r\nimport * as GLTF2 from \"babylonjs-gltf2interface\";\r\n\r\n/**\r\n * Loader interface with an index field.\r\n */\r\nexport interface IArrayItem {\r\n    /**\r\n     * The index of this item in the array.\r\n     */\r\n    index: number;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IAccessor extends GLTF2.IAccessor, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<ArrayBufferView>;\r\n\r\n    /** @hidden */\r\n    _babylonVertexBuffer?: Promise<VertexBuffer>;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IAnimationChannel extends GLTF2.IAnimationChannel, IArrayItem {\r\n}\r\n\r\n/** @hidden */\r\nexport interface _IAnimationSamplerData {\r\n    input: Float32Array;\r\n    interpolation: GLTF2.AnimationSamplerInterpolation;\r\n    output: Float32Array;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IAnimationSampler extends GLTF2.IAnimationSampler, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<_IAnimationSamplerData>;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IAnimation extends GLTF2.IAnimation, IArrayItem {\r\n    channels: IAnimationChannel[];\r\n    samplers: IAnimationSampler[];\r\n\r\n    /** @hidden */\r\n    _babylonAnimationGroup?: AnimationGroup;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IBuffer extends GLTF2.IBuffer, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<ArrayBufferView>;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IBufferView extends GLTF2.IBufferView, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<ArrayBufferView>;\r\n\r\n    /** @hidden */\r\n    _babylonBuffer?: Promise<Buffer>;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ICamera extends GLTF2.ICamera, IArrayItem {\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IImage extends GLTF2.IImage, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<ArrayBufferView>;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMaterialNormalTextureInfo extends GLTF2.IMaterialNormalTextureInfo, ITextureInfo {\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMaterialOcclusionTextureInfo extends GLTF2.IMaterialOcclusionTextureInfo, ITextureInfo {\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMaterialPbrMetallicRoughness extends GLTF2.IMaterialPbrMetallicRoughness {\r\n    baseColorTexture?: ITextureInfo;\r\n    metallicRoughnessTexture?: ITextureInfo;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMaterial extends GLTF2.IMaterial, IArrayItem {\r\n    pbrMetallicRoughness?: IMaterialPbrMetallicRoughness;\r\n    normalTexture?: IMaterialNormalTextureInfo;\r\n    occlusionTexture?: IMaterialOcclusionTextureInfo;\r\n    emissiveTexture?: ITextureInfo;\r\n\r\n    /** @hidden */\r\n    _data?: {\r\n        [babylonDrawMode: number]: {\r\n            babylonMaterial: Material;\r\n            babylonMeshes: AbstractMesh[];\r\n            promise: Promise<void>;\r\n        }\r\n    };\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMesh extends GLTF2.IMesh, IArrayItem {\r\n    primitives: IMeshPrimitive[];\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMeshPrimitive extends GLTF2.IMeshPrimitive, IArrayItem {\r\n    /** @hidden */\r\n    _instanceData?: {\r\n        babylonSourceMesh: Mesh;\r\n        promise: Promise<any>;\r\n    };\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface INode extends GLTF2.INode, IArrayItem {\r\n    /**\r\n     * The parent glTF node.\r\n     */\r\n    parent?: INode;\r\n\r\n    /** @hidden */\r\n    _babylonTransformNode?: TransformNode;\r\n\r\n    /** @hidden */\r\n    _primitiveBabylonMeshes?: AbstractMesh[];\r\n\r\n    /** @hidden */\r\n    _babylonBones?: Bone[];\r\n\r\n    /** @hidden */\r\n    _numMorphTargets?: number;\r\n}\r\n\r\n/** @hidden */\r\nexport interface _ISamplerData {\r\n    noMipMaps: boolean;\r\n    samplingMode: number;\r\n    wrapU: number;\r\n    wrapV: number;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ISampler extends GLTF2.ISampler, IArrayItem {\r\n    /** @hidden */\r\n    _data?: _ISamplerData;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IScene extends GLTF2.IScene, IArrayItem {\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ISkin extends GLTF2.ISkin, IArrayItem {\r\n    /** @hidden */\r\n    _data?: {\r\n        babylonSkeleton: Skeleton;\r\n        promise: Promise<void>;\r\n    };\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ITexture extends GLTF2.ITexture, IArrayItem {\r\n    /** @hidden */\r\n    _textureInfo: ITextureInfo;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ITextureInfo extends GLTF2.ITextureInfo {\r\n    /** false or undefined if the texture holds color data (true if data are roughness, normal, ...) */\r\n    nonColorData?: boolean;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IGLTF extends GLTF2.IGLTF {\r\n    accessors?: IAccessor[];\r\n    animations?: IAnimation[];\r\n    buffers?: IBuffer[];\r\n    bufferViews?: IBufferView[];\r\n    cameras?: ICamera[];\r\n    images?: IImage[];\r\n    materials?: IMaterial[];\r\n    meshes?: IMesh[];\r\n    nodes?: INode[];\r\n    samplers?: ISampler[];\r\n    scenes?: IScene[];\r\n    skins?: ISkin[];\r\n    textures?: ITexture[];\r\n}\r\n"]}
+{"version":3,"file":"glTFLoaderInterfaces.js","sourceRoot":"","sources":["../../../../sourceES6/loaders/src/glTF/2.0/glTFLoaderInterfaces.ts"],"names":[],"mappings":"","sourcesContent":["import { AnimationGroup } from \"@babylonjs/core/Animations/animationGroup\";\r\nimport { Bone } from \"@babylonjs/core/Bones/bone\";\r\nimport { Skeleton } from \"@babylonjs/core/Bones/skeleton\";\r\nimport { Material } from \"@babylonjs/core/Materials/material\";\r\nimport { TransformNode } from \"@babylonjs/core/Meshes/transformNode\";\r\nimport { Buffer, VertexBuffer } from \"@babylonjs/core/Buffers/buffer\";\r\nimport { AbstractMesh } from \"@babylonjs/core/Meshes/abstractMesh\";\r\nimport { Mesh } from \"@babylonjs/core/Meshes/mesh\";\r\n\r\nimport * as GLTF2 from \"babylonjs-gltf2interface\";\r\n\r\n/**\r\n * Loader interface with an index field.\r\n */\r\nexport interface IArrayItem {\r\n    /**\r\n     * The index of this item in the array.\r\n     */\r\n    index: number;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IAccessor extends GLTF2.IAccessor, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<ArrayBufferView>;\r\n\r\n    /** @hidden */\r\n    _babylonVertexBuffer?: { [kind: string]: Promise<VertexBuffer>; };\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IAnimationChannel extends GLTF2.IAnimationChannel, IArrayItem {\r\n}\r\n\r\n/** @hidden */\r\nexport interface _IAnimationSamplerData {\r\n    input: Float32Array;\r\n    interpolation: GLTF2.AnimationSamplerInterpolation;\r\n    output: Float32Array;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IAnimationSampler extends GLTF2.IAnimationSampler, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<_IAnimationSamplerData>;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IAnimation extends GLTF2.IAnimation, IArrayItem {\r\n    channels: IAnimationChannel[];\r\n    samplers: IAnimationSampler[];\r\n\r\n    /** @hidden */\r\n    _babylonAnimationGroup?: AnimationGroup;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IBuffer extends GLTF2.IBuffer, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<ArrayBufferView>;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IBufferView extends GLTF2.IBufferView, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<ArrayBufferView>;\r\n\r\n    /** @hidden */\r\n    _babylonBuffer?: Promise<Buffer>;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ICamera extends GLTF2.ICamera, IArrayItem {\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IImage extends GLTF2.IImage, IArrayItem {\r\n    /** @hidden */\r\n    _data?: Promise<ArrayBufferView>;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMaterialNormalTextureInfo extends GLTF2.IMaterialNormalTextureInfo, ITextureInfo {\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMaterialOcclusionTextureInfo extends GLTF2.IMaterialOcclusionTextureInfo, ITextureInfo {\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMaterialPbrMetallicRoughness extends GLTF2.IMaterialPbrMetallicRoughness {\r\n    baseColorTexture?: ITextureInfo;\r\n    metallicRoughnessTexture?: ITextureInfo;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMaterial extends GLTF2.IMaterial, IArrayItem {\r\n    pbrMetallicRoughness?: IMaterialPbrMetallicRoughness;\r\n    normalTexture?: IMaterialNormalTextureInfo;\r\n    occlusionTexture?: IMaterialOcclusionTextureInfo;\r\n    emissiveTexture?: ITextureInfo;\r\n\r\n    /** @hidden */\r\n    _data?: {\r\n        [babylonDrawMode: number]: {\r\n            babylonMaterial: Material;\r\n            babylonMeshes: AbstractMesh[];\r\n            promise: Promise<void>;\r\n        }\r\n    };\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMesh extends GLTF2.IMesh, IArrayItem {\r\n    primitives: IMeshPrimitive[];\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IMeshPrimitive extends GLTF2.IMeshPrimitive, IArrayItem {\r\n    /** @hidden */\r\n    _instanceData?: {\r\n        babylonSourceMesh: Mesh;\r\n        promise: Promise<any>;\r\n    };\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface INode extends GLTF2.INode, IArrayItem {\r\n    /**\r\n     * The parent glTF node.\r\n     */\r\n    parent?: INode;\r\n\r\n    /** @hidden */\r\n    _babylonTransformNode?: TransformNode;\r\n\r\n    /** @hidden */\r\n    _primitiveBabylonMeshes?: AbstractMesh[];\r\n\r\n    /** @hidden */\r\n    _babylonBones?: Bone[];\r\n\r\n    /** @hidden */\r\n    _numMorphTargets?: number;\r\n}\r\n\r\n/** @hidden */\r\nexport interface _ISamplerData {\r\n    noMipMaps: boolean;\r\n    samplingMode: number;\r\n    wrapU: number;\r\n    wrapV: number;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ISampler extends GLTF2.ISampler, IArrayItem {\r\n    /** @hidden */\r\n    _data?: _ISamplerData;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IScene extends GLTF2.IScene, IArrayItem {\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ISkin extends GLTF2.ISkin, IArrayItem {\r\n    /** @hidden */\r\n    _data?: {\r\n        babylonSkeleton: Skeleton;\r\n        promise: Promise<void>;\r\n    };\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ITexture extends GLTF2.ITexture, IArrayItem {\r\n    /** @hidden */\r\n    _textureInfo: ITextureInfo;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface ITextureInfo extends GLTF2.ITextureInfo {\r\n    /** false or undefined if the texture holds color data (true if data are roughness, normal, ...) */\r\n    nonColorData?: boolean;\r\n}\r\n\r\n/**\r\n * Loader interface with additional members.\r\n */\r\nexport interface IGLTF extends GLTF2.IGLTF {\r\n    accessors?: IAccessor[];\r\n    animations?: IAnimation[];\r\n    buffers?: IBuffer[];\r\n    bufferViews?: IBufferView[];\r\n    cameras?: ICamera[];\r\n    images?: IImage[];\r\n    materials?: IMaterial[];\r\n    meshes?: IMesh[];\r\n    nodes?: INode[];\r\n    samplers?: ISampler[];\r\n    scenes?: IScene[];\r\n    skins?: ISkin[];\r\n    textures?: ITexture[];\r\n}\r\n"]}

package/glTF/2.0/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./glTFLoader";
 export * from "./glTFLoaderExtension";
 export * from "./glTFLoaderInterfaces";
-export * from "./Extensions";
+export * from "./Extensions/index";

package/glTF/2.0/index.js

@@ -1,5 +1,5 @@
-export * from "./glTFLoader";
-export * from "./glTFLoaderExtension";
-export * from "./glTFLoaderInterfaces";
-export * from "./Extensions";
+export * from "./glTFLoader.js";
+export * from "./glTFLoaderExtension.js";
+export * from "./glTFLoaderInterfaces.js";
+export * from "./Extensions/index.js";
 //# sourceMappingURL=index.js.map

package/glTF/2.0/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../sourceES6/loaders/src/glTF/2.0/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC","sourcesContent":["export * from \"./glTFLoader\";\r\nexport * from \"./glTFLoaderExtension\";\r\nexport * from \"./glTFLoaderInterfaces\";\r\nexport * from \"./Extensions\";"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../sourceES6/loaders/src/glTF/2.0/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC","sourcesContent":["export * from \"./glTFLoader\";\r\nexport * from \"./glTFLoaderExtension\";\r\nexport * from \"./glTFLoaderInterfaces\";\r\nexport * from \"./Extensions/index\";"]}

package/glTF/glTFFileLoader.d.ts

@@ -11,7 +11,7 @@ import { Scene, IDisposable } from "@babylonjs/core/scene";
 import { WebRequest } from "@babylonjs/core/Misc/webRequest";
 import { IFileRequest } from "@babylonjs/core/Misc/fileRequest";
 import { IDataBuffer } from '@babylonjs/core/Misc/dataReader';
-import { RequestFileError } from '@babylonjs/core/Misc/fileTools';
+import { LoadFileError } from '@babylonjs/core/Misc/fileTools';
 /**
  * Mode that determines the coordinate system to use.
  */
@@ -92,8 +92,7 @@ export declare enum GLTFLoaderState {
 }
 /** @hidden */
 export interface IGLTFLoader extends IDisposable {
-    readonly state: Nullable<GLTFLoaderState>;
-    importMeshAsync: (meshesNames: any, scene: Scene, forAssetContainer: boolean, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: ISceneLoaderProgressEvent) => void, fileName?: string) => Promise<ISceneLoaderAsyncResult>;
+    importMeshAsync: (meshesNames: any, scene: Scene, container: Nullable<AssetContainer>, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: ISceneLoaderProgressEvent) => void, fileName?: string) => Promise<ISceneLoaderAsyncResult>;
     loadAsync: (scene: Scene, data: IGLTFLoaderData, rootUrl: string, onProgress?: (event: ISceneLoaderProgressEvent) => void, fileName?: string) => Promise<void>;
 }
 /**
@@ -171,8 +170,12 @@ export declare class GLTFFileLoader implements IDisposable, ISceneLoaderPluginAs
      */
     loadAllMaterials: boolean;
     /**
-     * Function called before loading a url referenced by the asset.
+     * If true, load the color (gamma encoded) textures into sRGB buffers (if supported by the GPU), which will yield more accurate results when sampling the texture. Defaults to true.
      */
+    useSRGBBuffers: boolean;
+    /**
+    * Function called before loading a url referenced by the asset.
+    */
     preprocessUrlAsync: (url: string) => Promise<string>;
     /**
      * Observable raised when the loader creates a mesh after parsing the glTF properties of the mesh.
@@ -277,6 +280,7 @@ export declare class GLTFFileLoader implements IDisposable, ISceneLoaderPluginAs
      */
     set onValidated(callback: (results: GLTF2.IGLTFValidationResults) => void);
     private _loader;
+    private _state;
     private _progressCallback?;
     private _requests;
     private static magicBase64Encoded;
@@ -291,9 +295,7 @@ export declare class GLTFFileLoader implements IDisposable, ISceneLoaderPluginAs
      */
     dispose(): void;
     /** @hidden */
-    requestFile(scene: Scene, url: string, onSuccess: (data: any, request?: WebRequest) => void, onProgress?: (ev: ISceneLoaderProgressEvent) => void, useArrayBuffer?: boolean, onError?: (error: any) => void): IFileRequest;
-    /** @hidden */
-    readFile(scene: Scene, file: File, onSuccess: (data: any) => void, onProgress?: (ev: ISceneLoaderProgressEvent) => any, useArrayBuffer?: boolean, onError?: (error: any) => void): IFileRequest;
+    loadFile(scene: Scene, fileOrUrl: File | string, onSuccess: (data: any, responseURL?: string) => void, onProgress?: (ev: ISceneLoaderProgressEvent) => void, useArrayBuffer?: boolean, onError?: (request?: WebRequest, exception?: LoadFileError) => void): IFileRequest;
     /** @hidden */
     importMeshAsync(meshesNames: any, scene: Scene, data: any, rootUrl: string, onProgress?: (event: ISceneLoaderProgressEvent) => void, fileName?: string): Promise<ISceneLoaderAsyncResult>;
     /** @hidden */
@@ -317,15 +319,19 @@ export declare class GLTFFileLoader implements IDisposable, ISceneLoaderPluginAs
      * The loader state or null if the loader is not active.
      */
     get loaderState(): Nullable<GLTFLoaderState>;
+    /**
+     * Observable raised when the loader state changes.
+     */
+    onLoaderStateChangedObservable: Observable<Nullable<GLTFLoaderState>>;
     /**
      * Returns a promise that resolves when the asset is completely loaded.
      * @returns a promise that resolves when the asset is completely loaded.
      */
     whenCompleteAsync(): Promise<void>;
     /** @hidden */
-    _loadFile(url: string, scene: Scene, onSuccess: (data: string | ArrayBuffer) => void, useArrayBuffer?: boolean, onError?: (request?: WebRequest) => void): IFileRequest;
+    _setState(state: GLTFLoaderState): void;
     /** @hidden */
-    _requestFile(url: string, scene: Scene, onSuccess: (data: string | ArrayBuffer, request?: WebRequest) => void, useArrayBuffer?: boolean, onError?: (error: RequestFileError) => void, onOpened?: (request: WebRequest) => void): IFileRequest;
+    _loadFile(scene: Scene, fileOrUrl: File | string, onSuccess: (data: string | ArrayBuffer) => void, useArrayBuffer?: boolean, onError?: (request?: WebRequest) => void, onOpened?: (request: WebRequest) => void): IFileRequest;
     private _onProgress;
     private _validate;
     private _getLoader;

package/glTF/glTFFileLoader.js

@@ -1,11 +1,20 @@
-import { Observable } from "@babylonjs/core/Misc/observable";
-import { Tools } from "@babylonjs/core/Misc/tools";
-import { SceneLoader } from "@babylonjs/core/Loading/sceneLoader";
-import { AssetContainer } from "@babylonjs/core/assetContainer";
-import { Logger } from '@babylonjs/core/Misc/logger';
-import { DataReader } from '@babylonjs/core/Misc/dataReader';
-import { GLTFValidation } from './glTFValidation';
-import { StringTools } from '@babylonjs/core/Misc/stringTools';
+import { Observable } from "@babylonjs/core/Misc/observable.js";
+import { Tools } from "@babylonjs/core/Misc/tools.js";
+import { SceneLoader } from "@babylonjs/core/Loading/sceneLoader.js";
+import { AssetContainer } from "@babylonjs/core/assetContainer.js";
+import { Logger } from '@babylonjs/core/Misc/logger.js';
+import { DataReader } from '@babylonjs/core/Misc/dataReader.js';
+import { GLTFValidation } from './glTFValidation.js';
+import { DecodeBase64UrlToBinary } from '@babylonjs/core/Misc/fileTools.js';
+import { StringTools } from '@babylonjs/core/Misc/stringTools.js';
+function readAsync(arrayBuffer, byteOffset, byteLength) {
+    try {
+        return Promise.resolve(new Uint8Array(arrayBuffer, byteOffset, byteLength));
+    }
+    catch (e) {
+        return Promise.reject(e);
+    }
+}
 /**
  * Mode that determines the coordinate system to use.
  */
@@ -116,8 +125,12 @@ var GLTFFileLoader = /** @class */ (function () {
          */
         this.loadAllMaterials = false;
         /**
-         * Function called before loading a url referenced by the asset.
+         * If true, load the color (gamma encoded) textures into sRGB buffers (if supported by the GPU), which will yield more accurate results when sampling the texture. Defaults to true.
          */
+        this.useSRGBBuffers = true;
+        /**
+        * Function called before loading a url referenced by the asset.
+        */
         this.preprocessUrlAsync = function (url) { return Promise.resolve(url); };
         /**
          * Observable raised when the loader creates a mesh after parsing the glTF properties of the mesh.
@@ -164,6 +177,7 @@ var GLTFFileLoader = /** @class */ (function () {
          */
         this.onValidatedObservable = new Observable();
         this._loader = null;
+        this._state = null;
         this._requests = new Array();
         /**
          * Name of the loader ("gltf")
@@ -174,6 +188,10 @@ var GLTFFileLoader = /** @class */ (function () {
             ".gltf": { isBinary: false },
             ".glb": { isBinary: true }
         };
+        /**
+         * Observable raised when the loader state changes.
+         */
+        this.onLoaderStateChangedObservable = new Observable();
         this._logIndentLevel = 0;
         this._loggingEnabled = false;
         /** @hidden */
@@ -388,7 +406,7 @@ var GLTFFileLoader = /** @class */ (function () {
         this.onDisposeObservable.clear();
     };
     /** @hidden */
-    GLTFFileLoader.prototype.requestFile = function (scene, url, onSuccess, onProgress, useArrayBuffer, onError) {
+    GLTFFileLoader.prototype.loadFile = function (scene, fileOrUrl, onSuccess, onProgress, useArrayBuffer, onError) {
         var _this = this;
         this._progressCallback = onProgress;
         if (useArrayBuffer) {
@@ -403,7 +421,7 @@ var GLTFFileLoader = /** @class */ (function () {
                 var dataBuffer = {
                     readAsync: function (byteOffset, byteLength) {
                         return new Promise(function (resolve, reject) {
-                            _this._requestFile(url, scene, function (data) {
+                            _this._loadFile(scene, fileOrUrl, function (data) {
                                 resolve(new Uint8Array(data));
                             }, true, function (error) {
                                 reject(error);
@@ -417,40 +435,29 @@ var GLTFFileLoader = /** @class */ (function () {
                 this._unpackBinaryAsync(new DataReader(dataBuffer)).then(function (loaderData) {
                     fileRequest_1.onCompleteObservable.notifyObservers(fileRequest_1);
                     onSuccess(loaderData);
-                }, onError);
+                }, onError ? function (error) { return onError(undefined, error); } : undefined);
                 return fileRequest_1;
             }
-            return this._requestFile(url, scene, function (data, request) {
+            return this._loadFile(scene, fileOrUrl, function (data) {
                 var arrayBuffer = data;
                 _this._unpackBinaryAsync(new DataReader({
-                    readAsync: function (byteOffset, byteLength) { return Promise.resolve(new Uint8Array(arrayBuffer, byteOffset, byteLength)); },
+                    readAsync: function (byteOffset, byteLength) { return readAsync(arrayBuffer, byteOffset, byteLength); },
                     byteLength: arrayBuffer.byteLength
                 })).then(function (loaderData) {
-                    onSuccess(loaderData, request);
-                }, onError);
+                    onSuccess(loaderData);
+                }, onError ? function (error) { return onError(undefined, error); } : undefined);
             }, true, onError);
         }
-        return this._requestFile(url, scene, function (data, request) {
-            _this._validate(scene, data, Tools.GetFolderPath(url), Tools.GetFilename(url));
-            onSuccess({ json: _this._parseJson(data) }, request);
-        }, useArrayBuffer, onError);
-    };
-    /** @hidden */
-    GLTFFileLoader.prototype.readFile = function (scene, file, onSuccess, onProgress, useArrayBuffer, onError) {
-        var _this = this;
-        return scene._readFile(file, function (data) {
-            _this._validate(scene, data, "file:", file.name);
-            if (useArrayBuffer) {
-                var arrayBuffer_1 = data;
-                _this._unpackBinaryAsync(new DataReader({
-                    readAsync: function (byteOffset, byteLength) { return Promise.resolve(new Uint8Array(arrayBuffer_1, byteOffset, byteLength)); },
-                    byteLength: arrayBuffer_1.byteLength
-                })).then(onSuccess, onError);
+        return this._loadFile(scene, fileOrUrl, function (data) {
+            if (fileOrUrl.name) {
+                _this._validate(scene, data, "file:", fileOrUrl.name);
             }
             else {
-                onSuccess({ json: _this._parseJson(data) });
+                var url = fileOrUrl;
+                _this._validate(scene, data, Tools.GetFolderPath(url), Tools.GetFilename(url));
             }
-        }, onProgress, useArrayBuffer, onError);
+            onSuccess({ json: _this._parseJson(data) });
+        }, useArrayBuffer, onError);
     };
     /** @hidden */
     GLTFFileLoader.prototype.importMeshAsync = function (meshesNames, scene, data, rootUrl, onProgress, fileName) {
@@ -460,7 +467,7 @@ var GLTFFileLoader = /** @class */ (function () {
             _this.onParsedObservable.clear();
             _this._log("Loading " + (fileName || ""));
             _this._loader = _this._getLoader(data);
-            return _this._loader.importMeshAsync(meshesNames, scene, false, data, rootUrl, onProgress, fileName);
+            return _this._loader.importMeshAsync(meshesNames, scene, null, data, rootUrl, onProgress, fileName);
         });
     };
     /** @hidden */
@@ -488,36 +495,16 @@ var GLTFFileLoader = /** @class */ (function () {
             var materials = [];
             _this.onMaterialLoadedObservable.add(function (material) {
                 materials.push(material);
-                material.onDisposeObservable.addOnce(function () {
-                    var index = container.materials.indexOf(material);
-                    if (index > -1) {
-                        container.materials.splice(index, 1);
-                    }
-                    index = materials.indexOf(material);
-                    if (index > -1) {
-                        materials.splice(index, 1);
-                    }
-                });
             });
             var textures = [];
             _this.onTextureLoadedObservable.add(function (texture) {
                 textures.push(texture);
-                texture.onDisposeObservable.addOnce(function () {
-                    var index = container.textures.indexOf(texture);
-                    if (index > -1) {
-                        container.textures.splice(index, 1);
-                    }
-                    index = textures.indexOf(texture);
-                    if (index > -1) {
-                        textures.splice(index, 1);
-                    }
-                });
             });
             var cameras = [];
             _this.onCameraLoadedObservable.add(function (camera) {
                 cameras.push(camera);
             });
-            return _this._loader.importMeshAsync(null, scene, true, data, rootUrl, onProgress, fileName).then(function (result) {
+            return _this._loader.importMeshAsync(null, scene, container, data, rootUrl, onProgress, fileName).then(function (result) {
                 Array.prototype.push.apply(container.geometries, result.geometries);
                 Array.prototype.push.apply(container.meshes, result.meshes);
                 Array.prototype.push.apply(container.particleSystems, result.particleSystems);
@@ -535,20 +522,22 @@ var GLTFFileLoader = /** @class */ (function () {
     /** @hidden */
     GLTFFileLoader.prototype.canDirectLoad = function (data) {
         return (data.indexOf("asset") !== -1 && data.indexOf("version") !== -1)
-            || StringTools.StartsWith(data, "data:base64," + GLTFFileLoader.magicBase64Encoded)
+            || StringTools.StartsWith(data, "data:base64," + GLTFFileLoader.magicBase64Encoded) // this is technically incorrect, but will continue to support for backcompat.
+            || StringTools.StartsWith(data, "data:;base64," + GLTFFileLoader.magicBase64Encoded)
             || StringTools.StartsWith(data, "data:application/octet-stream;base64," + GLTFFileLoader.magicBase64Encoded)
             || StringTools.StartsWith(data, "data:model/gltf-binary;base64," + GLTFFileLoader.magicBase64Encoded);
     };
     /** @hidden */
     GLTFFileLoader.prototype.directLoad = function (scene, data) {
-        if (StringTools.StartsWith(data, "base64," + GLTFFileLoader.magicBase64Encoded) ||
+        if (StringTools.StartsWith(data, "base64," + GLTFFileLoader.magicBase64Encoded) || // this is technically incorrect, but will continue to support for backcompat.
+            StringTools.StartsWith(data, ";base64," + GLTFFileLoader.magicBase64Encoded) ||
             StringTools.StartsWith(data, "application/octet-stream;base64," + GLTFFileLoader.magicBase64Encoded) ||
             StringTools.StartsWith(data, "model/gltf-binary;base64," + GLTFFileLoader.magicBase64Encoded)) {
-            var arrayBuffer_2 = Tools.DecodeBase64(data);
-            this._validate(scene, arrayBuffer_2);
+            var arrayBuffer_1 = DecodeBase64UrlToBinary(data);
+            this._validate(scene, arrayBuffer_1);
             return this._unpackBinaryAsync(new DataReader({
-                readAsync: function (byteOffset, byteLength) { return Promise.resolve(new Uint8Array(arrayBuffer_2, byteOffset, byteLength)); },
-                byteLength: arrayBuffer_2.byteLength
+                readAsync: function (byteOffset, byteLength) { return readAsync(arrayBuffer_1, byteOffset, byteLength); },
+                byteLength: arrayBuffer_1.byteLength
             }));
         }
         this._validate(scene, data);
@@ -563,7 +552,7 @@ var GLTFFileLoader = /** @class */ (function () {
          * The loader state or null if the loader is not active.
          */
         get: function () {
-            return this._loader ? this._loader.state : null;
+            return this._state;
         },
         enumerable: false,
         configurable: true
@@ -584,23 +573,20 @@ var GLTFFileLoader = /** @class */ (function () {
         });
     };
     /** @hidden */
-    GLTFFileLoader.prototype._loadFile = function (url, scene, onSuccess, useArrayBuffer, onError) {
-        var _this = this;
-        var request = scene._loadFile(url, onSuccess, function (event) {
-            _this._onProgress(event, request);
-        }, undefined, useArrayBuffer, onError);
-        request.onCompleteObservable.add(function (request) {
-            _this._requests.splice(_this._requests.indexOf(request), 1);
-        });
-        this._requests.push(request);
-        return request;
+    GLTFFileLoader.prototype._setState = function (state) {
+        if (this._state === state) {
+            return;
+        }
+        this._state = state;
+        this.onLoaderStateChangedObservable.notifyObservers(this._state);
+        this._log(GLTFLoaderState[this._state]);
     };
     /** @hidden */
-    GLTFFileLoader.prototype._requestFile = function (url, scene, onSuccess, useArrayBuffer, onError, onOpened) {
+    GLTFFileLoader.prototype._loadFile = function (scene, fileOrUrl, onSuccess, useArrayBuffer, onError, onOpened) {
         var _this = this;
-        var request = scene._requestFile(url, onSuccess, function (event) {
+        var request = scene._loadFile(fileOrUrl, onSuccess, function (event) {
             _this._onProgress(event, request);
-        }, undefined, useArrayBuffer, onError, onOpened);
+        }, true, useArrayBuffer, onError, onOpened);
         request.onCompleteObservable.add(function (request) {
             _this._requests.splice(_this._requests.indexOf(request), 1);
         });