From 60083c8101f5d753ffabffca831b96078d3cb60a Mon Sep 17 00:00:00 2001
From: Jonathan Wills <jdubs@amazon.com>
Date: Thu, 29 Sep 2022 15:09:21 -0700
Subject: [PATCH] Fixes the Camera Component Editor for Lens and Clipping
 planes updates when changing between cameras

---
 packages/scene-composer/package.json          |   6 +-
 .../CameraComponentEditor.tsx                 | 131 ++++++++++--------
 2 files changed, 80 insertions(+), 57 deletions(-)

diff --git a/packages/scene-composer/package.json b/packages/scene-composer/package.json
index dc9f1a20b..838b3d4ef 100644
--- a/packages/scene-composer/package.json
+++ b/packages/scene-composer/package.json
@@ -154,10 +154,10 @@
   "jest": {
     "coverageThreshold": {
       "global": {
-        "lines": 76.6,
-        "statements": 75.7,
+        "lines": 76.64,
+        "statements": 75.75,
         "functions": 76.03,
-        "branches": 62.0,
+        "branches": 62.22,
         "branchesTrue": 100
       }
     }
diff --git a/packages/scene-composer/src/components/panels/scene-components/CameraComponentEditor.tsx b/packages/scene-composer/src/components/panels/scene-components/CameraComponentEditor.tsx
index ebb9f7712..2380a00b7 100644
--- a/packages/scene-composer/src/components/panels/scene-components/CameraComponentEditor.tsx
+++ b/packages/scene-composer/src/components/panels/scene-components/CameraComponentEditor.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { PerspectiveCamera } from 'three';
 import { Button, FormField, Grid, Select, SpaceBetween, TextContent } from '@awsui/components-react';
 import { useIntl } from 'react-intl';
@@ -74,6 +74,8 @@ const CameraComponentEditor: React.FC<ICameraComponentEditorProps> = ({
     zoom: cameraComponent.zoom,
   });
 
+  const [needsUpdate, setNeedsUpdate] = useState<boolean>(false);
+
   const focalLengthOptions = [
     {
       label: focalLengthIntlMessages.fifteenMilliMeters,
@@ -128,52 +130,51 @@ const CameraComponentEditor: React.FC<ICameraComponentEditorProps> = ({
     },
   ];
 
-  const recalculateCameraSettings = useMemo(
-    () =>
-      (updatedSettings: {
-        fov?: number;
-        focalLength?: number;
-        zoom?: number;
-        near?: number;
-        far?: number;
-      }): CameraEditorSettings => {
-        const aspectDefault = 1;
-        const tempCamera = new PerspectiveCamera(
-          cameraSettings.fov,
-          aspectDefault,
-          cameraSettings.near,
-          cameraSettings.far,
-        );
-
-        if (updatedSettings.far) {
-          tempCamera.far = updatedSettings.far;
-        }
-
-        if (updatedSettings.near) {
-          tempCamera.near = updatedSettings.near;
-        }
-
-        if (updatedSettings.fov) {
-          tempCamera.fov = updatedSettings.fov;
-        }
-
-        if (updatedSettings.focalLength) {
-          tempCamera.setFocalLength(updatedSettings.focalLength);
-        }
-
-        if (updatedSettings.zoom) {
-          tempCamera.zoom = updatedSettings.zoom;
-        }
-
-        return {
-          cameraType: cameraSettings.cameraType,
-          focalLength: tempCamera.getFocalLength(),
-          fov: tempCamera.getEffectiveFOV(),
-          far: tempCamera.far,
-          near: tempCamera.near,
-          zoom: tempCamera.zoom,
-        };
-      },
+  const recalculateCameraSettings = useCallback(
+    (updatedSettings: {
+      fov?: number;
+      focalLength?: number;
+      zoom?: number;
+      near?: number;
+      far?: number;
+    }): CameraEditorSettings => {
+      const aspectDefault = 1;
+      const tempCamera = new PerspectiveCamera(
+        cameraSettings.fov,
+        aspectDefault,
+        cameraSettings.near,
+        cameraSettings.far,
+      );
+
+      if (updatedSettings.far) {
+        tempCamera.far = updatedSettings.far;
+      }
+
+      if (updatedSettings.near) {
+        tempCamera.near = updatedSettings.near;
+      }
+
+      if (updatedSettings.fov) {
+        tempCamera.fov = updatedSettings.fov;
+      }
+
+      if (updatedSettings.focalLength) {
+        tempCamera.setFocalLength(updatedSettings.focalLength);
+      }
+
+      if (updatedSettings.zoom) {
+        tempCamera.zoom = updatedSettings.zoom;
+      }
+
+      return {
+        cameraType: cameraSettings.cameraType,
+        focalLength: tempCamera.getFocalLength(),
+        fov: tempCamera.getEffectiveFOV(),
+        far: tempCamera.far,
+        near: tempCamera.near,
+        zoom: tempCamera.zoom,
+      };
+    },
     [cameraSettings],
   );
 
@@ -224,6 +225,24 @@ const CameraComponentEditor: React.FC<ICameraComponentEditorProps> = ({
     }
   };
 
+  useEffect(() => {
+    const updatedSettings = recalculateCameraSettings({
+      fov: cameraComponent.fov,
+      far: cameraComponent.far,
+      near: cameraComponent.near,
+      zoom: cameraComponent.zoom,
+    });
+    updateFocalLength(updatedSettings.focalLength);
+    updateZoom(updatedSettings.zoom);
+    setCameraSettings({
+      cameraType: cameraComponent.cameraType,
+      fov: updatedSettings.fov,
+      far: updatedSettings.far,
+      near: updatedSettings.near,
+      zoom: updatedSettings.zoom,
+    });
+  }, [cameraComponent.ref]);
+
   const updateSettings = (updatedSettings: CameraEditorSettings) => {
     const updatedCameraSettings = {
       cameraType: updatedSettings.cameraType,
@@ -236,16 +255,20 @@ const CameraComponentEditor: React.FC<ICameraComponentEditorProps> = ({
     setCameraSettings(updatedCameraSettings);
     updateFocalLength(updatedSettings.focalLength);
     updateZoom(updatedSettings.zoom);
+    setNeedsUpdate(true);
   };
 
   useEffect(() => {
-    const updatedComponent: ICameraComponentInternal = {
-      ...component,
-      ...cameraSettings,
-    };
-
-    updateComponentInternal(node.ref, updatedComponent, true);
-  }, [cameraSettings]);
+    if (needsUpdate) {
+      const updatedComponent: ICameraComponentInternal = {
+        ...component,
+        ...cameraSettings,
+      };
+
+      updateComponentInternal(node.ref, updatedComponent, true);
+      setNeedsUpdate(false);
+    }
+  }, [needsUpdate]);
 
   return (
     <SpaceBetween size='m'>