Merge pull request #470 from aws-lumberyard-dev/hultonha_LYN-2315_camera-phase-2

Updates to new Camera System (part 2 - still in progress)

Code/Sandbox/Editor/CryEditDoc.cpp

@@ -28,6 +28,11 @@
 #include <AzFramework/Archive/IArchive.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/API/AtomActiveInterface.h>
+#include <AzFramework/Viewport/CameraInput.h>
+
+// Atom
+#include <Atom/RPI.Public/ViewportContext.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
 
 // AzToolsFramework
 #include <AzToolsFramework/Slice/SliceUtilities.h>
@@ -647,13 +652,21 @@ void CCryEditDoc::SerializeViewSettings(CXmlArchive& xmlAr)
 
             CViewport* pVP = GetIEditor()->GetViewManager()->GetView(i);
 
+            Matrix34 tm = Matrix34::CreateRotationXYZ(va);
+            tm.SetTranslation(vp);
+
             if (pVP)
             {
-                Matrix34 tm = Matrix34::CreateRotationXYZ(va);
-                tm.SetTranslation(vp);
                 pVP->SetViewTM(tm);
             }
 
+            if (auto viewportContext = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get()->GetDefaultViewportContext())
+            {
+                AzFramework::ModernViewportCameraControllerRequestBus::Event(
+                    viewportContext->GetId(), &AzFramework::ModernViewportCameraControllerRequestBus::Events::SetTargetCameraTransform,
+                    LYTransformToAZTransform(tm));
+            }
+
             // Load grid.
             auto gridName = QString("Grid%1").arg(useOldViewFormat ? "" : QString::number(i));
             XmlNodeRef gridNode = xmlAr.root->newChild(gridName.toUtf8().constData());