@babylonjs/loaders 5.17.1 → 5.18.0

package/glTF/2.0/Extensions/index.js

@@ -20,6 +20,7 @@ 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";

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../lts/loaders/generated/glTF/2.0/Extensions/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,uCAAuC,CAAC;AACtD,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC","sourcesContent":["export * from \"./EXT_lights_image_based\";\r\nexport * from \"./EXT_mesh_gpu_instancing\";\r\nexport * from \"./EXT_meshopt_compression\";\r\nexport * from \"./EXT_texture_webp\";\r\nexport * from \"./KHR_draco_mesh_compression\";\r\nexport * from \"./KHR_lights_punctual\";\r\nexport * from \"./KHR_materials_pbrSpecularGlossiness\";\r\nexport * from \"./KHR_materials_unlit\";\r\nexport * from \"./KHR_materials_clearcoat\";\r\nexport * from \"./KHR_materials_iridescence\";\r\nexport * from \"./KHR_materials_emissive_strength\";\r\nexport * from \"./KHR_materials_sheen\";\r\nexport * from \"./KHR_materials_specular\";\r\nexport * from \"./KHR_materials_ior\";\r\nexport * from \"./KHR_materials_variants\";\r\nexport * from \"./KHR_materials_transmission\";\r\nexport * from \"./KHR_materials_translucency\";\r\nexport * from \"./KHR_materials_volume\";\r\nexport * from \"./KHR_mesh_quantization\";\r\nexport * from \"./KHR_texture_basisu\";\r\nexport * from \"./KHR_texture_transform\";\r\nexport * from \"./KHR_xmp_json_ld\";\r\nexport * from \"./MSFT_audio_emitter\";\r\nexport * from \"./MSFT_lod\";\r\nexport * from \"./MSFT_minecraftMesh\";\r\nexport * from \"./MSFT_sRGBFactors\";\r\nexport * from \"./ExtrasAsMetadata\";\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../lts/loaders/generated/glTF/2.0/Extensions/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,uCAAuC,CAAC;AACtD,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mCAAmC,CAAC;AAClD,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC","sourcesContent":["export * from \"./EXT_lights_image_based\";\r\nexport * from \"./EXT_mesh_gpu_instancing\";\r\nexport * from \"./EXT_meshopt_compression\";\r\nexport * from \"./EXT_texture_webp\";\r\nexport * from \"./KHR_draco_mesh_compression\";\r\nexport * from \"./KHR_lights_punctual\";\r\nexport * from \"./KHR_materials_pbrSpecularGlossiness\";\r\nexport * from \"./KHR_materials_unlit\";\r\nexport * from \"./KHR_materials_clearcoat\";\r\nexport * from \"./KHR_materials_iridescence\";\r\nexport * from \"./KHR_materials_emissive_strength\";\r\nexport * from \"./KHR_materials_sheen\";\r\nexport * from \"./KHR_materials_specular\";\r\nexport * from \"./KHR_materials_ior\";\r\nexport * from \"./KHR_materials_variants\";\r\nexport * from \"./KHR_materials_transmission\";\r\nexport * from \"./KHR_materials_translucency\";\r\nexport * from \"./KHR_materials_volume\";\r\nexport * from \"./KHR_mesh_quantization\";\r\nexport * from \"./KHR_texture_basisu\";\r\nexport * from \"./KHR_texture_transform\";\r\nexport * from \"./KHR_xmp_json_ld\";\r\nexport * from \"./KHR_animation_pointer\";\r\nexport * from \"./MSFT_audio_emitter\";\r\nexport * from \"./MSFT_lod\";\r\nexport * from \"./MSFT_minecraftMesh\";\r\nexport * from \"./MSFT_sRGBFactors\";\r\nexport * from \"./ExtrasAsMetadata\";\r\n"]}

package/glTF/2.0/glTFLoader.d.ts

