@babylonjs/serializers 5.0.0-alpha.9 → 5.0.0-beta.4

package/glTF/2.0/glTFExporterExtension.js.map

@@ -1 +1 @@
-{"version":3,"file":"glTFExporterExtension.js","sourceRoot":"","sources":["../../../../sourceES6/serializers/src/glTF/2.0/glTFExporterExtension.ts"],"names":[],"mappings":"AAaA,cAAc;AACd,MAAM,CAAC,IAAI,0BAA0B,GAAG,CAAC,CAAC,CAAC,uCAAuC","sourcesContent":["import { ImageMimeType, IMeshPrimitive, INode, IMaterial, ITextureInfo } from \"babylonjs-gltf2interface\";\r\nimport { Node } from \"@babylonjs/core/node\";\r\nimport { Nullable } from \"@babylonjs/core/types\";\r\n\r\nimport { Texture } from \"@babylonjs/core/Materials/Textures/texture\";\r\nimport { SubMesh } from \"@babylonjs/core/Meshes/subMesh\";\r\nimport { IDisposable } from \"@babylonjs/core/scene\";\r\n\r\nimport { _BinaryWriter } from \"./glTFExporter\";\r\nimport { IGLTFExporterExtension } from \"../glTFFileExporter\";\r\nimport { Material } from '@babylonjs/core/Materials/material';\r\nimport { BaseTexture } from '@babylonjs/core/Materials/Textures/baseTexture';\r\n\r\n/** @hidden */\r\nexport var __IGLTFExporterExtensionV2 = 0; // I am here to allow dts to be created\r\n\r\n/**\r\n * Interface for a glTF exporter extension\r\n * @hidden\r\n */\r\nexport interface IGLTFExporterExtensionV2 extends IGLTFExporterExtension, IDisposable {\r\n    /**\r\n     * Define this method to modify the default behavior before exporting a texture\r\n     * @param context The context when loading the asset\r\n     * @param babylonTexture The Babylon.js texture\r\n     * @param mimeType The mime-type of the generated image\r\n     * @returns A promise that resolves with the exported texture\r\n     */\r\n    preExportTextureAsync?(context: string, babylonTexture: Nullable<Texture>, mimeType: ImageMimeType): Promise<Texture>;\r\n\r\n    /**\r\n     * Define this method to get notified when a texture info is created\r\n     * @param context The context when loading the asset\r\n     * @param textureInfo The glTF texture info\r\n     * @param babylonTexture The Babylon.js texture\r\n     */\r\n    postExportTexture?(context: string, textureInfo: ITextureInfo, babylonTexture: BaseTexture): void;\r\n\r\n    /**\r\n     * Define this method to modify the default behavior when exporting texture info\r\n     * @param context The context when loading the asset\r\n     * @param meshPrimitive glTF mesh primitive\r\n     * @param babylonSubMesh Babylon submesh\r\n     * @param binaryWriter glTF serializer binary writer instance\r\n     * @returns nullable IMeshPrimitive promise\r\n     */\r\n    postExportMeshPrimitiveAsync?(context: string, meshPrimitive: Nullable<IMeshPrimitive>, babylonSubMesh: SubMesh, binaryWriter: _BinaryWriter): Promise<IMeshPrimitive>;\r\n\r\n    /**\r\n     * Define this method to modify the default behavior when exporting a node\r\n     * @param context The context when exporting the node\r\n     * @param node glTF node\r\n     * @param babylonNode BabylonJS node\r\n     * @returns nullable INode promise\r\n     */\r\n    postExportNodeAsync?(context: string, node: Nullable<INode>, babylonNode: Node, nodeMap?: {[key: number]: number}): Promise<Nullable<INode>>;\r\n\r\n    /**\r\n     * Define this method to modify the default behavior when exporting a material\r\n     * @param material glTF material\r\n     * @param babylonMaterial BabylonJS material\r\n     * @returns nullable IMaterial promise\r\n     */\r\n    postExportMaterialAsync?(context: string, node: Nullable<IMaterial>, babylonMaterial: Material): Promise<IMaterial>;\r\n\r\n    /**\r\n     * Define this method to return additional textures to export from a material\r\n     * @param material glTF material\r\n     * @param babylonMaterial BabylonJS material\r\n     * @returns List of textures\r\n     */\r\n    postExportMaterialAdditionalTextures?(context: string, node: IMaterial, babylonMaterial: Material): BaseTexture[];\r\n\r\n    /** Gets a boolean indicating that this extension was used */\r\n    wasUsed: boolean;\r\n\r\n    /** Gets a boolean indicating that this extension is required for the file to work */\r\n    required: boolean;\r\n\r\n    /**\r\n     * Called after the exporter state changes to EXPORTING\r\n     */\r\n    onExporting?(): void;\r\n}"]}
+{"version":3,"file":"glTFExporterExtension.js","sourceRoot":"","sources":["../../../../sourceES6/serializers/src/glTF/2.0/glTFExporterExtension.ts"],"names":[],"mappings":"AAaA,cAAc;AACd,MAAM,CAAC,IAAI,0BAA0B,GAAG,CAAC,CAAC,CAAC,uCAAuC","sourcesContent":["import { ImageMimeType, IMeshPrimitive, INode, IMaterial, ITextureInfo } from \"babylonjs-gltf2interface\";\r\nimport { Node } from \"@babylonjs/core/node\";\r\nimport { Nullable } from \"@babylonjs/core/types\";\r\n\r\nimport { Texture } from \"@babylonjs/core/Materials/Textures/texture\";\r\nimport { SubMesh } from \"@babylonjs/core/Meshes/subMesh\";\r\nimport { IDisposable } from \"@babylonjs/core/scene\";\r\n\r\nimport { _BinaryWriter } from \"./glTFExporter\";\r\nimport { IGLTFExporterExtension } from \"../glTFFileExporter\";\r\nimport { Material } from '@babylonjs/core/Materials/material';\r\nimport { BaseTexture } from '@babylonjs/core/Materials/Textures/baseTexture';\r\n\r\n/** @hidden */\r\nexport var __IGLTFExporterExtensionV2 = 0; // I am here to allow dts to be created\r\n\r\n/**\r\n * Interface for a glTF exporter extension\r\n * @hidden\r\n */\r\nexport interface IGLTFExporterExtensionV2 extends IGLTFExporterExtension, IDisposable {\r\n    /**\r\n     * Define this method to modify the default behavior before exporting a texture\r\n     * @param context The context when loading the asset\r\n     * @param babylonTexture The Babylon.js texture\r\n     * @param mimeType The mime-type of the generated image\r\n     * @returns A promise that resolves with the exported texture\r\n     */\r\n    preExportTextureAsync?(context: string, babylonTexture: Nullable<Texture>, mimeType: ImageMimeType): Promise<Texture>;\r\n\r\n    /**\r\n     * Define this method to get notified when a texture info is created\r\n     * @param context The context when loading the asset\r\n     * @param textureInfo The glTF texture info\r\n     * @param babylonTexture The Babylon.js texture\r\n     */\r\n    postExportTexture?(context: string, textureInfo: ITextureInfo, babylonTexture: BaseTexture): void;\r\n\r\n    /**\r\n     * Define this method to modify the default behavior when exporting texture info\r\n     * @param context The context when loading the asset\r\n     * @param meshPrimitive glTF mesh primitive\r\n     * @param babylonSubMesh Babylon submesh\r\n     * @param binaryWriter glTF serializer binary writer instance\r\n     * @returns nullable IMeshPrimitive promise\r\n     */\r\n    postExportMeshPrimitiveAsync?(context: string, meshPrimitive: Nullable<IMeshPrimitive>, babylonSubMesh: SubMesh, binaryWriter: _BinaryWriter): Promise<IMeshPrimitive>;\r\n\r\n    /**\r\n     * Define this method to modify the default behavior when exporting a node\r\n     * @param context The context when exporting the node\r\n     * @param node glTF node\r\n     * @param babylonNode BabylonJS node\r\n     * @returns nullable INode promise\r\n     */\r\n    postExportNodeAsync?(context: string, node: Nullable<INode>, babylonNode: Node, nodeMap?: { [key: number]: number }): Promise<Nullable<INode>>;\r\n\r\n    /**\r\n     * Define this method to modify the default behavior when exporting a material\r\n     * @param material glTF material\r\n     * @param babylonMaterial BabylonJS material\r\n     * @returns nullable IMaterial promise\r\n     */\r\n    postExportMaterialAsync?(context: string, node: Nullable<IMaterial>, babylonMaterial: Material): Promise<IMaterial>;\r\n\r\n    /**\r\n     * Define this method to return additional textures to export from a material\r\n     * @param material glTF material\r\n     * @param babylonMaterial BabylonJS material\r\n     * @returns List of textures\r\n     */\r\n    postExportMaterialAdditionalTextures?(context: string, node: IMaterial, babylonMaterial: Material): BaseTexture[];\r\n\r\n    /** Gets a boolean indicating that this extension was used */\r\n    wasUsed: boolean;\r\n\r\n    /** Gets a boolean indicating that this extension is required for the file to work */\r\n    required: boolean;\r\n\r\n    /**\r\n     * Called after the exporter state changes to EXPORTING\r\n     */\r\n    onExporting?(): void;\r\n}"]}

