@combeenation/3d-viewer 12.0.0-alpha2 → 12.0.0-alpha4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@combeenation/3d-viewer",
-  "version": "12.0.0-alpha2",
+  "version": "12.0.0-alpha4",
   "description": "Combeenation 3D Viewer",
   "homepage": "https://github.com/Combeenation/3d-viewer#readme",
   "bugs": {

package/src/api/manager/gltfExportManager.ts

@@ -1,4 +1,4 @@
-import { Node as BjsNode, Color3, InstancedMesh, PBRMaterial } from '../../index';
+import { Node as BjsNode, Color3, InstancedMesh, PBRMaterial, Vector3 } from '../../index';
 import { Viewer } from '../classes/viewer';
 import { injectMetadata } from '../util/babylonHelper';
 import { bakeGeometryOfMesh, createMeshFromInstancedMesh, resetTransformation } from '../util/geometryHelper';
@@ -13,6 +13,7 @@ export class GltfExportManager {
     deleteAfterExport: 'deleteAfterExport',
     exchangeMaterialWith: 'exchangeMaterialWith',
   };
+  protected static readonly _EXPORT_ROOT_NAME = '__export_root__';
 
   protected constructor(protected viewer: Viewer) {}
 
@@ -59,13 +60,24 @@ export class GltfExportManager {
   }
 
   protected async _exportPreProcess(excluded?: ExcludedGeometryList): Promise<void> {
+    this.viewer.pauseRendering();
+
     // handle materials
     this.viewer.scene.materials
       .filter(material => this._shouldReplaceMaterial(material))
       .forEach(material => this._createRefractionMaterialReplacement(material as PBRMaterial));
 
+    const exportRootNode = new TransformNode(GltfExportManager._EXPORT_ROOT_NAME, this.viewer.scene);
+    exportRootNode.scaling = new Vector3(-1, 1, 1);
+    injectMetadata(exportRootNode!, {
+      [GltfExportManager._METADATA_PROPS.exportNode]: true,
+      [GltfExportManager._METADATA_PROPS.deleteAfterExport]: true,
+    });
+
     // handle nodes
-    this.viewer.scene.rootNodes.forEach(rootNode => this._prepareNodeForExport(rootNode, null, excluded));
+    this.viewer.scene.rootNodes
+      .filter(rootNode => rootNode.name !== GltfExportManager._EXPORT_ROOT_NAME)
+      .forEach(rootNode => this._prepareNodeForExport(rootNode, exportRootNode, excluded));
 
     // bake transformation of all meshes, so that no negative scalings are left
     // it's important that this is done AFTER instanced meshes have been converted (_prepareNodeForExport)
@@ -75,8 +87,12 @@ export class GltfExportManager {
 
     // reset transformation of all "TransformNodes", which couldn't be handled by the geometry baking algorithm
     // it's important that this is done AFTER all geometries have been baked
-    this.viewer.scene.transformNodes
-      .filter(node => !!node.metadata?.[GltfExportManager._METADATA_PROPS.exportNode])
+    [...this.viewer.scene.transformNodes, ...this.viewer.scene.meshes]
+      .filter(
+        node =>
+          !!node.metadata?.[GltfExportManager._METADATA_PROPS.exportNode] &&
+          node.name !== GltfExportManager._EXPORT_ROOT_NAME
+      )
       .forEach(node => resetTransformation(node as TransformNode));
   }
 
@@ -89,6 +105,8 @@ export class GltfExportManager {
     this.viewer.scene.materials
       .filter(mat => !!mat.metadata?.[GltfExportManager._METADATA_PROPS.deleteAfterExport])
       .forEach(material => material.dispose(false, false));
+
+    this.viewer.resumeRendering();
   }
 
   protected _gltfExportOptions(): IExportOptions {
@@ -96,18 +114,10 @@ export class GltfExportManager {
       shouldExportNode: function (node: BjsNode) {
         return !!node.metadata?.[GltfExportManager._METADATA_PROPS.exportNode];
       },
-      // keep root node(s)
-      // this seems to be important due to the geometry baking and transformation resetting stuff
-      // => root node would have no transformation anymore, which seems to be problematic for the import
-      removeNoopRootNodes: false,
     };
   }
 
-  protected _prepareNodeForExport(
-    node: BjsNode,
-    clonedParent: Nullable<TransformNode>,
-    excluded?: ExcludedGeometryList
-  ) {
+  protected _prepareNodeForExport(node: BjsNode, clonedParent: TransformNode, excluded?: ExcludedGeometryList) {
     if (!this._shouldExportNode(node, excluded)) {
       return;
     }
@@ -176,12 +186,12 @@ export class GltfExportManager {
   /**
    * Create an export-friendly replacement material for a material using refraction.
    */
-  protected _createRefractionMaterialReplacement(material: PBRMaterial): PBRMaterial {
+  protected _createRefractionMaterialReplacement(material: PBRMaterial) {
     const newName = `${material.name}_clone`;
-    // change material according to https://www.notion.so/combeenation/Glas-materials-don-t-look-glasy-after-export-d5fda2c6515e4420a8772744d3e6b460
-    const clonedMaterial = material.clone(newName); // clone material
+
+    const clonedMaterial = material.clone(newName);
     clonedMaterial.refractionTexture = null;
-    clonedMaterial.metallicReflectanceTexture = null; // is this the correct one for metallic roughness?
+    clonedMaterial.metallicReflectanceTexture = null;
     clonedMaterial.alpha = 0.7;
     clonedMaterial.albedoColor = new Color3(0.3, 0.3, 0.3);
     clonedMaterial.transparencyMode = PBRMaterial.PBRMATERIAL_ALPHABLEND;
@@ -190,7 +200,5 @@ export class GltfExportManager {
 
     injectMetadata(material, { [GltfExportManager._METADATA_PROPS.exchangeMaterialWith]: newName });
     injectMetadata(clonedMaterial, { [GltfExportManager._METADATA_PROPS.deleteAfterExport]: true });
-
-    return clonedMaterial;
   }
 }