@@ -9,11 +9,10 @@ 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, IAnimationChannel, IBuffer, IBufferView, IMaterial, ITextureInfo, ITexture, IImage, IMeshPrimitive, IArrayItem as IArrItem } from "./glTFLoaderInterfaces";
+import type { IGLTF, ISampler, INode, IScene, IMesh, IAccessor, ICamera, IAnimation, IBuffer, IBufferView, IMaterial, ITextureInfo, ITexture, IImage, IMeshPrimitive, IArrayItem as IArrItem } from "./glTFLoaderInterfaces";
 import type { IGLTFLoaderExtension } from "./glTFLoaderExtension";
 import type { IGLTFLoader, IGLTFLoaderData } from "../glTFFileLoader";
 import { GLTFFileLoader } from "../glTFFileLoader";
-import type { IAnimatable } from "@babylonjs/core/Animations/animatable.interface.js";
 import type { IDataBuffer } from "@babylonjs/core/Misc/dataReader.js";
 import type { Light } from "@babylonjs/core/Lights/light.js";
 import type { AssetContainer } from "@babylonjs/core/assetContainer.js";
@@ -39,6 +38,8 @@ export declare class ArrayItem {
  * The glTF 2.0 loader
  */
 export declare class GLTFLoader implements IGLTFLoader {
+    /** @hidden */
+    static readonly _KHRAnimationPointerName = "KHR_animation_pointer";
     /** @hidden */
     readonly _completePromises: Promise<any>[];
     /** @hidden */
@@ -191,18 +192,6 @@ export declare class GLTFLoader implements IGLTFLoader {
      * @returns A promise that resolves with the loaded Babylon animation group when the load is complete
      */
     loadAnimationAsync(context: string, animation: IAnimation): Promise<AnimationGroup>;
-    /**
-     * @hidden Loads a glTF animation channel.
-     * @param context The context when loading the asset
-     * @param animationContext The context of the animation when loading the asset
-     * @param animation The glTF animation property
-     * @param channel The glTF animation channel property
-     * @param babylonAnimationGroup The babylon animation group property
-     * @param animationTargetOverride The babylon animation channel target override property. My be null.
-     * @returns A void promise when the channel load is complete
-     */
-    _loadAnimationChannelAsync(context: string, animationContext: string, animation: IAnimation, channel: IAnimationChannel, babylonAnimationGroup: AnimationGroup, animationTargetOverride?: Nullable<IAnimatable>): Promise<void>;
-    private _loadAnimationSamplerAsync;
     /**
      * Loads a glTF buffer.
      * @param context The context when loading the asset

package/glTF/2.0/glTFLoader.js

@@ -5,7 +5,6 @@ import { Tools } from "@babylonjs/core/Misc/tools.js";
 import { Camera } from "@babylonjs/core/Cameras/camera.js";
 import { FreeCamera } from "@babylonjs/core/Cameras/freeCamera.js";
 import { AnimationGroup } from "@babylonjs/core/Animations/animationGroup.js";
-import { Animation } from "@babylonjs/core/Animations/animation.js";
 import { Bone } from "@babylonjs/core/Bones/bone.js";
 import { Skeleton } from "@babylonjs/core/Bones/skeleton.js";
 import { Material } from "@babylonjs/core/Materials/material.js";
@@ -18,7 +17,6 @@ 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 { AnimationKeyInterpolation } from "@babylonjs/core/Animations/animationKey.js";
 import { DecodeBase64UrlToBinary, IsBase64DataUrl, LoadFileError } from "@babylonjs/core/Misc/fileTools.js";
 import { Logger } from "@babylonjs/core/Misc/logger.js";
 import { BoundingInfo } from "@babylonjs/core/Culling/boundingInfo.js";
@@ -1225,6 +1223,8 @@ var GLTFLoader = /** @class */ (function () {
         GLTFLoader.AddPointerMetadata(babylonCamera, context);
         this._parent.onCameraLoadedObservable.notifyObservers(babylonCamera);
         assign(babylonCamera);
+        // register the camera to be used later.
+        camera._babylonCamera = babylonCamera;
         this.logClose();
         return Promise.all(promises).then(function () {
             return babylonCamera;
@@ -1254,217 +1254,33 @@ var GLTFLoader = /** @class */ (function () {
      * @returns A promise that resolves with the loaded Babylon animation group when the load is complete
      */
     GLTFLoader.prototype.loadAnimationAsync = function (context, animation) {
-        var promise = this._extensionsLoadAnimationAsync(context, animation);
-        if (promise) {
-            return promise;
+        // turn everything into pointer
+        for (var _i = 0, _a = animation.channels; _i < _a.length; _i++) {
+            var channel = _a[_i];
+            if (channel.target.path == "pointer" /* POINTER */) {
+                continue;
+            }
+            // decorate the channel with a KHR_animation_pointer extension.
+            channel.target.extensions = channel.target.extensions || {};
+            channel.target.extensions.KHR_animation_pointer = {
+                pointer: "/nodes/".concat(channel.target.node, "/").concat(channel.target.path),
+            };
+            channel.target.path = "pointer" /* POINTER */;
+            delete channel.target.node;
+            // ensure to declare extension used.
+            this._gltf.extensionsUsed = this._gltf.extensionsUsed || [];
+            if (this._gltf.extensionsUsed.indexOf(GLTFLoader._KHRAnimationPointerName) === -1) {
+                this._gltf.extensionsUsed.push(GLTFLoader._KHRAnimationPointerName);
+            }
         }
+        // create the animation group to be passed to extension.
         this._babylonScene._blockEntityCollection = !!this._assetContainer;
         var babylonAnimationGroup = new AnimationGroup(animation.name || "animation".concat(animation.index), this._babylonScene);
         babylonAnimationGroup._parentContainer = this._assetContainer;
         this._babylonScene._blockEntityCollection = false;
         animation._babylonAnimationGroup = babylonAnimationGroup;
-        var promises = new Array();
-        ArrayItem.Assign(animation.channels);
-        ArrayItem.Assign(animation.samplers);
-        for (var _i = 0, _a = animation.channels; _i < _a.length; _i++) {
-            var channel = _a[_i];
-            promises.push(this._loadAnimationChannelAsync("".concat(context, "/channels/").concat(channel.index), context, animation, channel, babylonAnimationGroup));
-        }
-        return Promise.all(promises).then(function () {
-            babylonAnimationGroup.normalize(0);
-            return babylonAnimationGroup;
-        });
-    };
-    /**
-     * @hidden Loads a glTF animation channel.
-     * @param context The context when loading the asset
-     * @param animationContext The context of the animation when loading the asset
-     * @param animation The glTF animation property
-     * @param channel The glTF animation channel property
-     * @param babylonAnimationGroup The babylon animation group property
-     * @param animationTargetOverride The babylon animation channel target override property. My be null.
-     * @returns A void promise when the channel load is complete
-     */
-    GLTFLoader.prototype._loadAnimationChannelAsync = function (context, animationContext, animation, channel, babylonAnimationGroup, animationTargetOverride) {
-        var _this = this;
-        if (animationTargetOverride === void 0) { animationTargetOverride = null; }
-        if (channel.target.node == undefined) {
-            return Promise.resolve();
-        }
-        var targetNode = ArrayItem.Get("".concat(context, "/target/node"), this._gltf.nodes, channel.target.node);
-        // Ignore animations that have no animation targets.
-        if ((channel.target.path === "weights" /* WEIGHTS */ && !targetNode._numMorphTargets) ||
-            (channel.target.path !== "weights" /* WEIGHTS */ && !targetNode._babylonTransformNode)) {
-            return Promise.resolve();
-        }
-        var sampler = ArrayItem.Get("".concat(context, "/sampler"), animation.samplers, channel.sampler);
-        return this._loadAnimationSamplerAsync("".concat(animationContext, "/samplers/").concat(channel.sampler), sampler).then(function (data) {
-            var targetPath;
-            var animationType;
-            switch (channel.target.path) {
-                case "translation" /* TRANSLATION */: {
-                    targetPath = "position";
-                    animationType = Animation.ANIMATIONTYPE_VECTOR3;
-                    break;
-                }
-                case "rotation" /* ROTATION */: {
-                    targetPath = "rotationQuaternion";
-                    animationType = Animation.ANIMATIONTYPE_QUATERNION;
-                    break;
-                }
-                case "scale" /* SCALE */: {
-                    targetPath = "scaling";
-                    animationType = Animation.ANIMATIONTYPE_VECTOR3;
-                    break;
-                }
-                case "weights" /* WEIGHTS */: {
-                    targetPath = "influence";
-                    animationType = Animation.ANIMATIONTYPE_FLOAT;
-                    break;
-                }
-                default: {
-                    throw new Error("".concat(context, "/target/path: Invalid value (").concat(channel.target.path, ")"));
-                }
-            }
-            var outputBufferOffset = 0;
-            var getNextOutputValue;
-            switch (targetPath) {
-                case "position": {
-                    getNextOutputValue = function (scale) {
-                        var value = Vector3.FromArray(data.output, outputBufferOffset).scaleInPlace(scale);
-                        outputBufferOffset += 3;
-                        return value;
-                    };
-                    break;
-                }
-                case "rotationQuaternion": {
-                    getNextOutputValue = function (scale) {
-                        var value = Quaternion.FromArray(data.output, outputBufferOffset).scaleInPlace(scale);
-                        outputBufferOffset += 4;
-                        return value;
-                    };
-                    break;
-                }
-                case "scaling": {
-                    getNextOutputValue = function (scale) {
-                        var value = Vector3.FromArray(data.output, outputBufferOffset).scaleInPlace(scale);
-                        outputBufferOffset += 3;
-                        return value;
-                    };
-                    break;
-                }
-                case "influence": {
-                    getNextOutputValue = function (scale) {
-                        var value = new Array(targetNode._numMorphTargets);
-                        for (var i = 0; i < targetNode._numMorphTargets; i++) {
-                            value[i] = data.output[outputBufferOffset++] * scale;
-                        }
-                        return value;
-                    };
-                    break;
-                }
-            }
-            var getNextKey;
-            switch (data.interpolation) {
-                case "STEP" /* STEP */: {
-                    getNextKey = function (frameIndex) { return ({
-                        frame: data.input[frameIndex] * _this.parent.targetFps,
-                        value: getNextOutputValue(1),
-                        interpolation: AnimationKeyInterpolation.STEP,
-                    }); };
-                    break;
-                }
-                case "LINEAR" /* LINEAR */: {
-                    getNextKey = function (frameIndex) { return ({
-                        frame: data.input[frameIndex] * _this.parent.targetFps,
-                        value: getNextOutputValue(1),
-                    }); };
-                    break;
-                }
-                case "CUBICSPLINE" /* CUBICSPLINE */: {
-                    var invTargetFps_1 = 1 / _this.parent.targetFps;
-                    getNextKey = function (frameIndex) { return ({
-                        frame: data.input[frameIndex] * _this.parent.targetFps,
-                        inTangent: getNextOutputValue(invTargetFps_1),
-                        value: getNextOutputValue(1),
-                        outTangent: getNextOutputValue(invTargetFps_1),
-                    }); };
-                    break;
-                }
-            }
-            var keys = new Array(data.input.length);
-            for (var frameIndex = 0; frameIndex < data.input.length; frameIndex++) {
-                keys[frameIndex] = getNextKey(frameIndex);
-            }
-            if (targetPath === "influence") {
-                var _loop_2 = function (targetIndex) {
-                    var animationName = "".concat(babylonAnimationGroup.name, "_channel").concat(babylonAnimationGroup.targetedAnimations.length);
-                    var babylonAnimation = new Animation(animationName, targetPath, _this.parent.targetFps, animationType);
-                    babylonAnimation.setKeys(keys.map(function (key) { return ({
-                        frame: key.frame,
-                        inTangent: key.inTangent ? key.inTangent[targetIndex] : undefined,
-                        value: key.value[targetIndex],
-                        outTangent: key.outTangent ? key.outTangent[targetIndex] : undefined,
-                        interpolation: key.interpolation,
-                    }); }));
-                    _this._forEachPrimitive(targetNode, function (babylonAbstractMesh) {
-                        var babylonMesh = babylonAbstractMesh;
-                        if (babylonMesh.morphTargetManager) {
-                            var morphTarget = babylonMesh.morphTargetManager.getTarget(targetIndex);
-                            var babylonAnimationClone = babylonAnimation.clone();
-                            morphTarget.animations.push(babylonAnimationClone);
-                            babylonAnimationGroup.addTargetedAnimation(babylonAnimationClone, morphTarget);
-                        }
-                    });
-                };
-                for (var targetIndex = 0; targetIndex < targetNode._numMorphTargets; targetIndex++) {
-                    _loop_2(targetIndex);
-                }
-            }
-            else {
-                var animationName = "".concat(babylonAnimationGroup.name, "_channel").concat(babylonAnimationGroup.targetedAnimations.length);
-                var babylonAnimation = new Animation(animationName, targetPath, _this.parent.targetFps, animationType);
-                babylonAnimation.setKeys(keys);
-                if (animationTargetOverride != null && animationTargetOverride.animations != null) {
-                    animationTargetOverride.animations.push(babylonAnimation);
-                    babylonAnimationGroup.addTargetedAnimation(babylonAnimation, animationTargetOverride);
-                }
-                else {
-                    targetNode._babylonTransformNode.animations.push(babylonAnimation);
-                    babylonAnimationGroup.addTargetedAnimation(babylonAnimation, targetNode._babylonTransformNode);
-                }
-            }
-        });
-    };
-    GLTFLoader.prototype._loadAnimationSamplerAsync = function (context, sampler) {
-        if (sampler._data) {
-            return sampler._data;
-        }
-        var interpolation = sampler.interpolation || "LINEAR" /* LINEAR */;
-        switch (interpolation) {
-            case "STEP" /* STEP */:
-            case "LINEAR" /* LINEAR */:
-            case "CUBICSPLINE" /* CUBICSPLINE */: {
-                break;
-            }
-            default: {
-                throw new Error("".concat(context, "/interpolation: Invalid value (").concat(sampler.interpolation, ")"));
-            }
-        }
-        var inputAccessor = ArrayItem.Get("".concat(context, "/input"), this._gltf.accessors, sampler.input);
-        var outputAccessor = ArrayItem.Get("".concat(context, "/output"), this._gltf.accessors, sampler.output);
-        sampler._data = Promise.all([
-            this._loadFloatAccessorAsync("/accessors/".concat(inputAccessor.index), inputAccessor),
-            this._loadFloatAccessorAsync("/accessors/".concat(outputAccessor.index), outputAccessor),
-        ]).then(function (_a) {
-            var inputData = _a[0], outputData = _a[1];
-            return {
-                input: inputData,
-                interpolation: interpolation,
-                output: outputData,
-            };
-        });
-        return sampler._data;
+        var promise = this._extensionsLoadAnimationAsync(context, animation);
+        return promise !== null && promise !== void 0 ? promise : Promise.resolve(animation._babylonAnimationGroup);
     };
     /**
      * Loads a glTF buffer.
@@ -2392,6 +2208,10 @@ var GLTFLoader = /** @class */ (function () {
     GLTFLoader.prototype.endPerformanceCounter = function (counterName) {
         this._parent._endPerformanceCounter(counterName);
     };
+    /** @hidden */
+    // note : KHR_animation_pointer is used to load animation in ALL case, turning everything
+    // into pointer. This is the reason why this value is located here.
+    GLTFLoader._KHRAnimationPointerName = "KHR_animation_pointer";
     GLTFLoader._RegisteredExtensions = {};
     /**
      * The default glTF sampler.