@babylonjs/loaders 5.0.0-rc.1 → 5.0.0-rc.4

package/glTF/2.0/glTFLoader.js

@@ -249,14 +249,16 @@ var GLTFLoader = /** @class */ (function () {
             // Block the marking of materials dirty until the scene is loaded.
             var oldBlockMaterialDirtyMechanism = _this._babylonScene.blockMaterialDirtyMechanism;
             _this._babylonScene.blockMaterialDirtyMechanism = true;
-            if (nodes) {
-                promises.push(_this.loadSceneAsync("/nodes", { nodes: nodes, index: -1 }));
-            }
-            else if (_this._gltf.scene != undefined || (_this._gltf.scenes && _this._gltf.scenes[0])) {
-                var scene = ArrayItem.Get("/scene", _this._gltf.scenes, _this._gltf.scene || 0);
-                promises.push(_this.loadSceneAsync("/scenes/".concat(scene.index), scene));
+            if (!_this.parent.loadOnlyMaterials) {
+                if (nodes) {
+                    promises.push(_this.loadSceneAsync("/nodes", { nodes: nodes, index: -1 }));
+                }
+                else if (_this._gltf.scene != undefined || (_this._gltf.scenes && _this._gltf.scenes[0])) {
+                    var scene = ArrayItem.Get("/scene", _this._gltf.scenes, _this._gltf.scene || 0);
+                    promises.push(_this.loadSceneAsync("/scenes/".concat(scene.index), scene));
+                }
             }
-            if (_this.parent.loadAllMaterials && _this._gltf.materials) {
+            if (!_this.parent.skipMaterials && _this.parent.loadAllMaterials && _this._gltf.materials) {
                 for (var m = 0; m < _this._gltf.materials.length; ++m) {
                     var material = _this._gltf.materials[m];
                     var context_1 = "/materials/" + m;
@@ -497,6 +499,9 @@ var GLTFLoader = /** @class */ (function () {
                 if (node._babylonTransformNode && node._babylonTransformNode.getClassName() === "TransformNode") {
                     transformNodes.push(node._babylonTransformNode);
                 }
+                if (node._babylonTransformNodeForSkin) {
+                    transformNodes.push(node._babylonTransformNodeForSkin);
+                }
             }
         }
         return transformNodes;
@@ -596,10 +601,16 @@ var GLTFLoader = /** @class */ (function () {
         if (node.mesh == undefined || node.skin != undefined) {
             var nodeName = node.name || "node".concat(node.index);
             this._babylonScene._blockEntityCollection = !!this._assetContainer;
-            node._babylonTransformNode = new TransformNode(nodeName, this._babylonScene);
-            node._babylonTransformNode._parentContainer = this._assetContainer;
+            var transformNode = new TransformNode(nodeName, this._babylonScene);
+            transformNode._parentContainer = this._assetContainer;
             this._babylonScene._blockEntityCollection = false;
-            loadNode(node._babylonTransformNode);
+            if (node.mesh == undefined) {
+                node._babylonTransformNode = transformNode;
+            }
+            else {
+                node._babylonTransformNodeForSkin = transformNode;
+            }
+            loadNode(transformNode);
         }
         if (node.mesh != undefined) {
             if (node.skin == undefined) {
@@ -612,7 +623,8 @@ var GLTFLoader = /** @class */ (function () {
                 // transform, which effectively ignores the transform of the skinned mesh, as per spec.
                 var mesh = ArrayItem.Get("".concat(context, "/mesh"), this._gltf.meshes, node.mesh);
                 promises.push(this._loadMeshAsync("/meshes/".concat(mesh.index), node, mesh, function (babylonTransformNode) {
-                    GLTFLoader.AddPointerMetadata(babylonTransformNode, context);
+                    // Duplicate the metadata from the skin node to the skinned mesh in case any loader extension added metadata.
+                    babylonTransformNode.metadata = node._babylonTransformNodeForSkin.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) {
@@ -738,7 +750,7 @@ var GLTFLoader = /** @class */ (function () {
                 }
                 babylonMesh_1.material = babylonMaterial;
             }
-            else {
+            else if (!this.parent.skipMaterials) {
                 var material = ArrayItem.Get("".concat(context, "/material"), this._gltf.materials, primitive.material);
                 promises.push(this._loadMaterialAsync("/materials/".concat(material.index), material, babylonMesh_1, babylonDrawMode, function (babylonMaterial) {
                     babylonMesh_1.material = babylonMaterial;
@@ -1023,6 +1035,9 @@ var GLTFLoader = /** @class */ (function () {
         }
     };
     GLTFLoader.prototype._findSkeletonRootNode = function (context, joints) {
+        if (joints.length === 0) {
+            return null;
+        }
         var paths = {};
         for (var _i = 0, joints_1 = joints; _i < joints_1.length; _i++) {
             var index = joints_1[_i];