@babylonjs/loaders 8.1.1 → 8.2.1

package/glTF/2.0/Extensions/KHR_materials_unlit.d.ts

@@ -1,9 +1,9 @@
 import type { Nullable } from "@babylonjs/core/types.js";
 import type { Material } from "@babylonjs/core/Materials/material.js";
-import type { IMaterial } from "../glTFLoaderInterfaces";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import { GLTFLoader } from "../glTFLoader";
-declare module "../../glTFFileLoader" {
+import type { IMaterial } from "../glTFLoaderInterfaces.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import { GLTFLoader } from "../glTFLoader.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the KHR_materials_unlit extension.

package/glTF/2.0/Extensions/KHR_materials_variants.d.ts

@@ -1,12 +1,12 @@
 import type { Nullable } from "@babylonjs/core/types.js";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import { GLTFLoader } from "../glTFLoader";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import { GLTFLoader } from "../glTFLoader.js";
 import type { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh.js";
-import type { INode, IMeshPrimitive, IMesh } from "../glTFLoaderInterfaces";
+import type { INode, IMeshPrimitive, IMesh } from "../glTFLoaderInterfaces.js";
 import type { TransformNode } from "@babylonjs/core/Meshes/transformNode.js";
-import type { MaterialVariantsController } from "../../glTFFileLoader";
+import type { MaterialVariantsController } from "../../glTFFileLoader.js";
 export { MaterialVariantsController };
-declare module "../../glTFFileLoader" {
+declare module "../../glTFFileLoader.js" {
     type MaterialVariantsController = {
         /**
          * The list of available variant names for this asset.

package/glTF/2.0/Extensions/KHR_materials_volume.d.ts

@@ -1,9 +1,9 @@
 import type { Nullable } from "@babylonjs/core/types.js";
 import type { Material } from "@babylonjs/core/Materials/material.js";
-import type { IMaterial } from "../glTFLoaderInterfaces";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import { GLTFLoader } from "../glTFLoader";
-declare module "../../glTFFileLoader" {
+import type { IMaterial } from "../glTFLoaderInterfaces.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import { GLTFLoader } from "../glTFLoader.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the KHR_materials_volume extension.

package/glTF/2.0/Extensions/KHR_mesh_quantization.d.ts

@@ -1,6 +1,6 @@
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import type { GLTFLoader } from "../glTFLoader";
-declare module "../../glTFFileLoader" {
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import type { GLTFLoader } from "../glTFLoader.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the KHR_mesh_quantization extension.

package/glTF/2.0/Extensions/KHR_node_hoverability.d.ts

@@ -1,6 +1,6 @@
-import type { GLTFLoader } from "../glTFLoader";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-declare module "../../glTFFileLoader" {
+import type { GLTFLoader } from "../glTFLoader.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the KHR_node_hoverability extension.

package/glTF/2.0/Extensions/KHR_node_selectability.d.ts

@@ -1,6 +1,6 @@
-import type { GLTFLoader } from "../glTFLoader";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-declare module "../../glTFFileLoader" {
+import type { GLTFLoader } from "../glTFLoader.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the KHR_selectability extension.

package/glTF/2.0/Extensions/KHR_node_visibility.d.ts

@@ -1,6 +1,6 @@
-import type { GLTFLoader } from "../glTFLoader";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-declare module "../../glTFFileLoader" {
+import type { GLTFLoader } from "../glTFLoader.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the KHR_node_visibility extension.

package/glTF/2.0/Extensions/KHR_texture_basisu.d.ts

@@ -1,9 +1,9 @@
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import { GLTFLoader } from "../glTFLoader";
-import type { ITexture } from "../glTFLoaderInterfaces";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import { GLTFLoader } from "../glTFLoader.js";
+import type { ITexture } from "../glTFLoaderInterfaces.js";
 import type { BaseTexture } from "@babylonjs/core/Materials/Textures/baseTexture.js";
 import type { Nullable } from "@babylonjs/core/types.js";
-declare module "../../glTFFileLoader" {
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the KHR_texture_basisu extension.

package/glTF/2.0/Extensions/KHR_texture_transform.d.ts

@@ -1,9 +1,9 @@
 import type { Nullable } from "@babylonjs/core/types.js";
 import type { BaseTexture } from "@babylonjs/core/Materials/Textures/baseTexture.js";
-import type { ITextureInfo } from "../glTFLoaderInterfaces";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import { GLTFLoader } from "../glTFLoader";
-declare module "../../glTFFileLoader" {
+import type { ITextureInfo } from "../glTFLoaderInterfaces.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import { GLTFLoader } from "../glTFLoader.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the KHR_texture_transform extension.

package/glTF/2.0/Extensions/KHR_xmp_json_ld.d.ts

@@ -1,6 +1,6 @@
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import type { GLTFLoader } from "../glTFLoader";
-declare module "../../glTFFileLoader" {
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import type { GLTFLoader } from "../glTFLoader.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the KHR_xmp_json_ld extension.

package/glTF/2.0/Extensions/MSFT_audio_emitter.d.ts

@@ -1,11 +1,11 @@
 import type { Nullable } from "@babylonjs/core/types.js";
 import type { AnimationGroup } from "@babylonjs/core/Animations/animationGroup.js";
 import type { TransformNode } from "@babylonjs/core/Meshes/transformNode.js";
-import type { IScene, INode, IAnimation } from "../glTFLoaderInterfaces";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import { GLTFLoader } from "../glTFLoader";
+import type { IScene, INode, IAnimation } from "../glTFLoaderInterfaces.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import { GLTFLoader } from "../glTFLoader.js";
 import "@babylonjs/core/Audio/audioSceneComponent.js";
-declare module "../../glTFFileLoader" {
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the MSFT_audio_emitter extension.

package/glTF/2.0/Extensions/MSFT_lod.d.ts

@@ -3,11 +3,11 @@ import { Observable } from "@babylonjs/core/Misc/observable.js";
 import type { Material } from "@babylonjs/core/Materials/material.js";
 import type { TransformNode } from "@babylonjs/core/Meshes/transformNode.js";
 import type { Mesh } from "@babylonjs/core/Meshes/mesh.js";
-import type { INode, IMaterial, IBuffer, IScene } from "../glTFLoaderInterfaces";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import { GLTFLoader } from "../glTFLoader";
+import type { INode, IMaterial, IBuffer, IScene } from "../glTFLoaderInterfaces.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import { GLTFLoader } from "../glTFLoader.js";
 import type { IProperty } from "babylonjs-gltf2interface";
-declare module "../../glTFFileLoader" {
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the MSFT_lod extension.

package/glTF/2.0/Extensions/MSFT_minecraftMesh.d.ts

@@ -1,9 +1,9 @@
 import type { Nullable } from "@babylonjs/core/types.js";
 import type { Material } from "@babylonjs/core/Materials/material.js";
-import type { IMaterial } from "../glTFLoaderInterfaces";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import { GLTFLoader } from "../glTFLoader";
-declare module "../../glTFFileLoader" {
+import type { IMaterial } from "../glTFLoaderInterfaces.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import { GLTFLoader } from "../glTFLoader.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the MSFT_minecraftMesh extension.

package/glTF/2.0/Extensions/MSFT_sRGBFactors.d.ts

@@ -1,9 +1,9 @@
 import type { Nullable } from "@babylonjs/core/types.js";
 import type { Material } from "@babylonjs/core/Materials/material.js";
-import type { IMaterial } from "../glTFLoaderInterfaces";
-import type { IGLTFLoaderExtension } from "../glTFLoaderExtension";
-import { GLTFLoader } from "../glTFLoader";
-declare module "../../glTFFileLoader" {
+import type { IMaterial } from "../glTFLoaderInterfaces.js";
+import type { IGLTFLoaderExtension } from "../glTFLoaderExtension.js";
+import { GLTFLoader } from "../glTFLoader.js";
+declare module "../../glTFFileLoader.js" {
     interface GLTFLoaderExtensionOptions {
         /**
          * Defines options for the MSFT_sRGBFactors extension.

package/glTF/2.0/Extensions/gltfPathToObjectConverter.d.ts

@@ -1,6 +1,14 @@
 import type { IObjectInfo, IPathToObjectConverter } from "@babylonjs/core/ObjectModel/objectModelInterfaces.js";
-import type { IGLTF } from "../glTFLoaderInterfaces";
+import type { IGLTF } from "../glTFLoaderInterfaces.js";
 import type { IObjectAccessor } from "@babylonjs/core/FlowGraph/typeDefinitions.js";
+/**
+ * Adding an exception here will break traversing through the glTF object tree.
+ * This is used for properties that might not be in the glTF object model, but are optional and have a default value.
+ * For example, the path /nodes/\{\}/extensions/KHR_node_visibility/visible is optional - the object can be deferred without the object fully existing.
+ */
+export declare const OptionalPathExceptionsList: {
+    regex: RegExp;
+}[];
 /**
  * A converter that takes a glTF Object Model JSON Pointer
  * and transforms it into an ObjectAccessorContainer, allowing

package/glTF/2.0/Extensions/gltfPathToObjectConverter.js

@@ -1,3 +1,14 @@
+/**
+ * Adding an exception here will break traversing through the glTF object tree.
+ * This is used for properties that might not be in the glTF object model, but are optional and have a default value.
+ * For example, the path /nodes/\{\}/extensions/KHR_node_visibility/visible is optional - the object can be deferred without the object fully existing.
+ */
+export const OptionalPathExceptionsList = [
+    {
+        // get the node as object when reading an extension
+        regex: new RegExp(`^/nodes/\\d+/extensions/`),
+    },
+];
 /**
  * A converter that takes a glTF Object Model JSON Pointer
  * and transforms it into an ObjectAccessorContainer, allowing
@@ -67,9 +78,13 @@ export class GLTFPathToObjectConverter {
             }
             if (!ignoreObjectTree) {
                 if (objectTree === undefined) {
-                    throw new Error(`Path ${path} is invalid`);
+                    // check if the path is in the exception list. If it is, break and return the last object that was found
+                    const exception = OptionalPathExceptionsList.find((e) => e.regex.test(path));
+                    if (!exception) {
+                        throw new Error(`Path ${path} is invalid`);
+                    }
                 }
-                if (!isLength) {
+                else if (!isLength) {
                     objectTree = objectTree?.[part];
                 }
             }

package/glTF/2.0/Extensions/gltfPathToObjectConverter.js.map

@@ -1 +1 @@
-{"version":3,"file":"gltfPathToObjectConverter.js","sourceRoot":"","sources":["../../../../../../dev/loaders/src/glTF/2.0/Extensions/gltfPathToObjectConverter.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,OAAO,yBAAyB;IAClC,YACY,KAAY,EACZ,SAAc;QADd,UAAK,GAAL,KAAK,CAAO;QACZ,cAAS,GAAT,SAAS,CAAK;IACvB,CAAC;IAEJ;;;;;;;;;;;;;;;;;;;;;OAqBG;IACI,OAAO,CAAC,IAAY;QACvB,IAAI,UAAU,GAAQ,IAAI,CAAC,KAAK,CAAC;QACjC,IAAI,QAAQ,GAAQ,IAAI,CAAC,SAAS,CAAC;QACnC,IAAI,MAAM,GAAQ,SAAS,CAAC;QAE5B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,sEAAsE;QACtE,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACzC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClC,KAAK,CAAC,GAAG,EAAE,CAAC;YACZ,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAE7B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,KAAK,QAAQ,CAAC;YACnC,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,aAAa,CAAC,CAAC;YAC/C,CAAC;YACD,IAAI,QAAQ,CAAC,oBAAoB,EAAE,CAAC;gBAChC,gBAAgB,GAAG,IAAI,CAAC;YAC5B,CAAC;YACD,IAAI,QAAQ,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClC,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACJ,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC1B,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,aAAa,CAAC,CAAC;gBAC/C,CAAC;YACL,CAAC;YACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACpB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,aAAa,CAAC,CAAC;gBAC/C,CAAC;gBACD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,UAAU,GAAG,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC;gBACpC,CAAC;YACL,CAAC;YAED,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,EAAE,CAAC;gBAClC,MAAM,GAAG,UAAU,CAAC;YACxB,CAAC;QACL,CAAC;QAED,OAAO;YACH,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,QAAQ;SACjB,CAAC;IACN,CAAC;CACJ","sourcesContent":["import type { IObjectInfo, IPathToObjectConverter } from \"core/ObjectModel/objectModelInterfaces\";\r\nimport type { IGLTF } from \"../glTFLoaderInterfaces\";\r\nimport type { IObjectAccessor } from \"core/FlowGraph/typeDefinitions\";\r\n\r\n/**\r\n * A converter that takes a glTF Object Model JSON Pointer\r\n * and transforms it into an ObjectAccessorContainer, allowing\r\n * objects referenced in the glTF to be associated with their\r\n * respective Babylon.js objects.\r\n */\r\nexport class GLTFPathToObjectConverter<T, BabylonType, BabylonValue> implements IPathToObjectConverter<IObjectAccessor<T, BabylonType, BabylonValue>> {\r\n    public constructor(\r\n        private _gltf: IGLTF,\r\n        private _infoTree: any\r\n    ) {}\r\n\r\n    /**\r\n     * The pointer string is represented by a [JSON pointer](https://datatracker.ietf.org/doc/html/rfc6901).\r\n     * See also https://github.com/KhronosGroup/glTF/blob/main/specification/2.0/ObjectModel.adoc#core-pointers\r\n     * <animationPointer> := /<rootNode>/<assetIndex>/<propertyPath>\r\n     * <rootNode> := \"nodes\" | \"materials\" | \"meshes\" | \"cameras\" | \"extensions\"\r\n     * <assetIndex> := <digit> | <name>\r\n     * <propertyPath> := <extensionPath> | <standardPath>\r\n     * <extensionPath> := \"extensions\"/<name>/<standardPath>\r\n     * <standardPath> := <name> | <name>/<standardPath>\r\n     * <name> := W+\r\n     * <digit> := D+\r\n     *\r\n     * Examples:\r\n     *  - \"/nodes/0/rotation\"\r\n     * - \"/nodes.length\"\r\n     *  - \"/materials/2/emissiveFactor\"\r\n     *  - \"/materials/2/pbrMetallicRoughness/baseColorFactor\"\r\n     *  - \"/materials/2/extensions/KHR_materials_emissive_strength/emissiveStrength\"\r\n     *\r\n     * @param path The path to convert\r\n     * @returns The object and info associated with the path\r\n     */\r\n    public convert(path: string): IObjectInfo<IObjectAccessor<T, BabylonType, BabylonValue>> {\r\n        let objectTree: any = this._gltf;\r\n        let infoTree: any = this._infoTree;\r\n        let target: any = undefined;\r\n\r\n        if (!path.startsWith(\"/\")) {\r\n            throw new Error(\"Path must start with a /\");\r\n        }\r\n        const parts = path.split(\"/\");\r\n        parts.shift();\r\n\r\n        //if the last part has \".length\" in it, separate that as an extra part\r\n        if (parts[parts.length - 1].includes(\".length\")) {\r\n            const lastPart = parts[parts.length - 1];\r\n            const split = lastPart.split(\".\");\r\n            parts.pop();\r\n            parts.push(...split);\r\n        }\r\n\r\n        let ignoreObjectTree = false;\r\n\r\n        for (const part of parts) {\r\n            const isLength = part === \"length\";\r\n            if (isLength && !infoTree.__array__) {\r\n                throw new Error(`Path ${path} is invalid`);\r\n            }\r\n            if (infoTree.__ignoreObjectTree__) {\r\n                ignoreObjectTree = true;\r\n            }\r\n            if (infoTree.__array__ && !isLength) {\r\n                infoTree = infoTree.__array__;\r\n            } else {\r\n                infoTree = infoTree[part];\r\n                if (!infoTree) {\r\n                    throw new Error(`Path ${path} is invalid`);\r\n                }\r\n            }\r\n            if (!ignoreObjectTree) {\r\n                if (objectTree === undefined) {\r\n                    throw new Error(`Path ${path} is invalid`);\r\n                }\r\n                if (!isLength) {\r\n                    objectTree = objectTree?.[part];\r\n                }\r\n            }\r\n\r\n            if (infoTree.__target__ || isLength) {\r\n                target = objectTree;\r\n            }\r\n        }\r\n\r\n        return {\r\n            object: target,\r\n            info: infoTree,\r\n        };\r\n    }\r\n}\r\n"]}
+{"version":3,"file":"gltfPathToObjectConverter.js","sourceRoot":"","sources":["../../../../../../dev/loaders/src/glTF/2.0/Extensions/gltfPathToObjectConverter.ts"],"names":[],"mappings":"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","sourcesContent":["import type { IObjectInfo, IPathToObjectConverter } from \"core/ObjectModel/objectModelInterfaces\";\r\nimport type { IGLTF } from \"../glTFLoaderInterfaces\";\r\nimport type { IObjectAccessor } from \"core/FlowGraph/typeDefinitions\";\r\n\r\n/**\r\n * Adding an exception here will break traversing through the glTF object tree.\r\n * This is used for properties that might not be in the glTF object model, but are optional and have a default value.\r\n * For example, the path /nodes/\\{\\}/extensions/KHR_node_visibility/visible is optional - the object can be deferred without the object fully existing.\r\n */\r\nexport const OptionalPathExceptionsList: {\r\n    regex: RegExp;\r\n}[] = [\r\n    {\r\n        // get the node as object when reading an extension\r\n        regex: new RegExp(`^/nodes/\\\\d+/extensions/`),\r\n    },\r\n];\r\n\r\n/**\r\n * A converter that takes a glTF Object Model JSON Pointer\r\n * and transforms it into an ObjectAccessorContainer, allowing\r\n * objects referenced in the glTF to be associated with their\r\n * respective Babylon.js objects.\r\n */\r\nexport class GLTFPathToObjectConverter<T, BabylonType, BabylonValue> implements IPathToObjectConverter<IObjectAccessor<T, BabylonType, BabylonValue>> {\r\n    public constructor(\r\n        private _gltf: IGLTF,\r\n        private _infoTree: any\r\n    ) {}\r\n\r\n    /**\r\n     * The pointer string is represented by a [JSON pointer](https://datatracker.ietf.org/doc/html/rfc6901).\r\n     * See also https://github.com/KhronosGroup/glTF/blob/main/specification/2.0/ObjectModel.adoc#core-pointers\r\n     * <animationPointer> := /<rootNode>/<assetIndex>/<propertyPath>\r\n     * <rootNode> := \"nodes\" | \"materials\" | \"meshes\" | \"cameras\" | \"extensions\"\r\n     * <assetIndex> := <digit> | <name>\r\n     * <propertyPath> := <extensionPath> | <standardPath>\r\n     * <extensionPath> := \"extensions\"/<name>/<standardPath>\r\n     * <standardPath> := <name> | <name>/<standardPath>\r\n     * <name> := W+\r\n     * <digit> := D+\r\n     *\r\n     * Examples:\r\n     *  - \"/nodes/0/rotation\"\r\n     * - \"/nodes.length\"\r\n     *  - \"/materials/2/emissiveFactor\"\r\n     *  - \"/materials/2/pbrMetallicRoughness/baseColorFactor\"\r\n     *  - \"/materials/2/extensions/KHR_materials_emissive_strength/emissiveStrength\"\r\n     *\r\n     * @param path The path to convert\r\n     * @returns The object and info associated with the path\r\n     */\r\n    public convert(path: string): IObjectInfo<IObjectAccessor<T, BabylonType, BabylonValue>> {\r\n        let objectTree: any = this._gltf;\r\n        let infoTree: any = this._infoTree;\r\n        let target: any = undefined;\r\n\r\n        if (!path.startsWith(\"/\")) {\r\n            throw new Error(\"Path must start with a /\");\r\n        }\r\n        const parts = path.split(\"/\");\r\n        parts.shift();\r\n\r\n        //if the last part has \".length\" in it, separate that as an extra part\r\n        if (parts[parts.length - 1].includes(\".length\")) {\r\n            const lastPart = parts[parts.length - 1];\r\n            const split = lastPart.split(\".\");\r\n            parts.pop();\r\n            parts.push(...split);\r\n        }\r\n\r\n        let ignoreObjectTree = false;\r\n\r\n        for (const part of parts) {\r\n            const isLength = part === \"length\";\r\n            if (isLength && !infoTree.__array__) {\r\n                throw new Error(`Path ${path} is invalid`);\r\n            }\r\n            if (infoTree.__ignoreObjectTree__) {\r\n                ignoreObjectTree = true;\r\n            }\r\n            if (infoTree.__array__ && !isLength) {\r\n                infoTree = infoTree.__array__;\r\n            } else {\r\n                infoTree = infoTree[part];\r\n                if (!infoTree) {\r\n                    throw new Error(`Path ${path} is invalid`);\r\n                }\r\n            }\r\n            if (!ignoreObjectTree) {\r\n                if (objectTree === undefined) {\r\n                    // check if the path is in the exception list. If it is, break and return the last object that was found\r\n                    const exception = OptionalPathExceptionsList.find((e) => e.regex.test(path));\r\n                    if (!exception) {\r\n                        throw new Error(`Path ${path} is invalid`);\r\n                    }\r\n                } else if (!isLength) {\r\n                    objectTree = objectTree?.[part];\r\n                }\r\n            }\r\n\r\n            if (infoTree.__target__ || isLength) {\r\n                target = objectTree;\r\n            }\r\n        }\r\n\r\n        return {\r\n            object: target,\r\n            info: infoTree,\r\n        };\r\n    }\r\n}\r\n"]}

package/glTF/2.0/Extensions/index.d.ts

@@ -1,38 +1,38 @@
-export * from "./objectModelMapping";
-export * from "./EXT_lights_image_based";
-export * from "./EXT_mesh_gpu_instancing";
-export * from "./EXT_meshopt_compression";
-export * from "./EXT_texture_webp";
-export * from "./EXT_texture_avif";
-export * from "./EXT_lights_ies";
-export * from "./KHR_draco_mesh_compression";
-export * from "./KHR_lights_punctual";
-export * from "./KHR_materials_pbrSpecularGlossiness";
-export * from "./KHR_materials_unlit";
-export * from "./KHR_materials_clearcoat";
-export * from "./KHR_materials_iridescence";
-export * from "./KHR_materials_anisotropy";
-export * from "./KHR_materials_emissive_strength";
-export * from "./KHR_materials_sheen";
-export * from "./KHR_materials_specular";
-export * from "./KHR_materials_ior";
-export * from "./KHR_materials_variants";
-export * from "./KHR_materials_transmission";
-export * from "./KHR_materials_diffuse_transmission";
-export * from "./KHR_materials_volume";
-export * from "./KHR_materials_dispersion";
-export * from "./KHR_mesh_quantization";
-export * from "./KHR_texture_basisu";
-export * from "./KHR_texture_transform";
-export * from "./KHR_xmp_json_ld";
-export * from "./KHR_animation_pointer";
-export * from "./MSFT_audio_emitter";
-export * from "./MSFT_lod";
-export * from "./MSFT_minecraftMesh";
-export * from "./MSFT_sRGBFactors";
-export * from "./KHR_interactivity";
-export * from "./KHR_node_visibility";
-export * from "./KHR_node_selectability";
-export * from "./KHR_node_hoverability";
-export * from "./ExtrasAsMetadata";
-export * from "./KHR_interactivity/index";
+export * from "./objectModelMapping.js";
+export * from "./EXT_lights_image_based.js";
+export * from "./EXT_mesh_gpu_instancing.js";
+export * from "./EXT_meshopt_compression.js";
+export * from "./EXT_texture_webp.js";
+export * from "./EXT_texture_avif.js";
+export * from "./EXT_lights_ies.js";
+export * from "./KHR_draco_mesh_compression.js";
+export * from "./KHR_lights_punctual.js";
+export * from "./KHR_materials_pbrSpecularGlossiness.js";
+export * from "./KHR_materials_unlit.js";
+export * from "./KHR_materials_clearcoat.js";
+export * from "./KHR_materials_iridescence.js";
+export * from "./KHR_materials_anisotropy.js";
+export * from "./KHR_materials_emissive_strength.js";
+export * from "./KHR_materials_sheen.js";
+export * from "./KHR_materials_specular.js";
+export * from "./KHR_materials_ior.js";
+export * from "./KHR_materials_variants.js";
+export * from "./KHR_materials_transmission.js";
+export * from "./KHR_materials_diffuse_transmission.js";
+export * from "./KHR_materials_volume.js";
+export * from "./KHR_materials_dispersion.js";
+export * from "./KHR_mesh_quantization.js";
+export * from "./KHR_texture_basisu.js";
+export * from "./KHR_texture_transform.js";
+export * from "./KHR_xmp_json_ld.js";
+export * from "./KHR_animation_pointer.js";
+export * from "./MSFT_audio_emitter.js";
+export * from "./MSFT_lod.js";
+export * from "./MSFT_minecraftMesh.js";
+export * from "./MSFT_sRGBFactors.js";
+export * from "./KHR_interactivity.js";
+export * from "./KHR_node_visibility.js";
+export * from "./KHR_node_selectability.js";
+export * from "./KHR_node_hoverability.js";
+export * from "./ExtrasAsMetadata.js";
+export * from "./KHR_interactivity/index.js";

package/glTF/2.0/Extensions/objectModelMapping.d.ts

@@ -1,5 +1,5 @@
 import type { TransformNode } from "@babylonjs/core/Meshes/transformNode.js";
-import type { IAnimation, ICamera, IGLTF, IKHRLightsPunctual_Light, IMaterial, IMesh, INode } from "../glTFLoaderInterfaces";
+import type { IAnimation, ICamera, IGLTF, IKHRLightsPunctual_Light, IMaterial, IMesh, INode } from "../glTFLoaderInterfaces.js";
 import type { Vector3 } from "@babylonjs/core/Maths/math.vector.js";
 import { Matrix, Quaternion, Vector2 } from "@babylonjs/core/Maths/math.vector.js";
 import type { Color3 } from "@babylonjs/core/Maths/math.color.js";
@@ -10,7 +10,7 @@ import type { Nullable } from "@babylonjs/core/types.js";
 import type { IEXTLightsImageBased_LightImageBased } from "babylonjs-gltf2interface";
 import type { BaseTexture } from "@babylonjs/core/Materials/Textures/baseTexture.js";
 import type { IInterpolationPropertyInfo, IObjectAccessor } from "@babylonjs/core/FlowGraph/typeDefinitions.js";
-import { GLTFPathToObjectConverter } from "./gltfPathToObjectConverter";
+import { GLTFPathToObjectConverter } from "./gltfPathToObjectConverter.js";
 import type { AnimationGroup } from "@babylonjs/core/Animations/animationGroup.js";
 import type { Mesh } from "@babylonjs/core/Meshes/mesh.js";
 export interface IGLTFObjectModelTree {

package/glTF/2.0/glTFLoader.d.ts

@@ -12,16 +12,16 @@ import { Mesh } from "@babylonjs/core/Meshes/mesh.js";
 import type { ISceneLoaderAsyncResult, ISceneLoaderProgressEvent } from "@babylonjs/core/Loading/sceneLoader.js";
 import type { Scene } from "@babylonjs/core/scene.js";
 import type { IProperty } from "babylonjs-gltf2interface";
-import type { IGLTF, ISampler, INode, IScene, IMesh, IAccessor, ICamera, IAnimation, IBuffer, IBufferView, IMaterial, ITextureInfo, ITexture, IImage, IMeshPrimitive, IArrayItem, IAnimationChannel } from "./glTFLoaderInterfaces";
-import type { IGLTFLoader, IGLTFLoaderData } from "../glTFFileLoader";
-import { GLTFFileLoader } from "../glTFFileLoader";
+import type { IGLTF, ISampler, INode, IScene, IMesh, IAccessor, ICamera, IAnimation, IBuffer, IBufferView, IMaterial, ITextureInfo, ITexture, IImage, IMeshPrimitive, IArrayItem, IAnimationChannel } from "./glTFLoaderInterfaces.js";
+import type { IGLTFLoader, IGLTFLoaderData } from "../glTFFileLoader.js";
+import { GLTFFileLoader } from "../glTFFileLoader.js";
 import type { IDataBuffer } from "@babylonjs/core/Misc/dataReader.js";
 import type { Light } from "@babylonjs/core/Lights/light.js";
 import { BoundingInfo } from "@babylonjs/core/Culling/boundingInfo.js";
 import type { AssetContainer } from "@babylonjs/core/assetContainer.js";
-import type { AnimationPropertyInfo } from "./glTFLoaderAnimation";
+import type { AnimationPropertyInfo } from "./glTFLoaderAnimation.js";
 import type { IObjectInfo } from "@babylonjs/core/ObjectModel/objectModelInterfaces.js";
-import type { GLTFExtensionFactory } from "./glTFLoaderExtensionRegistry";
+import type { GLTFExtensionFactory } from "./glTFLoaderExtensionRegistry.js";
 import type { IInterpolationPropertyInfo } from "@babylonjs/core/FlowGraph/typeDefinitions.js";
 export { GLTFFileLoader };
 interface IWithMetadata {

package/glTF/2.0/glTFLoader.js

@@ -17,7 +17,7 @@ import { Mesh } from "@babylonjs/core/Meshes/mesh.js";
 import { MorphTarget } from "@babylonjs/core/Morph/morphTarget.js";
 import { MorphTargetManager } from "@babylonjs/core/Morph/morphTargetManager.js";
 import { GLTFFileLoader, GLTFLoaderState, GLTFLoaderCoordinateSystemMode, GLTFLoaderAnimationStartMode } from "../glTFFileLoader.js";
-import { DecodeBase64UrlToBinary, IsBase64DataUrl, LoadFileError } from "@babylonjs/core/Misc/fileTools.js";
+import { DecodeBase64UrlToBinary, GetMimeType, IsBase64DataUrl, LoadFileError } from "@babylonjs/core/Misc/fileTools.js";
 import { Logger } from "@babylonjs/core/Misc/logger.js";
 import { BoundingInfo } from "@babylonjs/core/Culling/boundingInfo.js";
 import { registeredGLTFExtensions, registerGLTFExtension, unregisterGLTFExtension } from "./glTFLoaderExtensionRegistry.js";
@@ -1936,7 +1936,7 @@ export class GLTFLoader {
                     deferred.reject(new Error(`${context}: ${exception && exception.message ? exception.message : message || "Failed to load texture"}`));
                 }
             },
-            mimeType: image.mimeType,
+            mimeType: image.mimeType ?? GetMimeType(image.uri ?? ""),
             loaderOptions: textureLoaderOptions,
             useSRGBBuffer: !!useSRGBBuffer && this._parent.useSRGBBuffers,
         };