@combeenation/3d-viewer 12.0.2 → 12.1.0

package/package.json

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

package/src/api/classes/element.ts

@@ -71,6 +71,41 @@ export class Element extends VariantParameterizable {
       };
       return cloneTransformNode(node, nodeNamingStrategy, this.filterNode.bind(this), true);
     });
+
+    // when cloning an instanced mesh the source mesh is still referencing to the source of the original mesh
+    // this is wrong, as we want to reference the cloned source
+    // this can only be done after the cloning process of the whole tree is finished, as we can't be sure if all
+    // instanced meshes or all sources meshes are cloning prior
+    const reassignSourceMesh = (node: TransformNode) => {
+      if (node.constructor.name === 'InstancedMesh') {
+        // find the cloned instance and source mesh
+        const clonedInstance = node as InstancedMesh;
+        const originalInstance = clonedInstance.metadata.cloneSource as InstancedMesh;
+        const originalSource = originalInstance.sourceMesh;
+        const clonedSource = originalSource.metadata.cloneTarget;
+        // it's not possible to just exchange the source mesh => readonly property
+        // we have to create a new clone with the correct source mesh
+        const exchangedInstance = clonedInstance.clone(clonedInstance.name, clonedInstance.parent, true, clonedSource);
+
+        // re-reference the childs of the cloned instance as well
+        const childs = clonedInstance.getChildTransformNodes(true);
+        childs.forEach(child => (child.parent = exchangedInstance));
+
+        // old instance mesh is not needed anymore and can be disposed
+        clonedInstance.dispose();
+      }
+
+      // recurse into childs
+      const children = node.getChildTransformNodes(true);
+      children.forEach(reassignSourceMesh);
+    };
+
+    nodes.forEach(node => {
+      if (node) {
+        reassignSourceMesh(node);
+      }
+    });
+
     this.nodes = nodes.filter(node => !!node) as TransformNode[];
     this._dottedNodes = mapToDottedNodes<TransformNode>(this.nodes, node => node instanceof TransformNode);
     variant.broadcastEvent(Event.ELEMENT_NODES_CLONED, this);

package/src/api/util/babylonHelper.ts

@@ -110,17 +110,13 @@ const cloneTransformNode = function (
     clone.id = newName;
     clone.metadata = cloneDeep(node.metadata);
     injectMetadata(clone, { cloneSource: node }, false);
+    injectMetadata(node, { cloneTarget: clone }, false);
     // if the cloned node is of type InstancedMesh, due to a bug(?),
     // the InstancedMesh.isEnabled state may have changed after cloning.
     // in that case, set the clone's enabled state to the original's state
     if (node.constructor.name === 'InstancedMesh') {
       clone.setEnabled(node.isEnabled(false));
     }
-    // copying tags is a temporary workaround, as it doesn't work for TransformNodes ATM
-    // see https://forum.babylonjs.com/t/transformnode-clone-doesnt-contain-original-tags/38429/1
-    if (Tags?.HasTags(node)) {
-      Tags.AddTagsTo(clone, Tags.GetTags(node, true));
-    }
   }
   if (deep) {
     const children = node.getChildTransformNodes(true);

package/src/api/util/geometryHelper.ts

@@ -48,6 +48,20 @@ const bakeGeometryOfMesh = function (mesh: Mesh) {
   // geometries can be shared across multiple meshes, first make them unique to avoid side-effects
   mesh.makeGeometryUnique();
 
+  // Babylon.js already provides a function for baking the current skeleton changes into the geometry
+  if (mesh.skeleton) {
+    mesh.applySkeleton(mesh.skeleton);
+    mesh.skeleton = null;
+  }
+
+  // NOTE: in difference to skeletons and transformations there is no baking function for morph targets (yet)
+  // however another approach could be to re-apply the position and normals data, as there are nice functions for it
+  // - `getPositionData(applySkeleton: boolean = false, applyMorph: boolean = false)`
+  // - `getNormalsData(applySkeleton: boolean = false, applyMorph: boolean = false)`
+  // you can decide if skeletons and morph targets can be added, which is exactly what we want
+  // I'm still hesitant to use it because "tangent" and "UV" kinds are not supported, whereas I'm not sure if it's
+  // required
+  // => try it out when there is enough time for detailed regression tests!
   const morphTargetManager = mesh.morphTargetManager;
   const geometry = mesh.geometry;
 

package/src/api/util/sceneLoaderHelper.ts

@@ -18,6 +18,7 @@ const enableObserverMap: {
 } = {};
 
 export const missingMaterialMetadataName = 'missingMaterial';
+export const parsedMaterialIdMetadataName = 'parsedMaterialId';
 
 /**
  * Create and return a custom loader plugin to be registered with SceneLoader, that allows
@@ -96,6 +97,8 @@ export const addMissingMaterialMetadata = function (dataParsed: any, container:
     for (const currMeshOriginal of dataParsed.meshes) {
       if (currMeshOriginal.name !== currMeshImported.name) continue;
       // we're dealing with the original version of the current imported mesh now
+      // first save original material id of the imported babylon or GLB file
+      injectMetadata(currMeshImported, { [parsedMaterialIdMetadataName]: currMeshOriginal.materialId });
       const materialOnImportedMesh = currMeshImported.material?.id;
       const materialOnOriginalMesh = currMeshOriginal.materialId;
       if (!materialOnOriginalMesh || materialOnImportedMesh === materialOnOriginalMesh) continue;