babylonjs-loaders 5.2.0 → 5.5.0

package/babylon.glTF2FileLoader.js

@@ -1287,16 +1287,16 @@ var KHR_materials_iridescence = /** @class */ (function () {
         });
     };
     KHR_materials_iridescence.prototype._loadIridescencePropertiesAsync = function (context, properties, babylonMaterial) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (!(babylonMaterial instanceof core_Materials_PBR_pbrMaterial__WEBPACK_IMPORTED_MODULE_0__.PBRMaterial)) {
             throw new Error("".concat(context, ": Material type not supported"));
         }
         var promises = new Array();
         babylonMaterial.iridescence.isEnabled = true;
         babylonMaterial.iridescence.intensity = (_a = properties.iridescenceFactor) !== null && _a !== void 0 ? _a : 0;
-        babylonMaterial.iridescence.indexOfRefraction = (_b = properties.iridescenceIOR) !== null && _b !== void 0 ? _b : 1.3;
-        babylonMaterial.iridescence.minimumThickness = (_c = properties.iridescenceThicknessMinimum) !== null && _c !== void 0 ? _c : 100;
-        babylonMaterial.iridescence.maximumThickness = (_d = properties.iridescenceThicknessMaximum) !== null && _d !== void 0 ? _d : 400;
+        babylonMaterial.iridescence.indexOfRefraction = (_c = (_b = properties.iridescenceIor) !== null && _b !== void 0 ? _b : properties.iridescenceIOR) !== null && _c !== void 0 ? _c : 1.3;
+        babylonMaterial.iridescence.minimumThickness = (_d = properties.iridescenceThicknessMinimum) !== null && _d !== void 0 ? _d : 100;
+        babylonMaterial.iridescence.maximumThickness = (_e = properties.iridescenceThicknessMaximum) !== null && _e !== void 0 ? _e : 400;
         if (properties.iridescenceTexture) {
             promises.push(this._loader.loadTextureInfoAsync("".concat(context, "/iridescenceTexture"), properties.iridescenceTexture, function (texture) {
                 texture.name = "".concat(babylonMaterial.name, " (Iridescence Intensity)");
@@ -1402,8 +1402,8 @@ var KHR_materials_pbrSpecularGlossiness = /** @class */ (function () {
             promises.push(this._loader.loadTextureInfoAsync("".concat(context, "/specularGlossinessTexture"), properties.specularGlossinessTexture, function (texture) {
                 texture.name = "".concat(babylonMaterial.name, " (Specular Glossiness)");
                 babylonMaterial.reflectivityTexture = texture;
+                babylonMaterial.reflectivityTexture.hasAlpha = true;
             }));
-            babylonMaterial.reflectivityTexture.hasAlpha = true;
             babylonMaterial.useMicroSurfaceFromReflectivityMapAlpha = true;
         }
         return Promise.all(promises).then(function () { });
@@ -4221,12 +4221,18 @@ var GLTFLoader = /** @class */ (function () {
                         _this._forEachPrimitive(node, function (babylonMesh) {
                             babylonMesh.skeleton = babylonSkeleton;
                         });
-                        // Wait until the scene is loaded to ensure the skeleton root node has been loaded.
+                        // Wait until all the nodes are parented before parenting the skinned mesh.
                         _this._postSceneLoadActions.push(function () {
                             if (skin.skeleton != undefined) {
                                 // Place the skinned mesh node as a sibling of the skeleton root node.
-                                var skeletonRootNode = ArrayItem.Get("/skins/".concat(skin.index, "/skeleton"), _this._gltf.nodes, skin.skeleton);
-                                babylonTransformNode.parent = skeletonRootNode.parent._babylonTransformNode;
+                                // 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;
+                                }
+                                else {
+                                    babylonTransformNode.parent = parentNode._babylonTransformNode;
+                                }
                             }
                             else {
                                 babylonTransformNode.parent = _this._rootBabylonMesh;
@@ -4325,6 +4331,9 @@ var GLTFLoader = /** @class */ (function () {
             this._createMorphTargets(context, node, mesh, primitive, babylonMesh_1);
             promises.push(this._loadVertexDataAsync(context, primitive, babylonMesh_1).then(function (babylonGeometry) {
                 return _this._loadMorphTargetsAsync(context, primitive, babylonMesh_1, babylonGeometry).then(function () {
+                    if (_this._disposed) {
+                        return;
+                    }
                     _this._babylonScene._blockEntityCollection = !!_this._assetContainer;
                     babylonGeometry.applyToMesh(babylonMesh_1);
                     babylonGeometry._parentContainer = _this._assetContainer;
@@ -5147,17 +5156,16 @@ var GLTFLoader = /** @class */ (function () {
         return accessor._data;
     };
     GLTFLoader.prototype._loadVertexBufferViewAsync = function (bufferView) {
-        var _this = this;
         if (bufferView._babylonBuffer) {
             return bufferView._babylonBuffer;
         }
+        var engine = this._babylonScene.getEngine();
         bufferView._babylonBuffer = this.loadBufferViewAsync("/bufferViews/".concat(bufferView.index), bufferView).then(function (data) {
-            return new core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.Buffer(_this._babylonScene.getEngine(), data, false);
+            return new core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.Buffer(engine, data, false);
         });
         return bufferView._babylonBuffer;
     };
     GLTFLoader.prototype._loadVertexAccessorAsync = function (context, accessor, kind) {
-        var _this = this;
         var _a;
         if ((_a = accessor._babylonVertexBuffer) === null || _a === void 0 ? void 0 : _a[kind]) {
             return accessor._babylonVertexBuffer[kind];
@@ -5165,23 +5173,24 @@ var GLTFLoader = /** @class */ (function () {
         if (!accessor._babylonVertexBuffer) {
             accessor._babylonVertexBuffer = {};
         }
+        var engine = this._babylonScene.getEngine();
         if (accessor.sparse) {
             accessor._babylonVertexBuffer[kind] = this._loadFloatAccessorAsync(context, accessor).then(function (data) {
-                return new core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer(_this._babylonScene.getEngine(), data, kind, false);
+                return new core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer(engine, data, kind, false);
             });
         }
         // Load joint indices as a float array since the shaders expect float data but glTF uses unsigned byte/short.
         // This prevents certain platforms (e.g. D3D) from having to convert the data to float on the fly.
         else if (kind === core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer.MatricesIndicesKind || kind === core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer.MatricesIndicesExtraKind) {
             accessor._babylonVertexBuffer[kind] = this._loadFloatAccessorAsync(context, accessor).then(function (data) {
-                return new core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer(_this._babylonScene.getEngine(), data, kind, false);
+                return new core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer(engine, data, kind, false);
             });
         }
         else {
             var bufferView_2 = ArrayItem.Get("".concat(context, "/bufferView"), this._gltf.bufferViews, accessor.bufferView);
             accessor._babylonVertexBuffer[kind] = this._loadVertexBufferViewAsync(bufferView_2).then(function (babylonBuffer) {
                 var size = GLTFLoader._GetNumComponents(context, accessor.type);
-                return new core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer(_this._babylonScene.getEngine(), babylonBuffer, kind, false, false, bufferView_2.byteStride, false, accessor.byteOffset, size, accessor.componentType, accessor.normalized, true, 1, true);
+                return new core_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer(engine, babylonBuffer, kind, false, false, bufferView_2.byteStride, false, accessor.byteOffset, size, accessor.componentType, accessor.normalized, true, 1, true);
             });
         }
         return accessor._babylonVertexBuffer[kind];
@@ -5339,7 +5348,7 @@ var GLTFLoader = /** @class */ (function () {
             }));
             babylonMaterial.invertNormalMapX = !this._babylonScene.useRightHandedSystem;
             babylonMaterial.invertNormalMapY = this._babylonScene.useRightHandedSystem;
-            if (material.normalTexture.scale != undefined) {
+            if (material.normalTexture.scale != undefined && babylonMaterial.bumpTexture) {
                 babylonMaterial.bumpTexture.level = material.normalTexture.scale;
             }
             babylonMaterial.forceIrradianceInFragment = true;