babylonjs-loaders 6.36.0 → 6.37.0

package/babylonjs.loaders.module.d.ts

@@ -846,6 +846,40 @@ export class ExtrasAsMetadata implements IGLTFLoaderExtension {
     createMaterial(context: string, material: IMaterial, babylonDrawMode: number): Nullable<Material>;
 }
 
+}
+declare module "babylonjs-loaders/glTF/2.0/Extensions/gltfPathToObjectConverter" {
+import { IObjectInfo, IPathToObjectConverter } from "babylonjs/ObjectModel/objectModelInterfaces";
+import { IGLTF } from "babylonjs-loaders/glTF/2.0/glTFLoaderInterfaces";
+/**
+ * A converter that takes a glTF Object Model JSON Pointer
+ * and transforms it into an ObjectAccessorContainer, allowing
+ * objects referenced in the glTF to be associated with their
+ * respective Babylon.js objects.
+ */
+export class GLTFPathToObjectConverter<T> implements IPathToObjectConverter<T> {
+    private _gltf;
+    private _infoTree;
+    constructor(_gltf: IGLTF, _infoTree: any);
+    /**
+     * The pointer string is represented by a [JSON pointer](https://datatracker.ietf.org/doc/html/rfc6901).
+     * <animationPointer> := /<rootNode>/<assetIndex>/<propertyPath>
+     * <rootNode> := "nodes" | "materials" | "meshes" | "cameras" | "extensions"
+     * <assetIndex> := <digit> | <name>
+     * <propertyPath> := <extensionPath> | <standardPath>
+     * <extensionPath> := "extensions"/<name>/<standardPath>
+     * <standardPath> := <name> | <name>/<standardPath>
+     * <name> := W+
+     * <digit> := D+
+     *
+     * Examples:
+     *  - "/nodes/0/rotation"
+     *  - "/materials/2/emissiveFactor"
+     *  - "/materials/2/pbrMetallicRoughness/baseColorFactor"
+     *  - "/materials/2/extensions/KHR_materials_emissive_strength/emissiveStrength"
+     */
+    convert(path: string): IObjectInfo<T>;
+}
+
 }
 declare module "babylonjs-loaders/glTF/2.0/Extensions/index" {
 export * from "babylonjs-loaders/glTF/2.0/Extensions/EXT_lights_image_based";
@@ -893,34 +927,16 @@ import { ISerializedFlowGraph } from "babylonjs/FlowGraph/typeDefinitions";
 export function convertGLTFToSerializedFlowGraph(gltf: IKHRInteractivity): ISerializedFlowGraph;
 
 }
