Merge branch 'master' into np/tree

cognitedata · Oct 22, 2024 · 4f7dd37 · 4f7dd37
2 parents b7d0f5a + f1c4587
commit 4f7dd37
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/viewer/package.json b/viewer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cognite/reveal",
-  "version": "4.19.0",
+  "version": "4.19.1",
   "description": "WebGL based 3D viewer for CAD and point clouds processed in Cognite Data Fusion.",
   "homepage": "https://github.com/cognitedata/reveal/tree/master/viewer",
   "repository": {

diff --git a/viewer/packages/api/src/api-helpers/Image360ApiHelper.ts b/viewer/packages/api/src/api-helpers/Image360ApiHelper.ts
@@ -42,6 +42,7 @@ import {
 import { MetricsLogger } from '@reveal/metrics';
 import debounce from 'lodash/debounce';
 import { Image360WithCollection } from '../public/types';
+import { DEFAULT_IMAGE_360_OPACITY } from '@reveal/360-images/src/entity/Image360VisualizationBox';
 
 export class Image360ApiHelper {
   private readonly _image360Facade: Image360Facade<Metadata | Image360DataModelIdentifier>;
@@ -273,6 +274,9 @@ export class Image360ApiHelper {
 
     image360Entity.icon.setVisible(false);
     image360Entity.image360Visualization.visible = true;
+
+    const currentOpacity = this.getImageOpacity();
+
     this._image360Facade.allIconCullingScheme = 'proximity';
 
     // Only do transition if we are switching between entities.
@@ -292,12 +296,12 @@ export class Image360ApiHelper {
         if (flexibleCameraManager) {
           await Promise.all([
             moveCameraPositionTo(flexibleCameraManager, position, transitionDuration),
-            this.tweenVisualizationAlpha(image360Entity, 0, 1, transitionDuration)
+            this.tweenVisualizationAlpha(image360Entity, 0, currentOpacity, transitionDuration)
           ]);
         } else if (this._stationaryCameraManager) {
           await Promise.all([
             this._stationaryCameraManager.moveTo(position, transitionDuration),
-            this.tweenVisualizationAlpha(image360Entity, 0, 1, transitionDuration)
+            this.tweenVisualizationAlpha(image360Entity, 0, currentOpacity, transitionDuration)
           ]);
         }
         image360Entity.activateAnnotations();
@@ -593,6 +597,13 @@ export class Image360ApiHelper {
     }
     this.exit360Image();
   }
+
+  private getImageOpacity(): number {
+    for (const image360Collection of this._image360Facade.collections) {
+      return image360Collection.getImagesOpacity();
+    }
+    return DEFAULT_IMAGE_360_OPACITY;
+  }
 }
 
 //================================================