@combeenation/3d-viewer 16.0.0 → 17.0.0

package/dist/lib-cjs/viewer.js

@@ -144,6 +144,7 @@ class Viewer {
      * Only takes meshes into considerations that:
      * - are visible
      * - are not excluded by "excludeGeometry" parameter
+     * - do not have a material of type "BackgroundMaterial"
      * - do not have an infinite distance (like sky boxes)
      */
     calculateBoundingInfo(excludeGeometry) {
@@ -156,9 +157,11 @@ class Viewer {
             const hasValidBBoxInfo = mesh.getBoundingInfo().boundingSphere.radius > 0;
             // ignore meshes with infinite distance, typically these are sky boxes
             const hasInfiniteDistance = mesh.infiniteDistance;
+            // ignore meshes with "BackgroundMaterial" - usually a ground or skybox
+            const hasBackgroundMaterial = mesh.material instanceof index_1.BackgroundMaterial;
             // ignore excluded meshes
             const isExcluded = excludeGeometry ? (0, geometry_helper_1.isNodeExcluded)(mesh, excludeGeometry) : false;
-            return isEnabled && hasValidBBoxInfo && !hasInfiniteDistance && !isExcluded;
+            return isEnabled && hasValidBBoxInfo && !hasInfiniteDistance && !hasBackgroundMaterial && !isExcluded;
         })
             .reduce((accBBoxMinMax, curMesh, idx) => {
             curMesh.refreshBoundingInfo(true, true);
@@ -178,6 +181,12 @@ class Viewer {
         // we use a custom plugin for ".babylon" files to be able to lazy load materials that were cropped by the CBN
         // asset manager
         (0, cbn_custom_babylon_loader_plugin_1.registerCustomCbnBabylonLoaderPlugin)();
+        // without setting this flag, meshes with billboard mode set would not integrate into the node tree structure,
+        // that means the position would not be updated by the rotation of the parent node
+        // it's a bit dangerous to set this globally, but we need that for:
+        // - `DebugManager.showCoordinateSystem`
+        // - probably dimensions line handling (not implemented yet)
+        index_1.TransformNode.BillboardUseParentOrientation = true;
         const engine = new index_1.Engine(this.canvas, this._viewerSettings.antialiasing, (0, lodash_es_1.cloneDeep)(this._viewerSettings.engineOptions), this._viewerSettings.adaptToDeviceRatio);
         const isScaledDownDevice = (0, device_helper_1.getIsScaledDownDevice)(this._viewerSettings.limitTextureSize);
         if (this._viewerSettings.limitTextureSize && isScaledDownDevice) {

package/dist/lib-cjs/viewer.js.map

@@ -1 +1 @@
-{"version":3,"file":"viewer.js","sourceRoot":"","sources":["../../src/viewer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAAyC;AACzC,+CAAiC;AACjC,mCAkBiB;AACjB,kGAAmG;AACnG,4DAAiE;AACjE,gEAA4D;AAC5D,yCAA6C;AAwC7C;;;;;;;;;GASG;AACH,MAAa,MAAM;IAoFjB;;;;;OAKG;IACH,YACkB,MAAyB,EACzC,cAA4C,EAC5C,oBAAwD;QAFxC,WAAM,GAAN,MAAM,CAAmB;QA1E3C,0BAA0B;QAC1B,gDAAgD;QACtC,oBAAe,GAAmB;YAC1C,YAAY,EAAE,IAAI;YAClB,aAAa,EAAE;gBACb,qBAAqB,EAAE,IAAI;gBAC3B,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,KAAK;aACpB;YACD,kBAAkB,EAAE,IAAI;YACxB,gBAAgB,EAAE;gBAChB,OAAO,EAAE,QAAQ;gBACjB,IAAI,EAAE,IAAI;aACX;YACD,wBAAwB,EAAE,IAAI;SAC/B,CAAC;QAEQ,wBAAmB,GAAY,KAAK,CAAC;QA6D7C,IAAA,iBAAK,EAAC,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACnC,CAAC;IA7DD,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,EAAY,CAAC;IAC1C,CAAC;IACD,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IACD,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IACD,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IACD,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IACD,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IACD,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IACD,gBAAgB;IAChB,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IACD,gBAAgB;IAChB,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IACD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,mBAAmB;QAC/B,OAAO,KAAK,CAAC;IACf,CAAC;IAiBD;;;OAGG;IACI,cAAc;QACnB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAClC,CAAC;IAED;;OAEG;IACI,eAAe;QACpB,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;IACnC,CAAC;IAED;;OAEG;IACI,OAAO;QACZ,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED;;;;;;OAMG;IACI,qBAAqB,CAAC,eAAsC;QACjE,iEAAiE;QACjE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAEpB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM;aACnC,MAAM,CAAC,IAAI,CAAC,EAAE;YACb,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YACnC,4CAA4C;YAC5C,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;YAC1E,sEAAsE;YACtE,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC;YAClD,yBAAyB;YACzB,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,IAAA,gCAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACnF,OAAO,SAAS,IAAI,gBAAgB,IAAI,CAAC,mBAAmB,IAAI,CAAC,UAAU,CAAC;QAC9E,CAAC,CAAC;aACD,MAAM,CACL,CAAC,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;YAC9B,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,WAAW,CAAC;YACnD,iGAAiG;YACjG,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,eAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACnG,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,eAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YACnG,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACtB,CAAC,EACD,EAAE,GAAG,EAAE,IAAI,eAAO,EAAE,EAAE,GAAG,EAAE,IAAI,eAAO,EAAE,EAAE,CAC3C,CAAC;QAEJ,MAAM,YAAY,GAAG,IAAI,oBAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAChD,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,oBAAwD;QACtE,6GAA6G;QAC7G,gBAAgB;QAChB,IAAA,uEAAoC,GAAE,CAAC;QAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CACvB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,eAAe,CAAC,YAAY,EACjC,IAAA,qBAAS,EAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,EAC7C,IAAI,CAAC,eAAe,CAAC,kBAAkB,CACxC,CAAC;QAEF,MAAM,kBAAkB,GAAG,IAAA,qCAAqB,EAAC,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;QACxF,IAAI,IAAI,CAAC,eAAe,CAAC,gBAAgB,IAAI,kBAAkB,EAAE;YAC/D,MAAM,CAAC,OAAO,EAAE,CAAC,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC;SAC9E;QAED,IAAI,IAAI,CAAC,eAAe,CAAC,wBAAwB,KAAK,KAAK,EAAE;YAC3D,MAAM,CAAC,OAAO,EAAE,CAAC,qBAAqB,GAAG,SAAS,CAAC;SACpD;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,aAAK,CAAC,MAAM,CAAC,CAAC;QAEhC,0FAA0F;QAC1F,0DAA0D;QAC1D,mFAAmF;QACnF,IAAI,CAAC,cAAc,GAAG,IAAI,qBAAa,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,IAAI,oBAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,aAAa,GAAG,IAAI,oBAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,kBAAkB,GAAG,IAAI,yBAAiB,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,gBAAgB,GAAG,IAAI,uBAAe,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,IAAI,oBAAY,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,iBAAiB,GAAG,IAAI,wBAAgB,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,aAAa,GAAG,IAAI,oBAAY,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,GAAG,IAAI,sBAAc,CAAC,IAAI,CAAC,CAAC;QAEhD,qBAAqB;QACrB,sGAAsG;QACtG,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,CAAC;QAEzC,gHAAgH;QAChH,2BAA2B;QAC3B,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,CAAC;QAEjD,IAAI,CAAC,aAAa,CAAC,8BAA8B,EAAE,CAAC;QAEpD,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;gBAC7B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;aACrB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAtNH,wBAuNC;AAtNiB,cAAO,GAAG,wBAAS,CAAC,OAAO,CAAC"}
+{"version":3,"file":"viewer.js","sourceRoot":"","sources":["../../src/viewer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@combeenation/3d-viewer",
-  "version": "16.0.0",
+  "version": "17.0.0",
   "description": "Combeenation 3D Viewer",
   "homepage": "https://github.com/Combeenation/3d-viewer#readme",
   "bugs": {
@@ -41,14 +41,14 @@
     "pub-beta": "npm run dist-cjs && npm publish --tag beta",
     "pub-final": "npm run dist-cjs && npm publish",
     "pub-rc": "npm run dist-cjs && npm publish --tag rc",
-    "replace-version": "cross-env-shell replace \"@VERSION@\" $npm_package_version dist -r",
-    "types": "tsc --project declaration.tsconfig.json"
+    "replace-version": "cross-env-shell replace \"@VERSION@\" $npm_package_version dist -r"
   },
   "prettier": "@combeenation/prettier-config",
   "dependencies": {
-    "@babylonjs/core": "7.30.1",
-    "@babylonjs/loaders": "7.30.1",
-    "@babylonjs/serializers": "7.30.1",
+    "@babylonjs/core": "7.34.3",
+    "@babylonjs/gui": "7.34.3",
+    "@babylonjs/loaders": "7.34.3",
+    "@babylonjs/serializers": "7.34.3",
     "eventemitter3": "4.0.7",
     "is-svg": "^5.0.0",
     "lodash-es": "4.17.21"
@@ -78,15 +78,14 @@
     "webpack-merge": "5.8.0"
   },
   "optionalDependencies": {
-    "@babylonjs/gui": "7.30.1",
-    "@babylonjs/gui-editor": "7.30.1",
-    "@babylonjs/inspector": "7.30.1",
-    "@babylonjs/materials": "7.30.1",
-    "@babylonjs/node-editor": "7.30.1",
-    "@babylonjs/node-geometry-editor": "7.30.1"
+    "@babylonjs/gui-editor": "7.34.3",
+    "@babylonjs/inspector": "7.34.3",
+    "@babylonjs/materials": "7.34.3",
+    "@babylonjs/node-editor": "7.34.3",
+    "@babylonjs/node-geometry-editor": "7.34.3"
   },
   "dependenciesComments": {
-    "@babylonjs": "Latest version 7.30.1 is exposing the original gltf texture image name, which we need for texture image asset linking, see https://forum.babylonjs.com/t/gltfloader-option-to-keep-or-prefer-original-texture-or-image-name-as-name-of-loaded-texture/37307/9"
+    "@babylonjs": "Latest version 7.34.3 enables us to overwrite the texture display name, which is shown in the inspector (https://forum.babylonjs.com/t/add-display-name-for-textures/54745), also tags are now shown in the inspector (https://forum.babylonjs.com/t/display-tags-in-the-inspector/42781)"
   },
   "optionalDependenciesComments": {
     "@babylonjs": "Defining the inspector package (and it's dependencies) as optional is required to omit these packages in the production build of the CBN react-app (see CB-9269)"

package/src/helper/decals-helper.ts

@@ -1,10 +1,19 @@
-import { IAssetContainer, Material, Mesh, MeshBuilder, Tuple, Vector3, ViewerError, ViewerErrorIds } from '..';
+import {
+  IAssetContainer,
+  Material,
+  Mesh,
+  MeshBuilder,
+  Tuple,
+  Vector3,
+  VertexBuffer,
+  ViewerError,
+  ViewerErrorIds,
+} from '..';
 
 export const DEFAULT_DECAL_CONFIG = {
   normal: [0, 0, 1],
   angle: 0,
   offset: 0.001,
-  scaling: [1, 1, 1],
   captureUVS: false,
   cullBackFaces: true,
   localMode: true,
@@ -31,14 +40,6 @@ export type DecalConfiguration = {
    */
   offset?: number;
 
-  /**
-   * Can be used for shifting the decal away from the source mesh as alternative to `offset`.\
-   * Use this setting when the offset should be applied in radial direction (e.g. cylinders)
-   *
-   * Default `[1, 1, 1]` (no offset through scaling)
-   */
-  scaling?: Tuple<number, 3>;
-
   /**
    * `true`: Use UV mapping from source mesh\
    * `false`: Use default box mapping from the decal
@@ -86,15 +87,9 @@ export function createDecalMesh(config: DecalConfiguration, assetContainer: IAss
     });
   }
 
-  const position = Vector3.FromArray(config.position);
-  const normal = Vector3.FromArray(config.normal ?? DEFAULT_DECAL_CONFIG.normal).normalizeToNew();
-
-  const localMode = config.localMode ?? DEFAULT_DECAL_CONFIG.localMode;
-  const worldNormal = localMode ? Vector3.TransformNormal(normal, sourceMesh.getWorldMatrix()) : normal;
-
   const decalMesh = MeshBuilder.CreateDecal(config.name, sourceMesh, {
-    position: position,
-    normal: normal,
+    position: Vector3.FromArray(config.position),
+    normal: Vector3.FromArray(config.normal ?? DEFAULT_DECAL_CONFIG.normal).normalizeToNew(),
     size: Vector3.FromArray(config.size),
     angle: config.angle ?? DEFAULT_DECAL_CONFIG.angle,
     captureUVS: config.captureUVS ?? DEFAULT_DECAL_CONFIG.captureUVS,
@@ -115,11 +110,20 @@ export function createDecalMesh(config: DecalConfiguration, assetContainer: IAss
 
   // move decal away from mesh to avoid clipping
   // NOTE: zOffset of material can't be used, since it's not supported in glTF and therefore not usable in AR
-  const offsetVector = worldNormal.scale(config.offset ?? DEFAULT_DECAL_CONFIG.offset);
-  decalMesh.position.addInPlace(offsetVector);
-
-  // apply scaling, this is an alternative approach for creating an offset, which is preferred for round surfaces
-  decalMesh.scaling = Vector3.FromArray(config.scaling ?? DEFAULT_DECAL_CONFIG.scaling);
+  const positions = decalMesh.getVerticesData(VertexBuffer.PositionKind);
+  const normals = decalMesh.getVerticesData(VertexBuffer.NormalKind);
+
+  if (positions && normals) {
+    const offset = config.offset ?? DEFAULT_DECAL_CONFIG.offset;
+    // move each vertice individually along it's dedicated normal
+    for (let i = 0; i < positions.length; i += 3) {
+      positions[i] += normals[i] * offset;
+      positions[i + 1] += normals[i + 1] * offset;
+      positions[i + 2] += normals[i + 2] * offset;
+    }
+
+    decalMesh.setVerticesData(VertexBuffer.PositionKind, positions);
+  }
 
   return decalMesh;
 }

package/src/index.ts

@@ -36,11 +36,14 @@ export * from '@babylonjs/core/Meshes/meshBuilder';
 export * from '@babylonjs/core/Meshes/transformNode';
 export * from '@babylonjs/core/Misc/interfaces/screenshotSize';
 export * from '@babylonjs/core/Misc/screenshotTools';
+export * from '@babylonjs/core/Misc/tags';
 export * from '@babylonjs/core/Morph';
 export * from '@babylonjs/core/node';
 export * from '@babylonjs/core/Rendering/utilityLayerRenderer';
 export * from '@babylonjs/core/scene';
 export * from '@babylonjs/core/types';
+export * from '@babylonjs/gui/2D/advancedDynamicTexture';
+export * from '@babylonjs/gui/2D/controls/textBlock';
 export * from '@babylonjs/loaders/glTF/2.0/glTFLoader';
 export * from '@babylonjs/serializers/glTF/2.0/glTFSerializer';
 

package/src/internal/cbn-custom-babylon-loader-plugin.ts

@@ -63,7 +63,15 @@ export function registerCustomCbnBabylonLoaderPlugin(): void {
 
       _addMissingMaterialMetadata(dataParsed, importedContainer);
       _reconstructTagsForInstancedMeshes(dataParsed, importedContainer);
-      _createDecals(dataParsed, importedContainer);
+
+      try {
+        _createDecals(dataParsed, importedContainer);
+      } catch (e) {
+        // Errors are generally swallowed by the Babylon.js `loadAssetContainer` implementation, resulting in generic
+        // error message and losing the information about the original error
+        // When forwarding the message in the `onError` callback at least the message can be preserved
+        onError?.((e as Error).message);
+      }
 
       // add `cbnData` to output asset container, so that this information can be store as metadata for the model
       const extendedContainer = importedContainer as ExtendedAssetContainer;

package/src/internal/cloning-helper.ts

@@ -13,7 +13,6 @@ import {
 import {
   clearInternalMetadataValue,
   cloneInternalMetadata,
-  cloneMetadata,
   getInternalMetadataValue,
   setInternalMetadataValue,
 } from './metadata-helper';
@@ -39,38 +38,41 @@ const _defaultTagNamingStrategy: TagNamingStrategy = (tag: string, clonedObjectI
 export function cloneModelAssetContainer(
   sourceAssetContainer: AssetContainer,
   newModelName: string,
-  renaming: {
+  scene: Scene,
+  options?: {
+    createInstance?: boolean;
     nodeNamingStrategy?: NodeNamingStrategy;
     tagNamingStrategy?: TagNamingStrategy;
-  },
-  scene: Scene
+  }
 ): AssetContainer {
+  const createInstance = !!options?.createInstance;
+
   const targetAssetContainer = new AssetContainer(scene);
 
   sourceAssetContainer.rootNodes.forEach(node => {
     if (node instanceof TransformNode) {
       // this is the actual node tree cloning procedure
-      _cloneNode(node, newModelName, null, targetAssetContainer, {
-        nodeNamingStrategy: renaming?.nodeNamingStrategy,
-        tagNamingStrategy: renaming?.tagNamingStrategy,
-      });
+      _cloneNode(node, newModelName, null, targetAssetContainer, options);
     }
   });
 
   targetAssetContainer.populateRootNodes();
-  targetAssetContainer.rootNodes.forEach(node => {
-    if (node instanceof TransformNode) {
-      // reassigning instanced meshes can only be done after the model has been fully cloned, as we can't be sure if
-      // the source or instanced mesh is handled prior
-      _reAssignSourceMesh(node, sourceAssetContainer.meshes, targetAssetContainer.meshes);
-    }
-  });
 
-  // morph target manager is not cloned per default, therefore morph targets would affect original and cloned model at
-  // the same time, which we don't want
-  sourceAssetContainer.morphTargetManagers.forEach(sourceMTM => {
-    _cloneMorphTargetManager(sourceMTM, targetAssetContainer);
-  });
+  if (!createInstance) {
+    targetAssetContainer.rootNodes.forEach(node => {
+      if (node instanceof TransformNode) {
+        // reassigning instanced meshes can only be done after the model has been fully cloned, as we can't be sure if
+        // the source or instanced mesh is handled prior
+        _reAssignSourceMesh(node, sourceAssetContainer.meshes, targetAssetContainer.meshes);
+      }
+    });
+
+    // morph target manager is not cloned per default, therefore morph targets would affect original and cloned model at
+    // the same time, which we don't want
+    sourceAssetContainer.morphTargetManagers.forEach(sourceMTM => {
+      _cloneMorphTargetManager(sourceMTM, targetAssetContainer);
+    });
+  }
 
   _clearCloningMetadata(sourceAssetContainer);
   _clearCloningMetadata(targetAssetContainer);
@@ -136,47 +138,77 @@ function _cloneNode(
   newModelName: string,
   newParent: TransformNode | null,
   assetContainer: AssetContainer,
-  renaming: {
+  options?: {
+    createInstance?: boolean;
     nodeNamingStrategy?: NodeNamingStrategy;
     tagNamingStrategy?: TagNamingStrategy;
   }
 ): void {
-  const nodeNamingStrategy = renaming.nodeNamingStrategy ?? _defaultNodeNamingStrategy;
-  const tagNamingStrategy = renaming.tagNamingStrategy ?? _defaultTagNamingStrategy;
+  const nodeNamingStrategy = options?.nodeNamingStrategy ?? _defaultNodeNamingStrategy;
+  const tagNamingStrategy = options?.tagNamingStrategy ?? _defaultTagNamingStrategy;
 
   const cloneName = nodeNamingStrategy(node, newModelName);
-  const clone = node.clone(cloneName, newParent, true);
-  if (!clone) {
-    throw new Error(`Cloning node "${node.name}" failed`);
-  }
 
-  clone.id = cloneName;
-  // create a deep clone for internal metadata, as the default clone function uses the same assignment of the sources
-  // internal metadata
-  cloneInternalMetadata(node, clone);
-  // ATM the assignment from clone to source is needed for reassigning instanced meshes after cloning
-  // may be usefull for other node types in the future as well
-  setInternalMetadataValue(clone, 'cloneSource', node.uniqueId);
-  setInternalMetadataValue(node, 'cloneTarget', clone.uniqueId);
+  const createInstance = options?.createInstance && node instanceof Mesh && !!node.getTotalVertices();
+  let resultNode: TransformNode;
+  if (createInstance) {
+    const instance = node.createInstance(cloneName);
 
-  if (node instanceof InstancedMesh) {
-    _cloneInstancedMeshData(node, clone as InstancedMesh);
+    _cloneInstancedMeshData(node, instance);
+
+    instance.parent = newParent;
+    instance.position = node.position.clone();
+    instance.rotation = node.rotation.clone();
+    instance.scaling = node.scaling.clone();
+
+    if (node.rotationQuaternion) {
+      instance.rotationQuaternion = node.rotationQuaternion.clone();
+    }
+
+    resultNode = instance;
+  } else {
+    const clone = node.clone(cloneName, newParent, true);
+    if (!clone) {
+      throw new Error(`Cloning node "${node.name}" failed`);
+    }
+
+    if (node instanceof InstancedMesh) {
+      _cloneInstancedMeshData(node, clone as InstancedMesh);
+    }
+
+    // create a shallow clone for internal metadata, as the default clone function just assignes the sources internal
+    // metadata
+    cloneInternalMetadata(node, clone);
+
+    // NOTE: "public" metadata are not cloned by default, we rely on the Babylon.js default behaviour:
+    // - execute metadata.clone function if there is one
+    // - assign the metadata of the original node to the clone other wise
+    // making deep copies of the node metadata might be an optional flag in the cloning functions in the future
+
+    // ATM the assignment from clone to source is needed for reassigning instanced meshes after cloning
+    // may be usefull for other node types in the future as well
+    setInternalMetadataValue(clone, 'cloneSource', node.uniqueId);
+    setInternalMetadataValue(node, 'cloneTarget', clone.uniqueId);
+
+    resultNode = clone;
   }
 
+  resultNode.id = cloneName;
+
   const sourceTags = getTags(node);
   const mappedTags = sourceTags.map(tag => tagNamingStrategy(tag, newModelName));
-  setTags(clone, mappedTags);
+  setTags(resultNode, mappedTags);
 
-  clone._parentContainer = assetContainer;
+  resultNode._parentContainer = assetContainer;
   // TODO WTT: create global helper function for distinguishing between transform nodes and meshes
-  if (clone instanceof AbstractMesh) {
-    assetContainer.meshes.push(clone);
+  if (resultNode instanceof AbstractMesh) {
+    assetContainer.meshes.push(resultNode);
   } else {
-    assetContainer.transformNodes.push(clone);
+    assetContainer.transformNodes.push(resultNode);
   }
 
   const children = node.getChildTransformNodes(true);
-  children.forEach(child => _cloneNode(child, newModelName, clone, assetContainer, renaming));
+  children.forEach(child => _cloneNode(child, newModelName, resultNode, assetContainer, options));
 }
 
 /**
@@ -189,16 +221,10 @@ function _reAssignSourceMesh(node: TransformNode, sourceMeshes: AbstractMesh[],
   if (node instanceof InstancedMesh) {
     // find the cloned instance and source mesh
     const clonedInstance = node;
-    const originalInstance = _findByUniqueId(
-      sourceMeshes,
-      getInternalMetadataValue(clonedInstance, 'cloneSource') as number
-    );
+    const originalInstance = _findByUniqueId(sourceMeshes, getInternalMetadataValue(clonedInstance, 'cloneSource'));
     if (originalInstance instanceof InstancedMesh) {
       const originalSource = originalInstance.sourceMesh;
-      const clonedSource = _findByUniqueId(
-        clonedMeshes,
-        getInternalMetadataValue(originalSource, 'cloneTarget') as number
-      );
+      const clonedSource = _findByUniqueId(clonedMeshes, getInternalMetadataValue(originalSource, 'cloneTarget'));
       if (clonedSource instanceof Mesh) {
         // it's not possible to just exchange the source mesh => readonly property
         // we have to create a new clone with the correct source mesh
@@ -238,10 +264,12 @@ function _clearCloningMetadata(assetContainer: AssetContainer): void {
  * correctly.
  * This function adjusts the behaviour to fulfill our expectations.
  */
-function _cloneInstancedMeshData(sourceInstancedMesh: InstancedMesh, targetInstancedMesh: InstancedMesh): void {
-  targetInstancedMesh.setEnabled(sourceInstancedMesh.isEnabled(false));
-  cloneMetadata(sourceInstancedMesh, targetInstancedMesh);
-  cloneTags(sourceInstancedMesh, targetInstancedMesh);
+function _cloneInstancedMeshData(sourceMesh: AbstractMesh, targetInstancedMesh: InstancedMesh): void {
+  targetInstancedMesh.setEnabled(sourceMesh.isEnabled(false));
+
+  // handling of tags and metadata is exactly the same as in the original Babylon.js code
+  cloneTags(sourceMesh, targetInstancedMesh);
+  targetInstancedMesh.metadata = sourceMesh.metadata?.clone?.() ?? sourceMesh.metadata;
 }
 
 function _findByUniqueId(nodes: TransformNode[], uniqueId: number): TransformNode | undefined {

package/src/internal/metadata-helper.ts

@@ -1,29 +1,36 @@
 import { BaseTexture, Material, Node } from '../index';
-import { cloneDeep } from 'lodash-es';
 
-type MetadataValue = string | number | boolean | object | undefined;
 type MetadataTarget = Node | Material | BaseTexture;
-type MetadataKeys =
+
+// this map contains all allowed metadata keys and the associated typings, which can then be used as generic of the API
+// functions
+// IMPORTANT: only use primitive types (string|number|boolean) for metadata as we rely on shallow copying
+type MetadataValueMap = {
   // CBN babylon loader
-  | 'deferredMaterial'
+  deferredMaterial: string;
   // material manager
-  | 'materialToBeSet'
+  materialToBeSet: string;
   // GLTF export
-  | 'exportNode'
-  | 'deleteAfterExport'
-  | 'exchangeMaterialWith'
+  exportNode: boolean;
+  deleteAfterExport: boolean;
+  exchangeMaterialWith: number;
   // cloning
-  | 'cloneSource'
-  | 'cloneTarget';
+  cloneSource: number;
+  cloneTarget: number;
+};
+type MetadataKeys = keyof MetadataValueMap;
 
-// TODO WTT: use generics or some kind of logic that is able to type the metadata according to their key
 /**
  * Sets certain metadata on the objects INTERNAL metadata storage.
  * "object._internalMetadata.cbn" is reserved for CBN specific metadata information.
  * The objects public metadata ("object.metadata") is not affected and should therefore not interfere with metadata
  * that is used in consumer projects.
  */
-export function setInternalMetadataValue(object: MetadataTarget, key: MetadataKeys, value: MetadataValue): void {
+export function setInternalMetadataValue<K extends MetadataKeys>(
+  object: MetadataTarget,
+  key: K,
+  value: MetadataValueMap[K]
+): void {
   if (!object._internalMetadata) {
     object._internalMetadata = {};
   }
@@ -38,26 +45,22 @@ export function clearInternalMetadataValue(object: MetadataTarget, key: Metadata
   delete object._internalMetadata?.cbn?.[key];
 }
 
-export function getInternalMetadataValue(object: MetadataTarget, key: MetadataKeys): MetadataValue {
+export function getInternalMetadataValue<K extends MetadataKeys>(object: MetadataTarget, key: K): MetadataValueMap[K] {
   return object._internalMetadata?.cbn?.[key];
 }
 
 /**
- * Creates a deep clone from the source objects internal metadata and assigns it to the target objects metadata.
- * This is required as Babylon.js only creates shallow clones of the internal metadata, which would be problematic for
- * our needs.
+ * This only creates a (shallow) clone of the CBN internal metadata, as we need to have individual metadata for our
+ * viewer state handling in each node.
+ * The rest, which is coming from Babylon.js directly, is left untouched as we don't interfere with this data anyway.
  */
 export function cloneInternalMetadata(sourceObject: MetadataTarget, targetObject: MetadataTarget): void {
-  targetObject._internalMetadata = cloneDeep(sourceObject._internalMetadata);
-}
-
-/**
- * Clones the metadata from one object to another.
- * CAUTION: this is now the public available "object.metadata" object.
- * We need this function internally when cloning instanced meshes.
- */
-export function cloneMetadata(sourceObject: MetadataTarget, targetObject: MetadataTarget): void {
-  const clonedMetadata = cloneDeep(sourceObject.metadata);
-
-  targetObject.metadata = clonedMetadata;
+  if (!sourceObject._internalMetadata?.cbn) {
+    targetObject._internalMetadata = sourceObject._internalMetadata;
+  } else {
+    targetObject._internalMetadata = {
+      ...sourceObject._internalMetadata,
+      cbn: { ...sourceObject._internalMetadata.cbn },
+    };
+  }
 }

package/src/internal/tags-helper.ts

@@ -1,5 +1,4 @@
-import { Material, Node } from '../index';
-import { Tags } from '@babylonjs/core/Misc/tags';
+import { Material, Node, Tags } from '../index';
 
 /**
  * This is a wrapper around Babylon.js Tags API, as the API is really clunky to use