@babylonjs/serializers 5.0.0-alpha.60 → 5.0.0-alpha.64

package/glTF/2.0/glTFExporter.d.ts

@@ -333,6 +333,13 @@ export declare class _Exporter {
      * @param binaryWriter Buffer to write binary data to
      */
     private createSceneAsync;
+    /**
+     * Getting the nodes and materials that would be exported.
+     * @param nodes Babylon transform nodes
+     * @returns Array of nodes which would be exported.
+     * @returns Set of materials which would be exported.
+     */
+    private getExportNodes;
     /**
      * Creates a mapping of Node unique id to node index and handles animations
      * @param babylonScene Babylon Scene

package/glTF/2.0/glTFExporter.js

@@ -1,5 +1,5 @@
 import { __spreadArray } from "tslib";
-import { Vector2, Vector3, Vector4, Quaternion, Matrix } from "@babylonjs/core/Maths/math.vector.js";
+import { Vector2, Vector3, Vector4, Quaternion } from "@babylonjs/core/Maths/math.vector.js";
 import { Color3, Color4 } from "@babylonjs/core/Maths/math.color.js";
 import { Tools } from "@babylonjs/core/Misc/tools.js";
 import { VertexBuffer } from "@babylonjs/core/Buffers/buffer.js";
@@ -12,7 +12,6 @@ import { _GLTFMaterialExporter } from "./glTFMaterialExporter.js";
 import { _GLTFUtilities } from "./glTFUtilities.js";
 import { GLTFData } from "./glTFData.js";
 import { _GLTFAnimation } from "./glTFAnimation.js";
-import { Epsilon } from '@babylonjs/core/Maths/math.constants.js';
 /**
  * Converts Babylon Scene into glTF 2.0.
  * @hidden
@@ -1272,7 +1271,7 @@ var _Exporter = /** @class */ (function () {
                         var attribute = attributeData_2[_d];
                         var attributeKind = attribute.kind;
                         if ((attributeKind === VertexBuffer.UVKind || attributeKind === VertexBuffer.UV2Kind) && !this._options.exportUnusedUVs) {
-                            if (glTFMaterial && !this._glTFMaterialExporter._hasTexturesPresent(glTFMaterial)) {
+                            if (!glTFMaterial || !this._glTFMaterialExporter._hasTexturesPresent(glTFMaterial)) {
                                 continue;
                             }
                         }
@@ -1360,13 +1359,8 @@ var _Exporter = /** @class */ (function () {
             }
             // Transform
             var matrix = node.getWorldMatrix();
-            var matrixToLeftHanded = Matrix.Compose(this._convertToRightHandedSystem ? new Vector3(-1, 1, 1) : Vector3.One(), Quaternion.Identity(), Vector3.Zero());
-            var matrixProduct = matrix.multiply(matrixToLeftHanded);
-            var matrixIdentity = Matrix.IdentityReadOnly;
-            for (var i = 0; i < 16; i++) {
-                if (Math.abs(matrixProduct.m[i] - matrixIdentity.m[i]) > Epsilon) {
-                    return false;
-                }
+            if (matrix.determinant() === 1) {
+                return false;
             }
             // Geometry
             if ((node instanceof Mesh && node.geometry !== null) ||
@@ -1418,8 +1412,9 @@ var _Exporter = /** @class */ (function () {
                 });
             }
         });
-        return this._glTFMaterialExporter._convertMaterialsToGLTFAsync(babylonScene.materials, "image/png" /* PNG */, true).then(function () {
-            return _this.createNodeMapAndAnimationsAsync(babylonScene, nodes, binaryWriter).then(function (nodeMap) {
+        var _a = this.getExportNodes(nodes), exportNodes = _a[0], exportMaterials = _a[1];
+        return this._glTFMaterialExporter._convertMaterialsToGLTFAsync(exportMaterials, "image/png" /* PNG */, true).then(function () {
+            return _this.createNodeMapAndAnimationsAsync(babylonScene, exportNodes, binaryWriter).then(function (nodeMap) {
                 return _this.createSkinsAsync(babylonScene, nodeMap, binaryWriter).then(function (skinMap) {
                     _this._nodeMap = nodeMap;
                     _this._totalByteLength = binaryWriter.getByteOffset();
@@ -1484,6 +1479,41 @@ var _Exporter = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Getting the nodes and materials that would be exported.
+     * @param nodes Babylon transform nodes
+     * @returns Array of nodes which would be exported.
+     * @returns Set of materials which would be exported.
+     */
+    _Exporter.prototype.getExportNodes = function (nodes) {
+        var exportNodes = [];
+        var exportMaterials = new Set();
+        for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
+            var babylonNode = nodes_2[_i];
+            if (!this._options.shouldExportNode || this._options.shouldExportNode(babylonNode)) {
+                exportNodes.push(babylonNode);
+                if (babylonNode.getClassName() === "Mesh") {
+                    var mesh = babylonNode;
+                    if (mesh.material) {
+                        exportMaterials.add(mesh.material);
+                    }
+                }
+                else {
+                    var meshes = babylonNode.getChildMeshes(false);
+                    for (var _a = 0, meshes_1 = meshes; _a < meshes_1.length; _a++) {
+                        var mesh = meshes_1[_a];
+                        if (mesh.material) {
+                            exportMaterials.add(mesh.material);
+                        }
+                    }
+                }
+            }
+            else {
+                "Excluding node " + babylonNode.name;
+            }
+        }
+        return [exportNodes, exportMaterials];
+    };
     /**
      * Creates a mapping of Node unique id to node index and handles animations
      * @param babylonScene Babylon Scene
@@ -1503,41 +1533,35 @@ var _Exporter = /** @class */ (function () {
         };
         var idleGLTFAnimations = [];
         var _loop_1 = function (babylonNode) {
-            if (!this_1._options.shouldExportNode || this_1._options.shouldExportNode(babylonNode)) {
-                promiseChain = promiseChain.then(function () {
-                    var convertToRightHandedSystem = _this._convertToRightHandedSystemMap[babylonNode.uniqueId];
-                    return _this.createNodeAsync(babylonNode, binaryWriter, convertToRightHandedSystem, nodeMap).then(function (node) {
-                        var promise = _this._extensionsPostExportNodeAsync("createNodeAsync", node, babylonNode, nodeMap);
-                        if (promise == null) {
-                            Tools.Warn("Not exporting node " + babylonNode.name);
-                            return Promise.resolve();
-                        }
-                        else {
-                            return promise.then(function (node) {
-                                if (!node) {
-                                    return;
-                                }
-                                _this._nodes.push(node);
-                                nodeIndex = _this._nodes.length - 1;
-                                nodeMap[babylonNode.uniqueId] = nodeIndex;
-                                if (!babylonScene.animationGroups.length) {
-                                    _GLTFAnimation._CreateMorphTargetAnimationFromMorphTargetAnimations(babylonNode, runtimeGLTFAnimation, idleGLTFAnimations, nodeMap, _this._nodes, binaryWriter, _this._bufferViews, _this._accessors, convertToRightHandedSystem, _this._animationSampleRate);
-                                    if (babylonNode.animations.length) {
-                                        _GLTFAnimation._CreateNodeAnimationFromNodeAnimations(babylonNode, runtimeGLTFAnimation, idleGLTFAnimations, nodeMap, _this._nodes, binaryWriter, _this._bufferViews, _this._accessors, convertToRightHandedSystem, _this._animationSampleRate);
-                                    }
+            promiseChain = promiseChain.then(function () {
+                var convertToRightHandedSystem = _this._convertToRightHandedSystemMap[babylonNode.uniqueId];
+                return _this.createNodeAsync(babylonNode, binaryWriter, convertToRightHandedSystem, nodeMap).then(function (node) {
+                    var promise = _this._extensionsPostExportNodeAsync("createNodeAsync", node, babylonNode, nodeMap);
+                    if (promise == null) {
+                        Tools.Warn("Not exporting node " + babylonNode.name);
+                        return Promise.resolve();
+                    }
+                    else {
+                        return promise.then(function (node) {
+                            if (!node) {
+                                return;
+                            }
+                            _this._nodes.push(node);
+                            nodeIndex = _this._nodes.length - 1;
+                            nodeMap[babylonNode.uniqueId] = nodeIndex;
+                            if (!babylonScene.animationGroups.length) {
+                                _GLTFAnimation._CreateMorphTargetAnimationFromMorphTargetAnimations(babylonNode, runtimeGLTFAnimation, idleGLTFAnimations, nodeMap, _this._nodes, binaryWriter, _this._bufferViews, _this._accessors, convertToRightHandedSystem, _this._animationSampleRate);
+                                if (babylonNode.animations.length) {
+                                    _GLTFAnimation._CreateNodeAnimationFromNodeAnimations(babylonNode, runtimeGLTFAnimation, idleGLTFAnimations, nodeMap, _this._nodes, binaryWriter, _this._bufferViews, _this._accessors, convertToRightHandedSystem, _this._animationSampleRate);
                                 }
-                            });
-                        }
-                    });
+                            }
+                        });
+                    }
                 });
-            }
-            else {
-                "Excluding node " + babylonNode.name;
-            }
+            });
         };
-        var this_1 = this;
-        for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
-            var babylonNode = nodes_2[_i];
+        for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) {
+            var babylonNode = nodes_3[_i];
             _loop_1(babylonNode);
         }
         return promiseChain.then(function () {