package/glTF/2.0/glTFMaterialExporter.d.ts

@@ -1,11 +1,11 @@
 import { ITextureInfo, ImageMimeType, IMaterial, IMaterialPbrMetallicRoughness } from "babylonjs-gltf2interface";
 import { Nullable } from "@babylonjs/core/types";
 import { BaseTexture } from "@babylonjs/core/Materials/Textures/baseTexture";
-import { Material } from "@babylonjs/core/Materials/material";
-import { StandardMaterial } from "@babylonjs/core/Materials/standardMaterial";
-import { PBRBaseMaterial } from "@babylonjs/core/Materials/PBR/pbrBaseMaterial";
-import { PBRMetallicRoughnessMaterial } from "@babylonjs/core/Materials/PBR/pbrMetallicRoughnessMaterial";
 import { _Exporter } from "./glTFExporter";
+declare type Material = import("@babylonjs/core/Materials/material").Material;
+declare type StandardMaterial = import("@babylonjs/core/Materials/standardMaterial").StandardMaterial;
+declare type PBRBaseMaterial = import("@babylonjs/core/Materials/PBR/pbrBaseMaterial").PBRBaseMaterial;
+declare type PBRMetallicRoughnessMaterial = import("@babylonjs/core/Materials/PBR/pbrMetallicRoughnessMaterial").PBRMetallicRoughnessMaterial;
 /**
  * Utility methods for working with glTF material conversion properties.  This class should only be used internally
  * @hidden
@@ -45,11 +45,11 @@ export declare class _GLTFMaterialExporter {
      * @param mimeType texture mime type
      * @param images array of images
      * @param textures array of textures
-     * @param materials array of materials
+     * @param materials set of materials
      * @param imageData mapping of texture names to base64 textures
      * @param hasTextureCoords specifies if texture coordinates are present on the material
      */
