@combeenation/3d-viewer 12.1.1-beta1 → 12.1.1

package/package.json

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

package/src/api/classes/element.ts

@@ -90,7 +90,7 @@ export class Element extends VariantParameterizable {
 
         // fix enabled and tags state after cloning
         exchangedInstance.setEnabled(clonedInstance.isEnabled(false));
-        if (Tags?.HasTags(clonedInstance)) {
+        if (Tags.HasTags(clonedInstance)) {
           Tags.AddTagsTo(exchangedInstance, Tags.GetTags(clonedInstance, true));
         }
 

package/src/api/util/babylonHelper.ts

@@ -118,7 +118,7 @@ const cloneTransformNode = function (
       clone.setEnabled(node.isEnabled(false));
 
       // tags are not cloned for instanced meshes by default
-      if (Tags?.HasTags(node)) {
+      if (Tags.HasTags(node)) {
         Tags.AddTagsTo(clone, Tags.GetTags(node, true));
       }
     }

package/src/api/util/sceneLoaderHelper.ts

@@ -114,7 +114,8 @@ 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, if no tags are set for the instanced mesh.
+ * 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
@@ -126,15 +127,24 @@ export const addMissingMaterialMetadata = function (dataParsed: any, container:
 export const reconstructTagsForInstancedMeshes = function (dataParsed: any, container: AssetContainer) {
   container.meshes.forEach(importedMesh => {
     if (importedMesh instanceof InstancedMesh) {
-      // remove all tags from the imported mesh
+      // 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);
-      Tags.RemoveTagsFrom(importedMesh, importedTags);
-
-      // get tags of parsed instanced mesh and set them on the imported instanced mesh
-      const parsedSourceMesh = dataParsed.meshes.find((mesh: any) => mesh.name === importedMesh.sourceMesh.name);
-      const parsedInstancedMesh = parsedSourceMesh?.instances.find((mesh: any) => mesh.name === importedMesh.name);
-      const parsedTags = parsedInstancedMesh?.tags ?? '';
-      Tags.AddTagsTo(importedMesh, parsedTags);
+      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);
+        }
+      }
     }
   });
 };