@babylonjs/loaders 5.12.1 → 5.13.0

package/glTF/2.0/glTFLoader.js

@@ -55,6 +55,30 @@ var ArrayItem = /** @class */ (function () {
     return ArrayItem;
 }());
 export { ArrayItem };
+// https://stackoverflow.com/a/48218209
+function mergeDeep() {
+    var objects = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        objects[_i] = arguments[_i];
+    }
+    var isObject = function (obj) { return obj && typeof obj === "object"; };
+    return objects.reduce(function (prev, obj) {
+        Object.keys(obj).forEach(function (key) {
+            var pVal = prev[key];
+            var oVal = obj[key];
+            if (Array.isArray(pVal) && Array.isArray(oVal)) {
+                prev[key] = pVal.concat.apply(pVal, oVal);
+            }
+            else if (isObject(pVal) && isObject(oVal)) {
+                prev[key] = mergeDeep(pVal, oVal);
+            }
+            else {
+                prev[key] = oVal;
+            }
+        });
+        return prev;
+    }, {});
+}
 /**
  * The glTF 2.0 loader
  */
@@ -643,6 +667,8 @@ var GLTFLoader = /** @class */ (function () {
                 var mesh = ArrayItem.Get("".concat(context, "/mesh"), this._gltf.meshes, node.mesh);
                 promises.push(this._loadMeshAsync("/meshes/".concat(mesh.index), node, mesh, function (babylonTransformNode) {
                     var babylonTransformNodeForSkin = node._babylonTransformNodeForSkin;
+                    // Merge the metadata from the skin node to the skinned mesh in case a loader extension added metadata.
+                    babylonTransformNode.metadata = mergeDeep(babylonTransformNodeForSkin.metadata, babylonTransformNode.metadata);
                     var skin = ArrayItem.Get("".concat(context, "/skin"), _this._gltf.skins, node.skin);
                     promises.push(_this._loadSkinAsync("/skins/".concat(skin.index), node, skin, function (babylonSkeleton) {
                         _this._forEachPrimitive(node, function (babylonMesh) {
@@ -655,7 +681,7 @@ var GLTFLoader = /** @class */ (function () {
                                 // Handle special case when the parent of the skeleton root is the skinned mesh.
                                 var parentNode = ArrayItem.Get("/skins/".concat(skin.index, "/skeleton"), _this._gltf.nodes, skin.skeleton).parent;
                                 if (node.index === parentNode.index) {
-                                    babylonTransformNode.parent = node._babylonTransformNodeForSkin.parent;
+                                    babylonTransformNode.parent = babylonTransformNodeForSkin.parent;
                                 }
                                 else {
                                     babylonTransformNode.parent = parentNode._babylonTransformNode;