-    _convertMaterialsToGLTFAsync(babylonMaterials: Material[], mimeType: ImageMimeType, hasTextureCoords: boolean): Promise<void>;
+    _convertMaterialsToGLTFAsync(exportMaterials: Set<Material>, mimeType: ImageMimeType, hasTextureCoords: boolean): Promise<void>;
     /**
      * Makes a copy of the glTF material without the texture parameters
      * @param originalMaterial original glTF material
@@ -62,6 +62,7 @@ export declare class _GLTFMaterialExporter {
      * @returns boolean specifying if texture parameters are present
      */
     _hasTexturesPresent(material: IMaterial): boolean;
+    _getTextureInfo(babylonTexture: Nullable<BaseTexture>): Nullable<ITextureInfo>;
     /**
      * Converts a Babylon StandardMaterial to a glTF Metallic Roughness Material
      * @param babylonStandardMaterial
@@ -226,3 +227,4 @@ export declare class _GLTFMaterialExporter {
      */
     private _getTextureInfoFromBase64;
 }
+export {};

package/glTF/2.0/glTFMaterialExporter.js

@@ -1,14 +1,12 @@
 import { __awaiter, __generator } from "tslib";
-import { Vector2 } from "@babylonjs/core/Maths/math.vector";
-import { Color3 } from "@babylonjs/core/Maths/math.color";
-import { Scalar } from "@babylonjs/core/Maths/math.scalar";
-import { Tools } from "@babylonjs/core/Misc/tools";
-import { TextureTools } from "@babylonjs/core/Misc/textureTools";
-import { Texture } from "@babylonjs/core/Materials/Textures/texture";
-import { RawTexture } from "@babylonjs/core/Materials/Textures/rawTexture";
-import { StandardMaterial } from "@babylonjs/core/Materials/standardMaterial";
-import { PBRBaseMaterial } from "@babylonjs/core/Materials/PBR/pbrBaseMaterial";
-import { Constants } from '@babylonjs/core/Engines/constants';
+import { Vector2 } from "@babylonjs/core/Maths/math.vector.js";
+import { Color3 } from "@babylonjs/core/Maths/math.color.js";
+import { Scalar } from "@babylonjs/core/Maths/math.scalar.js";
+import { Tools } from "@babylonjs/core/Misc/tools.js";
+import { TextureTools } from "@babylonjs/core/Misc/textureTools.js";
+import { Texture } from "@babylonjs/core/Materials/Textures/texture.js";
+import { RawTexture } from "@babylonjs/core/Materials/Textures/rawTexture.js";
+import { Constants } from '@babylonjs/core/Engines/constants.js';
 /**
  * Utility methods for working with glTF material conversion properties.  This class should only be used internally
  * @hidden
@@ -39,24 +37,24 @@ var _GLTFMaterialExporter = /** @class */ (function () {
      * @param mimeType texture mime type
      * @param images array of images
      * @param textures array of textures
-     * @param materials array of materials
+     * @param materials set of materials
      * @param imageData mapping of texture names to base64 textures
      * @param hasTextureCoords specifies if texture coordinates are present on the material
      */
-    _GLTFMaterialExporter.prototype._convertMaterialsToGLTFAsync = function (babylonMaterials, mimeType, hasTextureCoords) {
+    _GLTFMaterialExporter.prototype._convertMaterialsToGLTFAsync = function (exportMaterials, mimeType, hasTextureCoords) {
+        var _this = this;
         var promises = [];
-        for (var _i = 0, babylonMaterials_1 = babylonMaterials; _i < babylonMaterials_1.length; _i++) {
-            var babylonMaterial = babylonMaterials_1[_i];
-            if (babylonMaterial instanceof StandardMaterial) {
-                promises.push(this._convertStandardMaterialAsync(babylonMaterial, mimeType, hasTextureCoords));
+        exportMaterials.forEach(function (material) {
+            if (material.getClassName() === "StandardMaterial") {
+                promises.push(_this._convertStandardMaterialAsync(material, mimeType, hasTextureCoords));
             }
-            else if (babylonMaterial instanceof PBRBaseMaterial) {
-                promises.push(this._convertPBRMaterialAsync(babylonMaterial, mimeType, hasTextureCoords));
+            else if (material.getClassName().indexOf("PBR") !== -1) {
+                promises.push(_this._convertPBRMaterialAsync(material, mimeType, hasTextureCoords));
             }
             else {
-                Tools.Warn("Unsupported material type: " + babylonMaterial.name);
+                Tools.Warn("Unsupported material type: " + material.name);
             }
-        }
+        });
         return Promise.all(promises).then(function () { });
     };
     /**
@@ -88,6 +86,7 @@ var _GLTFMaterialExporter = /** @class */ (function () {
      * @returns boolean specifying if texture parameters are present
      */
     _GLTFMaterialExporter.prototype._hasTexturesPresent = function (material) {
+        var _a;
         if (material.emissiveTexture || material.normalTexture || material.occlusionTexture) {
             return true;
         }
@@ -97,8 +96,25 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                 return true;
             }
         }
+        if (material.extensions) {
+            for (var extension in material.extensions) {
+                var extensionObject = material.extensions[extension];
+                if (extensionObject) {
+                    return (_a = extensionObject.hasTextures) === null || _a === void 0 ? void 0 : _a.call(extensionObject);
+                }
+            }
+        }
         return false;
     };
+    _GLTFMaterialExporter.prototype._getTextureInfo = function (babylonTexture) {
+        if (babylonTexture) {
+            var textureUid = babylonTexture.uid;
+            if (textureUid in this._textureMap) {
+                return this._textureMap[textureUid];
+            }
+        }
+        return null;
+    };
     /**
      * Converts a Babylon StandardMaterial to a glTF Metallic Roughness Material
      * @param babylonStandardMaterial
@@ -485,10 +501,11 @@ var _GLTFMaterialExporter = /** @class */ (function () {
      * @returns pbr metallic roughness interface or null
      */
     _GLTFMaterialExporter.prototype._convertSpecularGlossinessTexturesToMetallicRoughnessAsync = function (diffuseTexture, specularGlossinessTexture, factors, mimeType) {
+        var _a;
         return __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;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         promises = [];
                         if (!(diffuseTexture || specularGlossinessTexture)) {
@@ -497,17 +514,17 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                         scene = diffuseTexture ? diffuseTexture.getScene() : specularGlossinessTexture ? specularGlossinessTexture.getScene() : null;
                         if (!scene) return [3 /*break*/, 3];
                         resizedTextures = this._resizeTexturesToSameDimensions(diffuseTexture, specularGlossinessTexture, scene);
-                        diffuseSize = resizedTextures.texture1.getSize();
+                        diffuseSize = (_a = resizedTextures.texture1) === null || _a === void 0 ? void 0 : _a.getSize();
                         diffuseBuffer = void 0;
                         specularGlossinessBuffer = void 0;
                         width = diffuseSize.width;
                         height = diffuseSize.height;
                         return [4 /*yield*/, resizedTextures.texture1.readPixels()];
                     case 1:
-                        diffusePixels = _a.sent();
+                        diffusePixels = _b.sent();
                         return [4 /*yield*/, resizedTextures.texture2.readPixels()];
                     case 2:
-                        specularPixels = _a.sent();
+                        specularPixels = _b.sent();
                         if (diffusePixels) {
                             diffuseBuffer = this._convertPixelArrayToFloat32(diffusePixels);
                         }
@@ -659,24 +676,24 @@ var _GLTFMaterialExporter = /** @class */ (function () {
      */
     _GLTFMaterialExporter.prototype._convertMetalRoughFactorsToMetallicRoughnessAsync = function (babylonPBRMaterial, mimeType, glTFPbrMetallicRoughness, hasTextureCoords) {
         var promises = [];
-        var baseColor = babylonPBRMaterial.albedoColor || babylonPBRMaterial.baseColor;
-        var metallic = babylonPBRMaterial.metallic || babylonPBRMaterial.metallic;
-        var roughness = babylonPBRMaterial.roughness || babylonPBRMaterial.roughness;
+        var baseColor = babylonPBRMaterial._albedoColor;
+        var metallic = babylonPBRMaterial._metallic;
+        var roughness = babylonPBRMaterial._roughness;
         var metallicRoughness = {
             baseColor: baseColor,
             metallic: metallic,
             roughness: roughness
         };
         if (hasTextureCoords) {
-            var albedoTexture = babylonPBRMaterial.albedoTexture || babylonPBRMaterial.baseTexture;
+            var albedoTexture = babylonPBRMaterial._albedoTexture;
             if (albedoTexture) {
-                promises.push(this._exportTextureAsync(babylonPBRMaterial.albedoTexture, mimeType).then(function (glTFTexture) {
+                promises.push(this._exportTextureAsync(babylonPBRMaterial._albedoTexture, mimeType).then(function (glTFTexture) {
                     if (glTFTexture) {
                         glTFPbrMetallicRoughness.baseColorTexture = glTFTexture;
                     }
                 }));
             }
-            var metallicTexture = babylonPBRMaterial.metallicTexture || babylonPBRMaterial.metallicRoughnessTexture;
+            var metallicTexture = babylonPBRMaterial._metallicTexture;
             if (metallicTexture) {
                 promises.push(this._exportTextureAsync(metallicTexture, mimeType).then(function (glTFTexture) {
                     if (glTFTexture) {
@@ -799,23 +816,25 @@ var _GLTFMaterialExporter = /** @class */ (function () {
         return Promise.resolve().then(function () {
             var samplers = _this._exporter._samplers;
             var textures = _this._exporter._textures;
-            var diffuseColor = babylonPBRMaterial.albedoColor || babylonPBRMaterial.diffuseColor || Color3.White();
-            var specularColor = babylonPBRMaterial.reflectivityColor || babylonPBRMaterial.specularColor || Color3.White();
-            var glossiness = babylonPBRMaterial.microSurface || babylonPBRMaterial.glossiness || 1;
+            var diffuseColor = babylonPBRMaterial._albedoColor;
+            var specularColor = babylonPBRMaterial._reflectivityColor;
+            var glossiness = babylonPBRMaterial._microSurface;
             var specGloss = {
                 diffuseColor: diffuseColor,
                 specularColor: specularColor,
                 glossiness: glossiness,
             };
             var samplerIndex = null;
-            var albedoTexture = babylonPBRMaterial.albedoTexture || babylonPBRMaterial.diffuseTexture;
-            var reflectivityTexture = babylonPBRMaterial.reflectivityTexture || babylonPBRMaterial.specularGlossinessTexture;
-            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 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 || babylonPBRMaterial.useMicroSurfaceFromReflectivityMapAlpha;
+            var useMicrosurfaceFromReflectivityMapAlpha = babylonPBRMaterial._useMicroSurfaceFromReflectivityMapAlpha;
             if (reflectivityTexture && !useMicrosurfaceFromReflectivityMapAlpha) {
                 return Promise.reject("_ConvertPBRMaterial: Glossiness values not included in the reflectivity texture are currently not supported");
             }
@@ -859,7 +878,7 @@ var _GLTFMaterialExporter = /** @class */ (function () {
         };
         var useMetallicRoughness = babylonPBRMaterial.isMetallicWorkflow();
         if (useMetallicRoughness) {
-            var albedoColor = babylonPBRMaterial.albedoColor || babylonPBRMaterial.diffuseColor || babylonPBRMaterial.baseColor;
+            var albedoColor = babylonPBRMaterial._albedoColor;
             var alpha = babylonPBRMaterial.alpha;
             if (albedoColor) {
                 glTFPbrMetallicRoughness.baseColorFactor = [
@@ -900,13 +919,13 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                 glTFPbrMetallicRoughness.roughnessFactor = metallicRoughness.roughness;
             }
             if (babylonPBRMaterial.backFaceCulling != null && !babylonPBRMaterial.backFaceCulling) {
-                if (!(babylonPBRMaterial.twoSidedLighting || babylonPBRMaterial.doubleSided)) {
+                if (!babylonPBRMaterial._twoSidedLighting) {
                     Tools.Warn(babylonPBRMaterial.name + ": Back-face culling enabled and two-sided lighting disabled is not supported in glTF.");
                 }
                 glTFMaterial.doubleSided = true;
             }
             if (hasTextureCoords) {
-                var bumpTexture_1 = babylonPBRMaterial.bumpTexture || babylonPBRMaterial.normalTexture;
+                var bumpTexture_1 = babylonPBRMaterial._bumpTexture;
                 if (bumpTexture_1) {
                     var promise = this._exportTextureAsync(bumpTexture_1, mimeType).then(function (glTFTexture) {
                         if (glTFTexture) {
@@ -918,7 +937,7 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                     });
                     promises.push(promise);
                 }
-                var ambientTexture = babylonPBRMaterial.ambientTexture || babylonPBRMaterial.occlusionTexture;
+                var ambientTexture = babylonPBRMaterial._ambientTexture;
                 if (ambientTexture) {
                     var promise = this._exportTextureAsync(ambientTexture, mimeType).then(function (glTFTexture) {
                         if (glTFTexture) {
@@ -927,7 +946,7 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                                 texCoord: glTFTexture.texCoord
                             };
                             glTFMaterial.occlusionTexture = occlusionTexture;
-                            var ambientTextureStrength = babylonPBRMaterial.ambientTextureStrength || babylonPBRMaterial.occlusionStrength;
+                            var ambientTextureStrength = babylonPBRMaterial._ambientTextureStrength;
                             if (ambientTextureStrength) {
                                 occlusionTexture.strength = ambientTextureStrength;
                             }
@@ -935,7 +954,7 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                     });
                     promises.push(promise);
                 }
-                var emissiveTexture = babylonPBRMaterial.emissiveTexture || babylonPBRMaterial.emissiveTexture;
+                var emissiveTexture = babylonPBRMaterial._emissiveTexture;
                 if (emissiveTexture) {
                     var promise = this._exportTextureAsync(emissiveTexture, mimeType).then(function (glTFTexture) {
                         if (glTFTexture) {
@@ -945,7 +964,7 @@ var _GLTFMaterialExporter = /** @class */ (function () {
                     promises.push(promise);
                 }
             }
-            var emissiveColor = babylonPBRMaterial.emissiveColor || babylonPBRMaterial.emissiveColor;
+            var emissiveColor = babylonPBRMaterial._emissiveColor;
             if (!_GLTFMaterialExporter.FuzzyEquals(emissiveColor, Color3.Black(), _GLTFMaterialExporter._Epsilon)) {
                 glTFMaterial.emissiveFactor = emissiveColor.asArray();
             }