fix: Cesium flashes on camera change (#257)

Co-authored-by: rot1024 <aayhrot@gmail.com>
reearth · Jun 23, 2022 · ad2c0e3 · ad2c0e3
1 parent 19fcb69
commit ad2c0e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/components/molecules/Visualizer/Engine/Cesium/PhotoOverlay/hooks.ts b/src/components/molecules/Visualizer/Engine/Cesium/PhotoOverlay/hooks.ts
@@ -79,8 +79,8 @@ export default function ({ isSelected, camera }: { isSelected?: boolean; camera?
       const fov = prevCamera.current?.fov ?? defaultFOV;
       flyTo?.({ fov }, { duration: 0 });
     }
-    // skip camera flight when selected layer was changed by storytelling widget
-    startTransition(!isSelected, storytelling.current ? !isSelected : !cameraRef.current);
+    // skip camera flight when is not selected
+    startTransition(!isSelected, !isSelected);
   }, [flyTo, startTransition, isSelected]);
 
   const transition = useTransition(

diff --git a/src/components/molecules/Visualizer/Engine/Cesium/hooks.ts b/src/components/molecules/Visualizer/Engine/Cesium/hooks.ts
@@ -172,14 +172,12 @@ export default ({
   }, []);
 
   // call onCameraChange event after moving camera
-  const emittedCamera = useRef<Camera>();
   const updateCamera = useCallback(() => {
     const viewer = cesium?.current?.cesiumElement;
     if (!viewer || viewer.isDestroyed() || !onCameraChange) return;
 
     const c = getCamera(viewer);
     if (c && !isEqual(c, camera)) {
-      emittedCamera.current = c;
       onCameraChange?.(c);
     }
   }, [camera, onCameraChange]);
@@ -192,14 +190,6 @@ export default ({
     updateCamera();
   }, [updateCamera]);
 
-  // camera
-  useEffect(() => {
-    if (camera && (!emittedCamera.current || emittedCamera.current !== camera)) {
-      engineAPI.flyTo(camera, { duration: 0 });
-      emittedCamera.current = undefined;
-    }
-  }, [camera, engineAPI]);
-
   // manage layer selection
   useEffect(() => {
     const viewer = cesium.current?.cesiumElement;