@combeenation/3d-viewer 11.0.0 → 11.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@combeenation/3d-viewer",
-  "version": "11.0.0",
+  "version": "11.1.0",
   "description": "Combeenation 3D Viewer",
   "homepage": "https://github.com/Combeenation/3d-viewer#readme",
   "bugs": {
@@ -51,6 +51,7 @@
     "@babylonjs/loaders": "6.27.1",
     "@babylonjs/materials": "6.27.1",
     "@babylonjs/node-editor": "6.27.1",
+    "@babylonjs/node-geometry-editor": "6.27.1",
     "@babylonjs/serializers": "6.27.1",
     "eventemitter3": "4.0.7",
     "gsap": "3.11.2",

package/src/api/classes/viewer.ts

@@ -359,6 +359,7 @@ export class Viewer extends EventBroadcaster {
       // load additional packages for certain inspector features like "node material editor"
       // this is done after showing the debug layer to save time
       await import(/* webpackChunkName: "node-material-editor" */ '@babylonjs/node-editor');
+      await import(/* webpackChunkName: "node-geometry-editor" */ '@babylonjs/node-geometry-editor');
 
       return true;
     } else {

package/src/api/manager/gltfExportManager.ts

@@ -1,12 +1,13 @@
-import { bakeGeometryOfAllMeshes } from '..//util/geometryHelper';
 import { Viewer } from '../classes/viewer';
 import { injectMetadata } from '../util/babylonHelper';
+import { bakeGeometryOfAllMeshes } from '../util/geometryHelper';
 import { isNodeIncludedInExclusionList } from '../util/structureHelper';
 import { Engine } from '@babylonjs/core/Engines/engine';
 import { EngineStore } from '@babylonjs/core/Engines/engineStore';
 import { SceneLoader } from '@babylonjs/core/Loading/sceneLoader';
 import { PBRMaterial } from '@babylonjs/core/Materials/PBR/pbrMaterial';
 import { Color3 } from '@babylonjs/core/Maths/math.color';
+import { Vector3 } from '@babylonjs/core/Maths/math.vector';
 import { AbstractMesh } from '@babylonjs/core/Meshes/abstractMesh';
 import { TransformNode } from '@babylonjs/core/Meshes/transformNode';
 import { SceneSerializer } from '@babylonjs/core/Misc/sceneSerializer';
@@ -16,9 +17,11 @@ import { has, merge } from 'lodash-es';
 
 type MetadataMap = { [key: string]: any };
 export class GltfExportManager {
-  protected static readonly _CLONED_FROM_MAT_METADATA_PROPERTY = 'clonedFrom';
   public static readonly NAME_BEFORE_EXPORT_METADATA_PROPERTY = 'nameBeforeExport';
 
+  protected static readonly _EXPORT_ROOT_NAME = '__export_root__';
+  protected static readonly _CLONED_FROM_MAT_METADATA_PROPERTY = 'clonedFrom';
+
   /**
    * Constructor.
    */
@@ -162,15 +165,37 @@ export class GltfExportManager {
     }
 
     if (optimizeForAR) {
-      this.setUniqueMeshNames(copiedScene);
-      // get rid of negative scalings and morph targets, since iOS can't handle it in the QuickLook app
-      bakeGeometryOfAllMeshes(copiedScene);
       // certain devices can't load models with skeletons, just remove them since animations are not supported in the AR
       // scene anyway
       while (copiedScene.skeletons.length) {
         const skeleton = copiedScene.skeletons.pop();
         skeleton!.dispose();
       }
+      // also get rid of cameras and lights, as we don't need them in AR
+      while (copiedScene.cameras.length) {
+        const camera = copiedScene.cameras.pop();
+        camera!.dispose();
+      }
+      while (copiedScene.lights.length) {
+        const light = copiedScene.lights.pop();
+        light!.dispose();
+      }
+
+      // since Babylon.js v6 the conversion to right handed GLB coordinate system is done differently
+      // previously the geometry itself has been altered, now they negate the scaling of all root nodes
+      // this is an issue for us, since we will receive this negated scalings in the exported GLB, which leads to issues
+      // on iOS devices
+      // we fix that by adding a top level root node with a negative scaling as well
+      // the exporter just removes this node as he detects a "noop root node" (implementation detail of Babylon.js)
+      // everything beneath this node remains untouched
+      // TODO BJS update: Test AR export on iPhones as well and double check if we still need this special logic.
+      const exportRootNode = new TransformNode(GltfExportManager._EXPORT_ROOT_NAME, copiedScene);
+      exportRootNode.scaling = new Vector3(-1, 1, 1);
+      copiedScene.rootNodes.forEach(rootNode => (rootNode.parent = exportRootNode));
+
+      this.setUniqueMeshNames(copiedScene);
+      // get rid of negative scalings and morph targets, since iOS can't handle it in the QuickLook app
+      bakeGeometryOfAllMeshes(copiedScene, [{ nodeName: GltfExportManager._EXPORT_ROOT_NAME }]);
     }
 
     return { scene: copiedScene, sceneCopied: true };

package/src/api/util/geometryHelper.ts

@@ -1,3 +1,4 @@
+import { isNodeIncludedInExclusionList } from './structureHelper';
 import { MorphTargetManager } from '@babylonjs/core';
 import { VertexBuffer } from '@babylonjs/core/Buffers/buffer';
 import { Vector3 } from '@babylonjs/core/Maths/math.vector';
@@ -13,17 +14,25 @@ import type { FloatArray } from '@babylonjs/core/types';
  * The effects from morph targets and tranformation values will be "baked" in the geometry, so that the final appearance
  * of the meshes stay the same.
  */
-const bakeGeometryOfAllMeshes = function (scene: Scene) {
+const bakeGeometryOfAllMeshes = function (scene: Scene, excluded?: ExcludedGeometryList) {
+  // in some cases we want to keep the transformation of certain nodes
+  // => root node for Gltf export
+  // it's important to NOT check parents in this case
+  const keepNode = (node: TransformNode, excluded?: ExcludedGeometryList) =>
+    !excluded || !isNodeIncludedInExclusionList(node, excluded, true);
+
+  const meshes = scene.meshes.filter(mesh => keepNode(mesh, excluded));
+
   // instanced meshes have to be converted, since they share the geometry of the source mesh, which would lead to issues
   // when baking the transformation values
-  scene.meshes.forEach(mesh => {
+  meshes.forEach(mesh => {
     if (mesh instanceof InstancedMesh) {
       convertInstancedMeshToMesh(mesh);
     }
   });
 
   // do the geometry baking for all meshes in the scene
-  scene.meshes.forEach(mesh => {
+  meshes.forEach(mesh => {
     if (mesh instanceof Mesh) {
       bakeGeometryOfMesh(mesh);
     }
@@ -31,7 +40,9 @@ const bakeGeometryOfAllMeshes = function (scene: Scene) {
 
   // some nodes (mostly transform nodes), are not affected by the baking algorithm since they have no geometry
   // => reset their transformation manually
-  const allNodes = scene.getNodes().filter(node => node instanceof TransformNode) as TransformNode[];
+  const allNodes = scene
+    .getNodes()
+    .filter(node => node instanceof TransformNode && keepNode(node, excluded)) as TransformNode[];
   allNodes.forEach(node => {
     resetTransformation(node);
   });

package/src/api/util/structureHelper.ts

@@ -11,7 +11,11 @@ import { Tags } from '@babylonjs/core/Misc/tags';
  * @param list list of excluded geometry
  * @returns boolean based on whether node (or one of its parents) was found in list
  */
-const isNodeIncludedInExclusionList = function (node: TransformNode, list: ExcludedGeometryList): boolean {
+const isNodeIncludedInExclusionList = function (
+  node: TransformNode,
+  list: ExcludedGeometryList,
+  skipParentCheck?: boolean
+): boolean {
   const checkNode = (inputNode: TransformNode, nodeToCheck: TransformNode) => {
     // check name instead of unique id, since the unique id changes when copying the scene, which is the case in the
     // GLB export
@@ -53,7 +57,7 @@ const isNodeIncludedInExclusionList = function (node: TransformNode, list: Exclu
   };
 
   let isExcluded = list.some(geometryToExclude => check(geometryToExclude, node));
-  if (!isExcluded && node.parent instanceof TransformNode) {
+  if (!isExcluded && !skipParentCheck && node.parent instanceof TransformNode) {
     isExcluded = isNodeIncludedInExclusionList(node.parent, list);
   }