@combeenation/3d-viewer 12.1.0 → 12.1.1

package/package.json

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

package/src/api/classes/element.ts

@@ -36,6 +36,7 @@ import { Color3 } from '@babylonjs/core/Maths/math.color';
 import { AbstractMesh } from '@babylonjs/core/Meshes/abstractMesh';
 import { Mesh } from '@babylonjs/core/Meshes/mesh';
 import { TransformNode } from '@babylonjs/core/Meshes/transformNode';
+import { Tags } from '@babylonjs/core/Misc/tags';
 import { has, isArray, isNumber, merge, union } from 'lodash-es';
 
 /**
@@ -87,6 +88,12 @@ export class Element extends VariantParameterizable {
         // we have to create a new clone with the correct source mesh
         const exchangedInstance = clonedInstance.clone(clonedInstance.name, clonedInstance.parent, true, clonedSource);
 
+        // fix enabled and tags state after cloning
+        exchangedInstance.setEnabled(clonedInstance.isEnabled(false));
+        if (Tags.HasTags(clonedInstance)) {
+          Tags.AddTagsTo(exchangedInstance, Tags.GetTags(clonedInstance, true));
+        }
+
         // re-reference the childs of the cloned instance as well
         const childs = clonedInstance.getChildTransformNodes(true);
         childs.forEach(child => (child.parent = exchangedInstance));

package/src/api/util/babylonHelper.ts

@@ -116,6 +116,11 @@ const cloneTransformNode = function (
     // in that case, set the clone's enabled state to the original's state
     if (node.constructor.name === 'InstancedMesh') {
       clone.setEnabled(node.isEnabled(false));
+
+      // tags are not cloned for instanced meshes by default
+      if (Tags.HasTags(node)) {
+        Tags.AddTagsTo(clone, Tags.GetTags(node, true));
+      }
     }
   }
   if (deep) {

package/src/api/util/sceneLoaderHelper.ts

@@ -5,6 +5,7 @@ import { ISceneLoaderPlugin } from '@babylonjs/core/Loading/sceneLoader';
 import { Material } from '@babylonjs/core/Materials/material';
 import { InstancedMesh } from '@babylonjs/core/Meshes/instancedMesh';
 import { Observer } from '@babylonjs/core/Misc/observable';
+import { Tags } from '@babylonjs/core/Misc/tags';
 import { AssetContainer } from '@babylonjs/core/assetContainer';
 //! overload DOM API Node due to name-clash with BJS
 import { Node as BjsNode } from '@babylonjs/core/node';
@@ -40,6 +41,7 @@ export const getCustomCbnBabylonLoaderPlugin = function (previousLoaderPlugin: I
       const importedContainer = previousLoaderPlugin.loadAssetContainer(scene, data, rootUrl);
       //* 3) --- manipulate IMPORTED data
       addMissingMaterialMetadata(dataParsed, importedContainer);
+      reconstructTagsForInstancedMeshes(dataParsed, importedContainer);
       //* 4) --- return imported data
       return importedContainer;
     },
@@ -98,7 +100,7 @@ export const addMissingMaterialMetadata = function (dataParsed: any, container:
       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 });
+      injectMetadata(currMeshImported, { [parsedMaterialIdMetadataName]: currMeshOriginal.materialId }, false);
       const materialOnImportedMesh = currMeshImported.material?.id;
       const materialOnOriginalMesh = currMeshOriginal.materialId;
       if (!materialOnOriginalMesh || materialOnImportedMesh === materialOnOriginalMesh) continue;
@@ -110,6 +112,43 @@ export const addMissingMaterialMetadata = function (dataParsed: any, container:
   });
 };
 
+/**
+ * Help function for manipulating tags of instances meshes after parsing.
+ * Per default babylon attaches the tags of the source mesh to the instance, **but only** if no tags are set for the
+ * instanced mesh. If the instanced mesh has dedicated tags set, the ones from the source mesh are **not** copied over.
+ * In this case it's not possible to have tags on the source mesh but not on the instance, which is a problem with our
+ * tagging system in the viewer and the Combeenation asset editor as well.
+ * This function rejects the default tag import algorithm and just copies the tags of the original parsed node without
+ * any parent synchronization.
+ *
+ * @param dataParsed original data
+ * @param container  loaded data
+ */
+export const reconstructTagsForInstancedMeshes = function (dataParsed: any, container: AssetContainer) {
+  container.meshes.forEach(importedMesh => {
+    if (importedMesh instanceof InstancedMesh) {
+      // remove all tags from the imported mesh if there are some, since these tags are probably coming from the
+      // source mesh, if no tags are set there is no need for further operation though
+      const importedTags = Tags.GetTags(importedMesh);
+      if (importedTags) {
+        Tags.RemoveTagsFrom(importedMesh, importedTags);
+
+        // get tags of parsed instanced mesh and set them on the imported instanced mesh
+        const parsedSourceMesh = dataParsed.meshes?.find(
+          (parsedMesh: any) => parsedMesh.name === importedMesh.sourceMesh.name
+        );
+        const parsedInstancedMesh = parsedSourceMesh?.instances.find(
+          (parsedMesh: any) => parsedMesh.name === importedMesh.name
+        );
+        const parsedTags = parsedInstancedMesh?.tags;
+        if (parsedTags) {
+          Tags.AddTagsTo(importedMesh, parsedTags);
+        }
+      }
+    }
+  });
+};
+
 /**
  * Adds an "onEnabledStateChanged" observer to the given mesh and all its parents:
  * The added observer (`getMaterialPostLoadObserver`) handles creation of missing materials once the given node is