babylonjs-loaders 6.21.1 → 6.21.2

package/babylon.glTF2FileLoader.js

@@ -817,6 +817,10 @@ var KHR_draco_mesh_compression = /** @class */ (function () {
          * The name of this extension.
          */
         this.name = NAME;
+        /**
+         * Defines whether to use the normalized flag from the glTF accessor instead of the Draco data. Defaults to true.
+         */
+        this.useNormalizedFlagFromAccessor = true;
         this._loader = loader;
         this.enabled = babylonjs_Meshes_Compression_dracoCompression__WEBPACK_IMPORTED_MODULE_0__.DracoCompression.DecoderAvailable && this._loader.isExtensionUsed(NAME);
     }
@@ -841,6 +845,7 @@ var KHR_draco_mesh_compression = /** @class */ (function () {
                 }
             }
             var attributes = {};
+            var normalized = {};
             var loadAttribute = function (name, kind) {
                 var uniqueId = extension.attributes[name];
                 if (uniqueId == undefined) {
@@ -851,6 +856,12 @@ var KHR_draco_mesh_compression = /** @class */ (function () {
                     babylonMesh._delayInfo.push(kind);
                 }
                 attributes[kind] = uniqueId;
+                if (_this.useNormalizedFlagFromAccessor) {
+                    var accessor = _glTFLoader__WEBPACK_IMPORTED_MODULE_1__.ArrayItem.TryGet(_this._loader.gltf.accessors, primitive.attributes[name]);
+                    if (accessor) {
+                        normalized[kind] = accessor.normalized || false;
+                    }
+                }
             };
             loadAttribute("POSITION", babylonjs_Meshes_Compression_dracoCompression__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer.PositionKind);
             loadAttribute("NORMAL", babylonjs_Meshes_Compression_dracoCompression__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer.NormalKind);
@@ -868,7 +879,7 @@ var KHR_draco_mesh_compression = /** @class */ (function () {
             if (!bufferView._dracoBabylonGeometry) {
                 bufferView._dracoBabylonGeometry = _this._loader.loadBufferViewAsync("/bufferViews/".concat(bufferView.index), bufferView).then(function (data) {
                     var dracoCompression = _this.dracoCompression || babylonjs_Meshes_Compression_dracoCompression__WEBPACK_IMPORTED_MODULE_0__.DracoCompression.Default;
-                    return dracoCompression.decodeMeshToGeometryAsync(babylonMesh.name, _this._loader.babylonScene, data, attributes).catch(function (error) {
+                    return dracoCompression._decodeMeshToGeometryForGltfAsync(babylonMesh.name, _this._loader.babylonScene, data, attributes, normalized).catch(function (error) {
                         throw new Error("".concat(context, ": ").concat(error.message));
                     });
                 });
@@ -3688,6 +3699,18 @@ var ArrayItem = /** @class */ (function () {
         }
         return array[index];
     };
+    /**
+     * Gets an item from the given array or returns null if not available.
+     * @param array The array to get the item from
+     * @param index The index to the array
+     * @returns The array item or null
+     */
+    ArrayItem.TryGet = function (array, index) {
+        if (!array || index == undefined || !array[index]) {
+            return null;
+        }
+        return array[index];
+    };
     /**
      * Assign an `index` field to each item of the given array.
      * @param array The array of items
@@ -4458,15 +4481,15 @@ var GLTFLoader = /** @class */ (function () {
                 babylonGeometry.setIndices(data);
             }));
         }
-        var loadAttribute = function (attribute, kind, callback) {
-            if (attributes[attribute] == undefined) {
+        var loadAttribute = function (name, kind, callback) {
+            if (attributes[name] == undefined) {
                 return;
             }
             babylonMesh._delayInfo = babylonMesh._delayInfo || [];
             if (babylonMesh._delayInfo.indexOf(kind) === -1) {
                 babylonMesh._delayInfo.push(kind);
             }
-            var accessor = ArrayItem.Get("".concat(context, "/attributes/").concat(attribute), _this._gltf.accessors, attributes[attribute]);
+            var accessor = ArrayItem.Get("".concat(context, "/attributes/").concat(name), _this._gltf.accessors, attributes[name]);
             promises.push(_this._loadVertexAccessorAsync("/accessors/".concat(accessor.index), accessor, kind).then(function (babylonVertexBuffer) {
                 var _a, _b;
                 if (babylonVertexBuffer.getKind() === babylonjs_Misc_deferred__WEBPACK_IMPORTED_MODULE_0__.VertexBuffer.PositionKind && !_this.parent.alwaysComputeBoundingBox && !babylonMesh.skeleton) {