Resolved merge conflicts

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

Code/Editor/EditorViewportCamera.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <SandboxAPI.h>
+
+namespace AZ
+{
+    class Transform;
+    class Vector3;
+} // namespace AZ
+
+namespace SandboxEditor
+{
+    //! Set the default viewport camera translation/position.
+    SANDBOX_API void SetDefaultViewportCameraPosition(const AZ::Vector3& position);
+
+    //! Set the default viewport camera orientation/rotation.
+    //! @param pitch Amount of pitch in radians.
+    //! @param yaw Amount of yaw in radians.
+    SANDBOX_API void SetDefaultViewportCameraRotation(float pitch, float yaw);
+
+    //! Set the camera to interpolate to the given position and orientation.
+    //! @param position The new position of the camera.
+    //! @param pitch Amount of pitch in radians.
+    //! @param yaw Amount of yaw in radians.
+    SANDBOX_API void InterpolateDefaultViewportCameraToTransform(const AZ::Vector3& position, float pitch, float yaw);
+
+    //! Get the default viewport camera transform.
+    SANDBOX_API AZ::Transform GetDefaultViewportCameraTransform();
+} // namespace SandboxEditor