babylonjs-serializers 5.32.1 → 5.32.2

package/babylon.glTF2Serializer.js

@@ -1389,22 +1389,18 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "KHR_texture_transform": () => (/* binding */ KHR_texture_transform)
 /* harmony export */ });
-/* harmony import */ var core_Misc_tools__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core/Materials/Textures/Procedurals/proceduralTexture */ "core/Maths/math.vector");
+/* harmony import */ var core_Misc_tools__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core/Misc/tools */ "core/Maths/math.vector");
 /* harmony import */ var core_Misc_tools__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_Misc_tools__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _glTFExporter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../glTFExporter */ "../../../lts/serializers/dist/glTF/2.0/glTFExporter.js");
-/* harmony import */ var _shaders_textureTransform_fragment__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../shaders/textureTransform.fragment */ "../../../lts/serializers/dist/glTF/2.0/shaders/textureTransform.fragment.js");
-
 
 
 var NAME = "KHR_texture_transform";
-
 /**
  * @internal
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
 var KHR_texture_transform = /** @class */ (function () {
     function KHR_texture_transform() {
-        this._recordedTextures = [];
         /** Name of this extension */
         this.name = NAME;
         /** Defines whether this extension is enabled */
@@ -1414,12 +1410,7 @@ var KHR_texture_transform = /** @class */ (function () {
         /** Reference to the glTF exporter */
         this._wasUsed = false;
     }
-    KHR_texture_transform.prototype.dispose = function () {
-        for (var _i = 0, _a = this._recordedTextures; _i < _a.length; _i++) {
-            var texture = _a[_i];
-            texture.dispose();
-        }
-    };
+    KHR_texture_transform.prototype.dispose = function () { };
     Object.defineProperty(KHR_texture_transform.prototype, "wasUsed", {
         /** @internal */
         get: function () {
@@ -1462,67 +1453,23 @@ var KHR_texture_transform = /** @class */ (function () {
         }
     };
     KHR_texture_transform.prototype.preExportTextureAsync = function (context, babylonTexture) {
-        var _this = this;
         return new Promise(function (resolve, reject) {
             var scene = babylonTexture.getScene();
             if (!scene) {
                 reject("".concat(context, ": \"scene\" is not defined for Babylon texture ").concat(babylonTexture.name, "!"));
                 return;
             }
-            var bakeTextureTransform = false;
             /*
              * The KHR_texture_transform schema only supports rotation around the origin.
-             * the texture must be baked to preserve appearance.
-             * see: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_transform#gltf-schema-updates
+             * See https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_transform#gltf-schema-updates.
              */
             if ((babylonTexture.uAng !== 0 || babylonTexture.wAng !== 0 || babylonTexture.vAng !== 0) &&
                 (babylonTexture.uRotationCenter !== 0 || babylonTexture.vRotationCenter !== 0)) {
-                bakeTextureTransform = true;
-            }
-            if (!bakeTextureTransform) {
-                resolve(babylonTexture);
-                return;
-            }
-            return _this._textureTransformTextureAsync(babylonTexture, scene)
-                .then(function (proceduralTexture) {
-                resolve(proceduralTexture);
-            })
-                .catch(function (e) {
-                reject(e);
-            });
-        });
-    };
-    /**
-     * Transform the babylon texture by the offset, rotation and scale parameters using a procedural texture
-     * @param babylonTexture
-     * @param scene
-     */
-    KHR_texture_transform.prototype._textureTransformTextureAsync = function (babylonTexture, scene) {
-        var _this = this;
-        return new Promise(function (resolve) {
-            var proceduralTexture = new core_Misc_tools__WEBPACK_IMPORTED_MODULE_0__.ProceduralTexture("".concat(babylonTexture.name), babylonTexture.getSize(), "textureTransform", scene);
-            if (!proceduralTexture) {
-                core_Misc_tools__WEBPACK_IMPORTED_MODULE_0__.Tools.Log("Cannot create procedural texture for ".concat(babylonTexture.name, "!"));
-                resolve(babylonTexture);
-            }
-            proceduralTexture.reservedDataStore = {
-                hidden: true,
-                source: babylonTexture,
-            };
-            _this._recordedTextures.push(proceduralTexture);
-            proceduralTexture.coordinatesIndex = babylonTexture.coordinatesIndex;
-            proceduralTexture.setTexture("textureSampler", babylonTexture);
-            proceduralTexture.setMatrix("textureTransformMat", babylonTexture.getTextureMatrix());
-            // isReady trigger creation of effect if it doesnt exist yet
-            if (proceduralTexture.isReady()) {
-                proceduralTexture.render();
-                resolve(proceduralTexture);
+                core_Misc_tools__WEBPACK_IMPORTED_MODULE_0__.Tools.Warn("".concat(context, ": Texture ").concat(babylonTexture.name, " with rotation not centered at the origin cannot be exported with ").concat(NAME));
+                resolve(null);
             }
             else {
-                proceduralTexture.getEffect().executeWhenCompiled(function () {
-                    proceduralTexture.render();
-                    resolve(proceduralTexture);
-                });
+                resolve(babylonTexture);
             }
         });
     };
@@ -3356,8 +3303,8 @@ var _Exporter = /** @class */ (function () {
                         imageData = _this._imageData[image.uri];
                         _this._orderedImageData.push(imageData);
                         imageName = image.uri.split(".")[0] + " image";
-                        bufferView = _glTFUtilities__WEBPACK_IMPORTED_MODULE_3__._GLTFUtilities._CreateBufferView(0, byteOffset, imageData.data.length, undefined, imageName);
-                        byteOffset += imageData.data.buffer.byteLength;
+                        bufferView = _glTFUtilities__WEBPACK_IMPORTED_MODULE_3__._GLTFUtilities._CreateBufferView(0, byteOffset, imageData.data.byteLength, undefined, imageName);
+                        byteOffset += imageData.data.byteLength;
                         _this._bufferViews.push(bufferView);
                         image.bufferView = _this._bufferViews.length - 1;
                         image.name = imageName;
@@ -3514,7 +3461,7 @@ var _Exporter = /** @class */ (function () {
             var glbData = [headerBuffer, jsonChunkBuffer, binaryChunkBuffer, binaryBuffer];
             // binary data
             for (var i = 0; i < _this._orderedImageData.length; ++i) {
-                glbData.push(_this._orderedImageData[i].data.buffer);
+                glbData.push(_this._orderedImageData[i].data);
             }
             glbData.push(binPaddingBuffer);
             glbData.push(imagePaddingBuffer);
@@ -4621,6 +4568,16 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+function getFileExtensionFromMimeType(mimeType) {
+    switch (mimeType) {
+        case "image/jpeg" /* JPEG */:
+            return ".jpg";
+        case "image/png" /* PNG */:
+            return ".png";
+        case "image/webp" /* WEBP */:
+            return ".webp";
+    }
+}
 /**
  * Utility methods for working with glTF material conversion properties.  This class should only be used internally
  * @internal
@@ -4631,6 +4588,8 @@ var _GLTFMaterialExporter = /** @class */ (function () {
          * Mapping to store textures
          */
         this._textureMap = {};
+        // Mapping of internal textures to images to avoid exporting duplicate images.
+        this._internalTextureToImage = {};
         this._textureMap = {};
         this._exporter = exporter;
     }
@@ -4815,68 +4774,68 @@ var _GLTFMaterialExporter = /** @class */ (function () {
         var materialMap = this._exporter._materialMap;
         var materials = this._exporter._materials;
         var promises = [];
-        var glTFPbrMetallicRoughness = this._convertToGLTFPBRMetallicRoughness(babylonStandardMaterial);
-        var glTFMaterial = { name: babylonStandardMaterial.name };
+        var pbrMetallicRoughness = this._convertToGLTFPBRMetallicRoughness(babylonStandardMaterial);
+        var material = { name: babylonStandardMaterial.name };
         if (babylonStandardMaterial.backFaceCulling != null && !babylonStandardMaterial.backFaceCulling) {
             if (!babylonStandardMaterial.twoSidedLighting) {
                 core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Warn(babylonStandardMaterial.name + ": Back-face culling disabled and two-sided lighting disabled is not supported in glTF.");
             }
-            glTFMaterial.doubleSided = true;
+            material.doubleSided = true;
         }
         if (hasTextureCoords) {
             if (babylonStandardMaterial.diffuseTexture) {
-                promises.push(this._exportTextureAsync(babylonStandardMaterial.diffuseTexture, mimeType).then(function (glTFTexture) {
-                    if (glTFTexture) {
-                        glTFPbrMetallicRoughness.baseColorTexture = glTFTexture;
+                promises.push(this._exportTextureAsync(babylonStandardMaterial.diffuseTexture, mimeType).then(function (textureInfo) {
+                    if (textureInfo) {
+                        pbrMetallicRoughness.baseColorTexture = textureInfo;
                     }
                 }));
             }
-            if (babylonStandardMaterial.bumpTexture) {
-                promises.push(this._exportTextureAsync(babylonStandardMaterial.bumpTexture, mimeType).then(function (glTFTexture) {
-                    if (glTFTexture) {
-                        glTFMaterial.normalTexture = glTFTexture;
-                        if (babylonStandardMaterial.bumpTexture != null && babylonStandardMaterial.bumpTexture.level !== 1) {
-                            glTFMaterial.normalTexture.scale = babylonStandardMaterial.bumpTexture.level;
+            var bumpTexture_1 = babylonStandardMaterial.bumpTexture;
+            if (bumpTexture_1) {
+                promises.push(this._exportTextureAsync(bumpTexture_1, mimeType).then(function (textureInfo) {
+                    if (textureInfo) {
+                        material.normalTexture = textureInfo;
+                        if (bumpTexture_1.level !== 1) {
+                            material.normalTexture.scale = bumpTexture_1.level;
                         }
                     }
                 }));
             }
             if (babylonStandardMaterial.emissiveTexture) {
-                glTFMaterial.emissiveFactor = [1.0, 1.0, 1.0];
-                promises.push(this._exportTextureAsync(babylonStandardMaterial.emissiveTexture, mimeType).then(function (glTFEmissiveTexture) {
-                    if (glTFEmissiveTexture) {
-                        glTFMaterial.emissiveTexture = glTFEmissiveTexture;
+                material.emissiveFactor = [1.0, 1.0, 1.0];
+                promises.push(this._exportTextureAsync(babylonStandardMaterial.emissiveTexture, mimeType).then(function (textureInfo) {
+                    if (textureInfo) {
+                        material.emissiveTexture = textureInfo;
                     }
                 }));
             }
             if (babylonStandardMaterial.ambientTexture) {
-                promises.push(this._exportTextureAsync(babylonStandardMaterial.ambientTexture, mimeType).then(function (glTFTexture) {
-                    if (glTFTexture) {
+                promises.push(this._exportTextureAsync(babylonStandardMaterial.ambientTexture, mimeType).then(function (textureInfo) {
+                    if (textureInfo) {
                         var occlusionTexture = {
-                            index: glTFTexture.index,
+                            index: textureInfo.index,
                         };
-                        glTFMaterial.occlusionTexture = occlusionTexture;
-                        occlusionTexture.strength = 1.0;
+                        material.occlusionTexture = occlusionTexture;
                     }
                 }));
             }
         }
         if (babylonStandardMaterial.alpha < 1.0 || babylonStandardMaterial.opacityTexture) {
             if (babylonStandardMaterial.alphaMode === core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Constants.ALPHA_COMBINE) {
-                glTFMaterial.alphaMode = "BLEND" /* BLEND */;
+                material.alphaMode = "BLEND" /* BLEND */;
             }
             else {
                 core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Warn(babylonStandardMaterial.name + ": glTF 2.0 does not support alpha mode: " + babylonStandardMaterial.alphaMode.toString());
             }
         }
         if (babylonStandardMaterial.emissiveColor && !_GLTFMaterialExporter._FuzzyEquals(babylonStandardMaterial.emissiveColor, core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Color3.Black(), _GLTFMaterialExporter._Epsilon)) {
-            glTFMaterial.emissiveFactor = babylonStandardMaterial.emissiveColor.asArray();
+            material.emissiveFactor = babylonStandardMaterial.emissiveColor.asArray();
         }
-        glTFMaterial.pbrMetallicRoughness = glTFPbrMetallicRoughness;
-        _GLTFMaterialExporter._SetAlphaMode(glTFMaterial, babylonStandardMaterial);
-        materials.push(glTFMaterial);
+        material.pbrMetallicRoughness = pbrMetallicRoughness;
+        _GLTFMaterialExporter._SetAlphaMode(material, babylonStandardMaterial);
+        materials.push(material);
         materialMap[babylonStandardMaterial.uniqueId] = materials.length - 1;
-        return this._finishMaterial(promises, glTFMaterial, babylonStandardMaterial, mimeType);
+        return this._finishMaterial(promises, material, babylonStandardMaterial, mimeType);
     };
     _GLTFMaterialExporter.prototype._finishMaterial = function (promises, glTFMaterial, babylonMaterial, mimeType) {
         var _this = this;
@@ -4910,11 +4869,9 @@ var _GLTFMaterialExporter = /** @class */ (function () {
      * @param mimeType mimetype of the image
      * @returns base64 image string
      */
-    _GLTFMaterialExporter.prototype._createBase64FromCanvasAsync = function (buffer, width, height, mimeType) {
-        var _this = this;
-        // eslint-disable-next-line no-async-promise-executor
-        return new Promise(function (resolve) { return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__awaiter)(_this, void 0, void 0, function () {
-            var textureType, hostingScene, engine, tempTexture, data, base64;
+    _GLTFMaterialExporter.prototype._getImageDataAsync = function (buffer, width, height, mimeType) {
+        return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__awaiter)(this, void 0, void 0, function () {
+            var textureType, hostingScene, engine, tempTexture, data;
             return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4928,14 +4885,11 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                         return [4 /*yield*/, engine._readTexturePixels(tempTexture, width, height)];
                     case 2:
                         data = _a.sent();
-                        return [4 /*yield*/, core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.DumpDataAsync(width, height, data, mimeType, undefined, true, false)];
-                    case 3:
-                        base64 = _a.sent();
-                        resolve(base64);
-                        return [2 /*return*/];
+                        return [4 /*yield*/, core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.DumpDataAsync(width, height, data, mimeType, undefined, true, true)];
+                    case 3: return [2 /*return*/, (_a.sent())];
                 }
             });
-        }); });
+        });
     };
     /**
      * Generates a white texture based on the specified width and height
@@ -5026,11 +4980,11 @@ var _GLTFMaterialExporter = /** @class */ (function () {
     _GLTFMaterialExporter.prototype._convertSpecularGlossinessTexturesToMetallicRoughnessAsync = function (diffuseTexture, specularGlossinessTexture, factors, mimeType) {
         var _a;
         return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__awaiter)(this, void 0, void 0, function () {
-            var promises, scene, resizedTextures, diffuseSize, diffuseBuffer, specularGlossinessBuffer, width, height, diffusePixels, specularPixels, byteLength, metallicRoughnessBuffer, baseColorBuffer, strideSize, maxBaseColor, maxMetallic, maxRoughness, h, w, offset, diffuseColor, specularColor, glossiness, specularGlossiness, metallicRoughness, metallicRoughnessFactors_1, writeOutMetallicRoughnessTexture, writeOutBaseColorTexture, h, w, destinationOffset, linearBaseColorPixel, sRGBBaseColorPixel, metallicRoughnessPixel, promise, promise;
+            var promises, scene, resizedTextures, diffuseSize, diffuseBuffer, specularGlossinessBuffer, width, height, diffusePixels, specularPixels, byteLength, metallicRoughnessBuffer, baseColorBuffer, strideSize, maxBaseColor, maxMetallic, maxRoughness, h, w, offset, diffuseColor, specularColor, glossiness, specularGlossiness, metallicRoughness, metallicRoughnessFactors_1, writeOutMetallicRoughnessTexture, writeOutBaseColorTexture, h, w, destinationOffset, linearBaseColorPixel, sRGBBaseColorPixel, metallicRoughnessPixel;
             return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        promises = [];
+                        promises = new Array();
                         if (!(diffuseTexture || specularGlossinessTexture)) {
                             return [2 /*return*/, Promise.reject("_ConvertSpecularGlosinessTexturesToMetallicRoughness: diffuse and specular glossiness textures are not defined!")];
                         }
@@ -5127,16 +5081,14 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                             }
                         }
                         if (writeOutMetallicRoughnessTexture) {
-                            promise = this._createBase64FromCanvasAsync(metallicRoughnessBuffer, width, height, mimeType).then(function (metallicRoughnessBase64) {
-                                metallicRoughnessFactors_1.metallicRoughnessTextureBase64 = metallicRoughnessBase64;
-                            });
-                            promises.push(promise);
+                            promises.push(this._getImageDataAsync(metallicRoughnessBuffer, width, height, mimeType).then(function (data) {
+                                metallicRoughnessFactors_1.metallicRoughnessTextureData = data;
+                            }));
                         }
                         if (writeOutBaseColorTexture) {
-                            promise = this._createBase64FromCanvasAsync(baseColorBuffer, width, height, mimeType).then(function (baseColorBase64) {
-                                metallicRoughnessFactors_1.baseColorTextureBase64 = baseColorBase64;
-                            });
-                            promises.push(promise);
+                            promises.push(this._getImageDataAsync(baseColorBuffer, width, height, mimeType).then(function (data) {
+                                metallicRoughnessFactors_1.baseColorTextureData = data;
+                            }));
                         }
                         return [2 /*return*/, Promise.all(promises).then(function () {
                                 return metallicRoughnessFactors_1;
@@ -5231,71 +5183,79 @@ var _GLTFMaterialExporter = /** @class */ (function () {
             return metallicRoughness;
         });
     };
-    _GLTFMaterialExporter.prototype._getGLTFTextureSampler = function (texture) {
-        var sampler = this._getGLTFTextureWrapModesSampler(texture);
-        var samplingMode = texture instanceof core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture ? texture.samplingMode : null;
-        if (samplingMode != null) {
-            switch (samplingMode) {
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_LINEAR: {
-                    sampler.magFilter = 9729 /* LINEAR */;
-                    sampler.minFilter = 9729 /* LINEAR */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_NEAREST: {
-                    sampler.magFilter = 9729 /* LINEAR */;
-                    sampler.minFilter = 9728 /* NEAREST */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_LINEAR: {
-                    sampler.magFilter = 9728 /* NEAREST */;
-                    sampler.minFilter = 9729 /* LINEAR */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_LINEAR_MIPLINEAR: {
-                    sampler.magFilter = 9728 /* NEAREST */;
-                    sampler.minFilter = 9987 /* LINEAR_MIPMAP_LINEAR */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_NEAREST: {
-                    sampler.magFilter = 9728 /* NEAREST */;
-                    sampler.minFilter = 9728 /* NEAREST */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_LINEAR_MIPNEAREST: {
-                    sampler.magFilter = 9728 /* NEAREST */;
-                    sampler.minFilter = 9985 /* LINEAR_MIPMAP_NEAREST */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_NEAREST_MIPNEAREST: {
-                    sampler.magFilter = 9729 /* LINEAR */;
-                    sampler.minFilter = 9984 /* NEAREST_MIPMAP_NEAREST */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_NEAREST_MIPLINEAR: {
-                    sampler.magFilter = 9729 /* LINEAR */;
-                    sampler.minFilter = 9986 /* NEAREST_MIPMAP_LINEAR */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_NEAREST_MIPLINEAR: {
-                    sampler.magFilter = 9728 /* NEAREST */;
-                    sampler.minFilter = 9986 /* NEAREST_MIPMAP_LINEAR */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_LINEAR_MIPLINEAR: {
-                    sampler.magFilter = 9729 /* LINEAR */;
-                    sampler.minFilter = 9987 /* LINEAR_MIPMAP_LINEAR */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_LINEAR_MIPNEAREST: {
-                    sampler.magFilter = 9729 /* LINEAR */;
-                    sampler.minFilter = 9985 /* LINEAR_MIPMAP_NEAREST */;
-                    break;
-                }
-                case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_NEAREST_MIPNEAREST: {
-                    sampler.magFilter = 9728 /* NEAREST */;
-                    sampler.minFilter = 9984 /* NEAREST_MIPMAP_NEAREST */;
-                    break;
-                }
+    _GLTFMaterialExporter.prototype._getTextureSampler = function (texture) {
+        var sampler = {};
+        if (!texture || !(texture instanceof core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture)) {
+            return sampler;
+        }
+        var wrapS = this._getGLTFTextureWrapMode(texture.wrapU);
+        if (wrapS !== 10497 /* REPEAT */) {
+            sampler.wrapS = wrapS;
+        }
+        var wrapT = this._getGLTFTextureWrapMode(texture.wrapV);
+        if (wrapT !== 10497 /* REPEAT */) {
+            sampler.wrapT = wrapT;
+        }
+        switch (texture.samplingMode) {
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_LINEAR: {
+                sampler.magFilter = 9729 /* LINEAR */;
+                sampler.minFilter = 9729 /* LINEAR */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_NEAREST: {
+                sampler.magFilter = 9729 /* LINEAR */;
+                sampler.minFilter = 9728 /* NEAREST */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_LINEAR: {
+                sampler.magFilter = 9728 /* NEAREST */;
+                sampler.minFilter = 9729 /* LINEAR */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_LINEAR_MIPLINEAR: {
+                sampler.magFilter = 9728 /* NEAREST */;
+                sampler.minFilter = 9987 /* LINEAR_MIPMAP_LINEAR */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_NEAREST: {
+                sampler.magFilter = 9728 /* NEAREST */;
+                sampler.minFilter = 9728 /* NEAREST */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_LINEAR_MIPNEAREST: {
+                sampler.magFilter = 9728 /* NEAREST */;
+                sampler.minFilter = 9985 /* LINEAR_MIPMAP_NEAREST */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_NEAREST_MIPNEAREST: {
+                sampler.magFilter = 9729 /* LINEAR */;
+                sampler.minFilter = 9984 /* NEAREST_MIPMAP_NEAREST */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_NEAREST_MIPLINEAR: {
+                sampler.magFilter = 9729 /* LINEAR */;
+                sampler.minFilter = 9986 /* NEAREST_MIPMAP_LINEAR */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_NEAREST_MIPLINEAR: {
+                sampler.magFilter = 9728 /* NEAREST */;
+                sampler.minFilter = 9986 /* NEAREST_MIPMAP_LINEAR */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_LINEAR_MIPLINEAR: {
+                sampler.magFilter = 9729 /* LINEAR */;
+                sampler.minFilter = 9987 /* LINEAR_MIPMAP_LINEAR */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.LINEAR_LINEAR_MIPNEAREST: {
+                sampler.magFilter = 9729 /* LINEAR */;
+                sampler.minFilter = 9985 /* LINEAR_MIPMAP_NEAREST */;
+                break;
+            }
+            case core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.NEAREST_NEAREST_MIPNEAREST: {
+                sampler.magFilter = 9728 /* NEAREST */;
+                sampler.minFilter = 9984 /* NEAREST_MIPMAP_NEAREST */;
+                break;
             }
         }
         return sampler;
@@ -5317,15 +5277,6 @@ var _GLTFMaterialExporter = /** @class */ (function () {
             }
         }
     };
-    _GLTFMaterialExporter.prototype._getGLTFTextureWrapModesSampler = function (texture) {
-        var wrapS = this._getGLTFTextureWrapMode(texture instanceof core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture ? texture.wrapU : core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.WRAP_ADDRESSMODE);
-        var wrapT = this._getGLTFTextureWrapMode(texture instanceof core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture ? texture.wrapV : core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Texture.WRAP_ADDRESSMODE);
-        if (wrapS === 10497 /* REPEAT */ && wrapT === 10497 /* REPEAT */) {
-            // default wrapping mode in glTF, so omitting
-            return {};
-        }
-        return { wrapS: wrapS, wrapT: wrapT };
-    };
     /**
      * Convert a PBRMaterial (Specular/Glossiness) to Metallic Roughness factors
      * @param babylonPBRMaterial BJS PBR Metallic Roughness Material
@@ -5334,46 +5285,31 @@ var _GLTFMaterialExporter = /** @class */ (function () {
      * @param hasTextureCoords specifies if texture coordinates are present on the submesh to determine if textures should be applied
      * @returns glTF PBR Metallic Roughness factors
      */
-    _GLTFMaterialExporter.prototype._convertSpecGlossFactorsToMetallicRoughnessAsync = function (babylonPBRMaterial, mimeType, glTFPbrMetallicRoughness, hasTextureCoords) {
+    _GLTFMaterialExporter.prototype._convertSpecGlossFactorsToMetallicRoughnessAsync = function (babylonPBRMaterial, mimeType, pbrMetallicRoughness, hasTextureCoords) {
         var _this = this;
         return Promise.resolve().then(function () {
-            var samplers = _this._exporter._samplers;
-            var textures = _this._exporter._textures;
-            var diffuseColor = babylonPBRMaterial._albedoColor;
-            var specularColor = babylonPBRMaterial._reflectivityColor;
-            var glossiness = babylonPBRMaterial._microSurface;
             var specGloss = {
-                diffuseColor: diffuseColor,
-                specularColor: specularColor,
-                glossiness: glossiness,
+                diffuseColor: babylonPBRMaterial._albedoColor,
+                specularColor: babylonPBRMaterial._reflectivityColor,
+                glossiness: babylonPBRMaterial._microSurface,
             };
-            var samplerIndex = null;
             var albedoTexture = babylonPBRMaterial._albedoTexture;
             var reflectivityTexture = babylonPBRMaterial._reflectivityTexture;
-            if (albedoTexture) {
-                var sampler = _this._getGLTFTextureSampler(albedoTexture);
-                if (sampler.magFilter != null && sampler.minFilter != null && sampler.wrapS != null && sampler.wrapT != null) {
-                    samplers.push(sampler);
-                    samplerIndex = samplers.length - 1;
-                }
-            }
             var useMicrosurfaceFromReflectivityMapAlpha = babylonPBRMaterial._useMicroSurfaceFromReflectivityMapAlpha;
             if (reflectivityTexture && !useMicrosurfaceFromReflectivityMapAlpha) {
                 return Promise.reject("_ConvertPBRMaterial: Glossiness values not included in the reflectivity texture are currently not supported");
             }
             if ((albedoTexture || reflectivityTexture) && hasTextureCoords) {
+                var samplerIndex_1 = _this._exportTextureSampler(albedoTexture || reflectivityTexture);
                 return _this._convertSpecularGlossinessTexturesToMetallicRoughnessAsync(albedoTexture, reflectivityTexture, specGloss, mimeType).then(function (metallicRoughnessFactors) {
-                    if (metallicRoughnessFactors.baseColorTextureBase64) {
-                        var glTFBaseColorTexture = _this._getTextureInfoFromBase64(metallicRoughnessFactors.baseColorTextureBase64, "bjsBaseColorTexture_" + textures.length + ".png", mimeType, albedoTexture ? albedoTexture.coordinatesIndex : null, samplerIndex);
-                        if (glTFBaseColorTexture) {
-                            glTFPbrMetallicRoughness.baseColorTexture = glTFBaseColorTexture;
-                        }
+                    var textures = _this._exporter._textures;
+                    if (metallicRoughnessFactors.baseColorTextureData) {
+                        var imageIndex = _this._exportImage("baseColor".concat(textures.length), mimeType, metallicRoughnessFactors.baseColorTextureData);
+                        pbrMetallicRoughness.baseColorTexture = _this._exportTextureInfo(imageIndex, samplerIndex_1, albedoTexture === null || albedoTexture === void 0 ? void 0 : albedoTexture.coordinatesIndex);
                     }
-                    if (metallicRoughnessFactors.metallicRoughnessTextureBase64) {
-                        var glTFMRColorTexture = _this._getTextureInfoFromBase64(metallicRoughnessFactors.metallicRoughnessTextureBase64, "bjsMetallicRoughnessTexture_" + textures.length + ".png", mimeType, reflectivityTexture ? reflectivityTexture.coordinatesIndex : null, samplerIndex);
-                        if (glTFMRColorTexture) {
-                            glTFPbrMetallicRoughness.metallicRoughnessTexture = glTFMRColorTexture;
-                        }
+                    if (metallicRoughnessFactors.metallicRoughnessTextureData) {
+                        var imageIndex = _this._exportImage("metallicRoughness".concat(textures.length), mimeType, metallicRoughnessFactors.metallicRoughnessTextureData);
+                        pbrMetallicRoughness.metallicRoughnessTexture = _this._exportTextureInfo(imageIndex, samplerIndex_1, reflectivityTexture === null || reflectivityTexture === void 0 ? void 0 : reflectivityTexture.coordinatesIndex);
                     }
                     return metallicRoughnessFactors;
                 });
@@ -5435,13 +5371,13 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                 glTFMaterial.doubleSided = true;
             }
             if (hasTextureCoords) {
-                var bumpTexture_1 = babylonPBRMaterial._bumpTexture;
-                if (bumpTexture_1) {
-                    var promise = this._exportTextureAsync(bumpTexture_1, mimeType).then(function (glTFTexture) {
+                var bumpTexture_2 = babylonPBRMaterial._bumpTexture;
+                if (bumpTexture_2) {
+                    var promise = this._exportTextureAsync(bumpTexture_2, mimeType).then(function (glTFTexture) {
                         if (glTFTexture) {
                             glTFMaterial.normalTexture = glTFTexture;
-                            if (bumpTexture_1.level !== 1) {
-                                glTFMaterial.normalTexture.scale = bumpTexture_1.level;
+                            if (bumpTexture_2.level !== 1) {
+                                glTFMaterial.normalTexture.scale = bumpTexture_2.level;
                             }
                         }
                     });
@@ -5510,10 +5446,8 @@ var _GLTFMaterialExporter = /** @class */ (function () {
         });
     };
     _GLTFMaterialExporter.prototype._exportTextureInfoAsync = function (babylonTexture, mimeType) {
-        var _this = this;
-        return Promise.resolve().then(function () { return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__awaiter)(_this, void 0, void 0, function () {
-            var textureUid, pixels, samplers, sampler, samplerIndex_1, foundSamplerIndex, i, s, size;
-            var _this = this;
+        return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__awaiter)(this, void 0, void 0, function () {
+            var textureUid, pixels, samplerIndex, textureMimeType, internalTextureToImage, internalTextureUniqueId, imageIndex, size, data, textureInfo;
             return (0,tslib__WEBPACK_IMPORTED_MODULE_0__.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5526,118 +5460,86 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                         if (!pixels) {
                             return [2 /*return*/, null];
                         }
-                        samplers = this._exporter._samplers;
-                        sampler = this._getGLTFTextureSampler(babylonTexture);
-                        samplerIndex_1 = null;
-                        foundSamplerIndex = null;
-                        for (i = 0; i < samplers.length; ++i) {
-                            s = samplers[i];
-                            if (s.minFilter === sampler.minFilter && s.magFilter === sampler.magFilter && s.wrapS === sampler.wrapS && s.wrapT === sampler.wrapT) {
-                                foundSamplerIndex = i;
-                                break;
-                            }
-                        }
-                        if (foundSamplerIndex == null) {
-                            samplers.push(sampler);
-                            samplerIndex_1 = samplers.length - 1;
-                        }
-                        else {
-                            samplerIndex_1 = foundSamplerIndex;
-                        }
-                        size = babylonTexture.getSize();
-                        // Preserve texture mime type if defined
-                        if (babylonTexture.mimeType) {
-                            switch (babylonTexture.mimeType) {
+                        samplerIndex = this._exportTextureSampler(babylonTexture);
+                        textureMimeType = babylonTexture.mimeType;
+                        if (textureMimeType) {
+                            switch (textureMimeType) {
                                 case "image/jpeg":
-                                    mimeType = "image/jpeg" /* JPEG */;
-                                    break;
                                 case "image/png":
-                                    mimeType = "image/png" /* PNG */;
-                                    break;
                                 case "image/webp":
-                                    mimeType = "image/webp" /* WEBP */;
+                                    mimeType = textureMimeType;
+                                    break;
+                                default:
+                                    core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Warn("Unsupported media type: ${textureMimeType}");
                                     break;
                             }
                         }
-                        return [2 /*return*/, this._createBase64FromCanvasAsync(pixels, size.width, size.height, mimeType).then(function (base64Data) {
-                                var textureInfo = _this._getTextureInfoFromBase64(base64Data, babylonTexture.name.replace(/\.\/|\/|\.\\|\\/g, "_"), mimeType, babylonTexture.coordinatesIndex, samplerIndex_1);
-                                if (textureInfo) {
-                                    _this._textureMap[textureUid] = textureInfo;
-                                    _this._exporter._extensionsPostExportTextures("linkTextureInfo", textureInfo, babylonTexture);
-                                }
-                                return textureInfo;
-                            })];
+                        internalTextureToImage = this._internalTextureToImage;
+                        internalTextureUniqueId = babylonTexture.getInternalTexture().uniqueId;
+                        internalTextureToImage[internalTextureUniqueId] || (internalTextureToImage[internalTextureUniqueId] = {});
+                        imageIndex = internalTextureToImage[internalTextureUniqueId][mimeType];
+                        if (!(imageIndex === undefined)) return [3 /*break*/, 4];
+                        size = babylonTexture.getSize();
+                        return [4 /*yield*/, this._getImageDataAsync(pixels, size.width, size.height, mimeType)];
+                    case 3:
+                        data = _a.sent();
+                        imageIndex = this._exportImage(babylonTexture.name, mimeType, data);
+                        internalTextureToImage[internalTextureUniqueId][mimeType] = imageIndex;
+                        _a.label = 4;
+                    case 4:
+                        textureInfo = this._exportTextureInfo(imageIndex, samplerIndex, babylonTexture.coordinatesIndex);
+                        this._textureMap[textureUid] = textureInfo;
+                        return [2 /*return*/, textureInfo];
                 }
             });
-        }); });
+        });
     };
-    /**
-     * Builds a texture from base64 string
-     * @param base64Texture base64 texture string
-     * @param baseTextureName Name to use for the texture
-     * @param mimeType image mime type for the texture
-     * @param texCoordIndex
-     * @param samplerIndex
-     * @returns glTF texture info, or null if the texture format is not supported
-     */
-    _GLTFMaterialExporter.prototype._getTextureInfoFromBase64 = function (base64Texture, baseTextureName, mimeType, texCoordIndex, samplerIndex) {
-        var textures = this._exporter._textures;
-        var images = this._exporter._images;
+    _GLTFMaterialExporter.prototype._exportImage = function (name, mimeType, data) {
         var imageData = this._exporter._imageData;
-        var textureInfo = null;
-        var glTFTexture = {
-            source: images.length,
-            name: baseTextureName,
+        var baseName = name.replace(/\.\/|\/|\.\\|\\/g, "_");
+        var extension = getFileExtensionFromMimeType(mimeType);
+        var fileName = baseName + extension;
+        if (fileName in imageData) {
+            fileName = "".concat(baseName, "_").concat(core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.RandomId()).concat(extension);
+        }
+        imageData[fileName] = {
+            data: data,
+            mimeType: mimeType,
         };
-        if (samplerIndex != null) {
-            glTFTexture.sampler = samplerIndex;
-        }
-        var binStr = atob(base64Texture.split(",")[1]);
-        var arrBuff = new ArrayBuffer(binStr.length);
-        var arr = new Uint8Array(arrBuff);
-        for (var i = 0, length_2 = binStr.length; i < length_2; ++i) {
-            arr[i] = binStr.charCodeAt(i);
-        }
-        var imageValues = { data: arr, mimeType: mimeType };
-        var extension = mimeType === "image/jpeg" /* JPEG */ ? ".jpeg" : ".png";
-        var textureName = baseTextureName + extension;
-        var originalTextureName = textureName;
-        if (textureName in imageData) {
-            textureName = "".concat(baseTextureName, "_").concat(core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.RandomId()).concat(extension);
-        }
-        imageData[textureName] = imageValues;
-        if (mimeType === "image/jpeg" /* JPEG */ || mimeType === "image/png" /* PNG */ || mimeType === "image/webp" /* WEBP */) {
-            var glTFImage = {
-                name: baseTextureName,
-                uri: textureName,
-            };
-            var foundIndex = null;
-            for (var i = 0; i < images.length; ++i) {
-                if (images[i].uri === originalTextureName) {
-                    foundIndex = i;
-                    break;
-                }
-            }
-            if (foundIndex == null) {
-                images.push(glTFImage);
-                glTFTexture.source = images.length - 1;
-            }
-            else {
-                glTFTexture.source = foundIndex;
-            }
-            textures.push(glTFTexture);
-            textureInfo = {
-                index: textures.length - 1,
-            };
-            if (texCoordIndex != null) {
-                textureInfo.texCoord = texCoordIndex;
-            }
+        var images = this._exporter._images;
+        images.push({
+            name: name,
+            uri: fileName,
+        });
+        return images.length - 1;
+    };
+    _GLTFMaterialExporter.prototype._exportTextureInfo = function (imageIndex, samplerIndex, coordinatesIndex) {
+        var textures = this._exporter._textures;
+        var textureIndex = textures.findIndex(function (t) { return t.sampler == samplerIndex && t.source === imageIndex; });
+        if (textureIndex === -1) {
+            textureIndex = textures.length;
+            textures.push({
+                source: imageIndex,
+                sampler: samplerIndex,
+            });
         }
-        else {
-            core_Maths_math_vector__WEBPACK_IMPORTED_MODULE_1__.Tools.Error("Unsupported texture mime type ".concat(mimeType));
+        var textureInfo = { index: textureIndex };
+        if (coordinatesIndex) {
+            textureInfo.texCoord = coordinatesIndex;
         }
         return textureInfo;
     };
+    _GLTFMaterialExporter.prototype._exportTextureSampler = function (texture) {
+        var sampler = this._getTextureSampler(texture);
+        // if a pre-existing sampler with identical parameters exists, then reuse the previous sampler
+        var samplers = this._exporter._samplers;
+        var samplerIndex = samplers.findIndex(function (s) { return s.minFilter === sampler.minFilter && s.magFilter === sampler.magFilter && s.wrapS === sampler.wrapS && s.wrapT === sampler.wrapT; });
+        if (samplerIndex !== -1) {
+            return samplerIndex;
+        }
+        samplers.push(sampler);
+        return samplers.length - 1;
+    };
     /**
      * Represents the dielectric specular values for R, G and B
      */
@@ -5993,30 +5895,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-/***/ }),
-
-/***/ "../../../lts/serializers/dist/glTF/2.0/shaders/textureTransform.fragment.js":
-/*!***********************************************************************************!*\
-  !*** ../../../lts/serializers/dist/glTF/2.0/shaders/textureTransform.fragment.js ***!
-  \***********************************************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "textureTransformPixelShader": () => (/* binding */ textureTransformPixelShader)
-/* harmony export */ });
-/* harmony import */ var core_Engines_shaderStore__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core/Engines/shaderStore */ "core/Maths/math.vector");
-/* harmony import */ var core_Engines_shaderStore__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_Engines_shaderStore__WEBPACK_IMPORTED_MODULE_0__);
-// Do not edit.
-
-var name = "textureTransformPixelShader";
-var shader = "precision highp float;varying vec2 vUV;uniform sampler2D textureSampler;uniform mat4 textureTransformMat;void main(void) {\n#define CUSTOM_FRAGMENT_MAIN_BEGIN\nvec2 uvTransformed=(textureTransformMat*vec4(vUV.xy,1,1)).xy;gl_FragColor=texture2D(textureSampler,uvTransformed);\n#define CUSTOM_FRAGMENT_MAIN_END\n}";
-// Sideeffect
-core_Engines_shaderStore__WEBPACK_IMPORTED_MODULE_0__.ShaderStore.ShadersStore[name] = shader;
-/** @internal */
-var textureTransformPixelShader = { name: name, shader: shader };
-
-
 /***/ }),
 
 /***/ "../../../lts/serializers/dist/glTF/glTFFileExporter.js":