-declare module "babylonjs-loaders/glTF/2.0/Extensions/interactivityPathCameraExtensions" {
-import { FlowGraphPath } from "babylonjs/FlowGraph/flowGraphPath";
-import { FlowGraphContext } from "babylonjs/FlowGraph/flowGraphContext";
-export const camerasExtension: {
-    shouldProcess(path: FlowGraphPath): boolean;
-    processGet(path: FlowGraphPath, context: FlowGraphContext): any;
-    processSet(path: FlowGraphPath, context: FlowGraphContext, value: any): void;
-};
-
-}
-declare module "babylonjs-loaders/glTF/2.0/Extensions/interactivityPathExtensions" {
-import { IPathExtension } from "babylonjs/FlowGraph/flowGraphPath";
-export const interactivityPathExensions: IPathExtension[];
-
-}
-declare module "babylonjs-loaders/glTF/2.0/Extensions/interactivityPathMaterialExtensions" {
-import { FlowGraphPath } from "babylonjs/FlowGraph/flowGraphPath";
-import { FlowGraphContext } from "babylonjs/FlowGraph/flowGraphContext";
-export const pbrMaterialExtension: {
-    shouldProcess(path: FlowGraphPath): boolean;
-    processGet(path: FlowGraphPath, context: FlowGraphContext): any;
-    processSet(path: FlowGraphPath, context: FlowGraphContext, value: any): void;
-};
-
+declare module "babylonjs-loaders/glTF/2.0/Extensions/interactivityPathToObjectConverter" {
+import { IGLTF } from "babylonjs-loaders/glTF/2.0/glTFLoaderInterfaces";
+import { GLTFPathToObjectConverter } from "babylonjs-loaders/glTF/2.0/Extensions/gltfPathToObjectConverter";
+import { IObjectAccessor } from "babylonjs/FlowGraph";
+/**
+ * Class to convert an interactivity pointer path to a smart object
+ */
+export class InteractivityPathToObjectConverter extends GLTFPathToObjectConverter<IObjectAccessor> {
+    constructor(gltf: IGLTF);
 }
-declare module "babylonjs-loaders/glTF/2.0/Extensions/interactivityPathTransformNodeExtensions" {
-import { IPathExtension } from "babylonjs/FlowGraph/flowGraphPath";
-export const transformNodeExtension: IPathExtension;
 
 }
 declare module "babylonjs-loaders/glTF/2.0/Extensions/interactivityUtils" {
@@ -947,6 +963,7 @@ export class KHR_animation_pointer implements IGLTFLoaderExtension {
      */
     readonly name: string;
     private _loader;
+    private _pathToObjectConverter?;
     /**
      * @internal
      */
@@ -967,24 +984,6 @@ export class KHR_animation_pointer implements IGLTFLoaderExtension {
      * @returns A void promise that resolves when the load is complete or null if not handled
      */
     _loadAnimationChannelAsync(context: string, animationContext: string, animation: IAnimation, channel: IAnimationChannel, onLoad: (babylonAnimatable: IAnimatable, babylonAnimation: Animation) => void): Nullable<Promise<void>>;
-    /**
-     * The pointer string is represented by a [JSON pointer](https://datatracker.ietf.org/doc/html/rfc6901).
-     * <animationPointer> := /<rootNode>/<assetIndex>/<propertyPath>
-     * <rootNode> := "nodes" | "materials" | "meshes" | "cameras" | "extensions"
-     * <assetIndex> := <digit> | <name>
-     * <propertyPath> := <extensionPath> | <standardPath>
-     * <extensionPath> := "extensions"/<name>/<standardPath>
-     * <standardPath> := <name> | <name>/<standardPath>
-     * <name> := W+
-     * <digit> := D+
-     *
-     * Examples:
-     *  - "/nodes/0/rotation"
-     *  - "/materials/2/emissiveFactor"
-     *  - "/materials/2/pbrMetallicRoughness/baseColorFactor"
-     *  - "/materials/2/extensions/KHR_materials_emissive_strength/emissiveStrength"
-     */
-    private _parseAnimationPointer;
 }
 
 }
@@ -1193,6 +1192,7 @@ export class KHR_interactivity implements IGLTFLoaderExtension {
      * Defines whether this extension is enabled.
      */
     enabled: boolean;
+    private _pathConverter?;
     /**
      * @internal
      * @param _loader
@@ -2141,6 +2141,7 @@ import { IDataBuffer } from "babylonjs/Misc/dataReader";
 import { Light } from "babylonjs/Lights/light";
 import { AssetContainer } from "babylonjs/assetContainer";
 import { AnimationPropertyInfo } from "babylonjs-loaders/glTF/2.0/glTFLoaderAnimation";
+import { IObjectInfo } from "babylonjs/ObjectModel/objectModelInterfaces";
 interface IWithMetadata {
     metadata: any;
     _internalMetadata: any;
@@ -2344,7 +2345,7 @@ export class GLTFLoader implements IGLTFLoader {
      * @param onLoad Called for each animation loaded
      * @returns A void promise that resolves when the load is complete
      */
-    _loadAnimationChannelFromTargetInfoAsync(context: string, animationContext: string, animation: IAnimation, channel: IAnimationChannel, targetInfo: IAnimationTargetInfo, onLoad: (babylonAnimatable: IAnimatable, babylonAnimation: Animation) => void): Promise<void>;
+    _loadAnimationChannelFromTargetInfoAsync(context: string, animationContext: string, animation: IAnimation, channel: IAnimationChannel, targetInfo: IObjectInfo<AnimationPropertyInfo[]>, onLoad: (babylonAnimatable: IAnimatable, babylonAnimation: Animation) => void): Promise<void>;
     private _loadAnimationSamplerAsync;
     /**
      * Loads a glTF buffer.
@@ -4896,39 +4897,40 @@ declare module BABYLON.GLTF2.Loader.Extensions {
 
 
 
-}
-declare module BABYLON {
-
-}
-declare module BABYLON.GLTF2.Loader.Extensions {
-    
-
-
 }
 declare module BABYLON {
 
 }
 declare module BABYLON.GLTF2.Loader.Extensions {
         /**
-     * @internal
-     * Converts a glTF Interactivity Extension to a serialized flow graph.
-     * @param gltf the interactivity data
-     * @returns a serialized flow graph
+     * A converter that takes a glTF Object Model JSON Pointer
+     * and transforms it into an ObjectAccessorContainer, allowing
+     * objects referenced in the glTF to be associated with their
+     * respective Babylon.js objects.
      */
-    export function convertGLTFToSerializedFlowGraph(gltf: BABYLON.GLTF2.IKHRInteractivity): ISerializedFlowGraph;
-
-
-
-}
-declare module BABYLON {
-
-}
-declare module BABYLON.GLTF2.Loader.Extensions {
-        export var camerasExtension: {
-        shouldProcess(path: FlowGraphPath): boolean;
-        processGet(path: FlowGraphPath, context: FlowGraphContext): any;
-        processSet(path: FlowGraphPath, context: FlowGraphContext, value: any): void;
-    };
+    export class GLTFPathToObjectConverter<T> implements IPathToObjectConverter<T> {
+        private _gltf;
+        private _infoTree;
+        constructor(_gltf: BABYLON.GLTF2.Loader.IGLTF, _infoTree: any);
+        /**
+         * The pointer string is represented by a [JSON pointer](https://datatracker.ietf.org/doc/html/rfc6901).
+         * <animationPointer> := /<rootNode>/<assetIndex>/<propertyPath>
+         * <rootNode> := "nodes" | "materials" | "meshes" | "cameras" | "extensions"
+         * <assetIndex> := <digit> | <name>
+         * <propertyPath> := <extensionPath> | <standardPath>
+         * <extensionPath> := "extensions"/<name>/<standardPath>
+         * <standardPath> := <name> | <name>/<standardPath>
+         * <name> := W+
+         * <digit> := D+
+         *
+         * Examples:
+         *  - "/nodes/0/rotation"
+         *  - "/materials/2/emissiveFactor"
+         *  - "/materials/2/pbrMetallicRoughness/baseColorFactor"
+         *  - "/materials/2/extensions/KHR_materials_emissive_strength/emissiveStrength"
+         */
+        convert(path: string): IObjectInfo<T>;
+    }
 
 
 
@@ -4937,8 +4939,7 @@ declare module BABYLON {
 
 }
 declare module BABYLON.GLTF2.Loader.Extensions {
-        export var interactivityPathExensions: IPathExtension[];
-
+    
 
 
 }
@@ -4946,11 +4947,13 @@ declare module BABYLON {
 
 }
 declare module BABYLON.GLTF2.Loader.Extensions {
-        export var pbrMaterialExtension: {
-        shouldProcess(path: FlowGraphPath): boolean;
-        processGet(path: FlowGraphPath, context: FlowGraphContext): any;
-        processSet(path: FlowGraphPath, context: FlowGraphContext, value: any): void;
-    };
+        /**
+     * @internal
+     * Converts a glTF Interactivity Extension to a serialized flow graph.
+     * @param gltf the interactivity data
+     * @returns a serialized flow graph
+     */
+    export function convertGLTFToSerializedFlowGraph(gltf: BABYLON.GLTF2.IKHRInteractivity): ISerializedFlowGraph;
 
 
 
@@ -4959,7 +4962,12 @@ declare module BABYLON {
 
 }
 declare module BABYLON.GLTF2.Loader.Extensions {
-        export var transformNodeExtension: IPathExtension;
+        /**
+     * Class to convert an interactivity pointer path to a smart object
+     */
+    export class InteractivityPathToObjectConverter extends BABYLON.GLTF2.Loader.Extensions.GLTFPathToObjectConverter<IObjectAccessor> {
+        constructor(gltf: BABYLON.GLTF2.Loader.IGLTF);
+    }
 
 
 
@@ -4990,6 +4998,7 @@ declare module BABYLON.GLTF2.Loader.Extensions {
          */
         readonly name = "KHR_animation_pointer";
         private _loader;
+        private _pathToObjectConverter?;
         /**
          * @internal
          */
@@ -5010,24 +5019,6 @@ declare module BABYLON.GLTF2.Loader.Extensions {
          * @returns A void promise that resolves when the load is complete or null if not handled
          */
         _loadAnimationChannelAsync(context: string, animationContext: string, animation: BABYLON.GLTF2.Loader.IAnimation, channel: BABYLON.GLTF2.Loader.IAnimationChannel, onLoad: (babylonAnimatable: IAnimatable, babylonAnimation: Animation) => void): Nullable<Promise<void>>;
-        /**
-         * The pointer string is represented by a [JSON pointer](https://datatracker.ietf.org/doc/html/rfc6901).
-         * <animationPointer> := /<rootNode>/<assetIndex>/<propertyPath>
-         * <rootNode> := "nodes" | "materials" | "meshes" | "cameras" | "extensions"
-         * <assetIndex> := <digit> | <name>
-         * <propertyPath> := <extensionPath> | <standardPath>
-         * <extensionPath> := "extensions"/<name>/<standardPath>
-         * <standardPath> := <name> | <name>/<standardPath>
-         * <name> := W+
-         * <digit> := D+
-         *
-         * Examples:
-         *  - "/nodes/0/rotation"
-         *  - "/materials/2/emissiveFactor"
-         *  - "/materials/2/pbrMetallicRoughness/baseColorFactor"
-         *  - "/materials/2/extensions/KHR_materials_emissive_strength/emissiveStrength"
-         */
-        private _parseAnimationPointer;
     }
 
 
@@ -5237,6 +5228,7 @@ declare module BABYLON.GLTF2.Loader.Extensions {
          * Defines whether this extension is enabled.
          */
         enabled: boolean;
+        private _pathConverter?;
         /**
          * @internal
          * @param _loader
@@ -6371,7 +6363,7 @@ declare module BABYLON.GLTF2 {
          * @param onLoad Called for each animation loaded
          * @returns A void promise that resolves when the load is complete
          */
-        _loadAnimationChannelFromTargetInfoAsync(context: string, animationContext: string, animation: BABYLON.GLTF2.Loader.IAnimation, channel: BABYLON.GLTF2.Loader.IAnimationChannel, targetInfo: IAnimationTargetInfo, onLoad: (babylonAnimatable: IAnimatable, babylonAnimation: Animation) => void): Promise<void>;
+        _loadAnimationChannelFromTargetInfoAsync(context: string, animationContext: string, animation: BABYLON.GLTF2.Loader.IAnimation, channel: BABYLON.GLTF2.Loader.IAnimationChannel, targetInfo: IObjectInfo<BABYLON.GLTF2.AnimationPropertyInfo[]>, onLoad: (babylonAnimatable: IAnimatable, babylonAnimation: Animation) => void): Promise<void>;
         private _loadAnimationSamplerAsync;
         /**
          * Loads a glTF buffer.

package/package.json

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