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

package/package.json

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

package/src/api/manager/gltfExportManager.ts

@@ -3,6 +3,7 @@ import { Viewer } from '../classes/viewer';
 import { injectMetadata } from '../util/babylonHelper';
 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';
@@ -199,14 +200,15 @@ export class GltfExportManager {
       engine.getCaps().maxTextureSize = 1024;
     }
 
+    // overwritting _LastCreatedScene to fix issue: https://combeenation.youtrack.cloud/issue/CB-8972
+    // In short: dummy scene erroneously interacts with original viewer scene
+    // setting viewer scene as fallback again (`_LastCreatedScene`) resolves that issue
+    const curLastScene = EngineStore._LastCreatedScene;
+    const newScene = new Scene(engine);
+    EngineStore._LastCreatedScene = curLastScene;
+
     SceneLoader.ShowLoadingScreen = false;
-    const newScene = await SceneLoader.LoadAsync(
-      '',
-      'data:' + JSON.stringify(serializedScene),
-      engine,
-      undefined,
-      '.babylon'
-    );
+    await SceneLoader.AppendAsync('', 'data:' + JSON.stringify(serializedScene), newScene, undefined, '.babylon');
 
     return newScene;
   }

package/src/api/util/geometryHelper.ts

@@ -82,6 +82,10 @@ const bakeGeometryOfMesh = function (mesh: Mesh) {
   mesh.bakeCurrentTransformIntoVertices();
 };
 
+/**
+ * @param kind morph targets can affect various vertices kinds, whereas "position" is the most common one
+ * still other kinds (like normals or tangents) can be affected as well and can be provided on this input
+ */
 const bakeMorphTargetManagerIntoVertices = function (
   kind: string,
   morphTargetManager: MorphTargetManager,
@@ -113,13 +117,13 @@ const bakeMorphTargetManagerIntoVertices = function (
 
 const getVerticesDataFromMorphTarget = function (kind: string, morphTarget: MorphTarget): Nullable<FloatArray> {
   switch (kind) {
-    case 'position':
+    case VertexBuffer.PositionKind:
       return morphTarget.getPositions();
-    case 'normal':
+    case VertexBuffer.NormalKind:
       return morphTarget.getNormals();
-    case 'tangent':
+    case VertexBuffer.TangentKind:
       return morphTarget.getTangents();
-    case 'uv':
+    case VertexBuffer.UVKind:
       return morphTarget.getUVs();
   }
 

package/src/api/util/structureHelper.ts

@@ -13,7 +13,6 @@ import { Tags } from '@babylonjs/core/Misc/tags';
  */
 const isNodeIncludedInExclusionList = function (node: TransformNode, list: ExcludedGeometryList): boolean {
   const checkNode = (inputNode: TransformNode, nodeToCheck: TransformNode) => {
-    // return inputNode.uniqueId === nodeToCheck.uniqueId;
     // check name instead of unique id, since the unique id changes when copying the scene, which is the case in the
     // GLB export
     const nodeName = nodeToCheck.metadata?.[GltfExportManager.NAME_BEFORE_EXPORT_METADATA_PROPERTY] ?? nodeToCheck.name;