|
|
|
@ -75,7 +75,10 @@ void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serial
|
|
|
|
->Field("CaptureCursorLook", &CameraMovementSettings::m_captureCursorLook)
|
|
|
|
->Field("CaptureCursorLook", &CameraMovementSettings::m_captureCursorLook)
|
|
|
|
->Field("OrbitYawRotationInverted", &CameraMovementSettings::m_orbitYawRotationInverted)
|
|
|
|
->Field("OrbitYawRotationInverted", &CameraMovementSettings::m_orbitYawRotationInverted)
|
|
|
|
->Field("PanInvertedX", &CameraMovementSettings::m_panInvertedX)
|
|
|
|
->Field("PanInvertedX", &CameraMovementSettings::m_panInvertedX)
|
|
|
|
->Field("PanInvertedY", &CameraMovementSettings::m_panInvertedY);
|
|
|
|
->Field("PanInvertedY", &CameraMovementSettings::m_panInvertedY)
|
|
|
|
|
|
|
|
->Field("DefaultPositionX", &CameraMovementSettings::m_defaultCameraPositionX)
|
|
|
|
|
|
|
|
->Field("DefaultPositionY", &CameraMovementSettings::m_defaultCameraPositionY)
|
|
|
|
|
|
|
|
->Field("DefaultPositionZ", &CameraMovementSettings::m_defaultCameraPositionZ);
|
|
|
|
|
|
|
|
|
|
|
|
serialize.Class<CameraInputSettings>()
|
|
|
|
serialize.Class<CameraInputSettings>()
|
|
|
|
->Version(2)
|
|
|
|
->Version(2)
|
|
|
|
@ -154,7 +157,16 @@ void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serial
|
|
|
|
"Invert direction of pan in local Y axis")
|
|
|
|
"Invert direction of pan in local Y axis")
|
|
|
|
->DataElement(
|
|
|
|
->DataElement(
|
|
|
|
AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_captureCursorLook, "Camera Capture Look Cursor",
|
|
|
|
AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_captureCursorLook, "Camera Capture Look Cursor",
|
|
|
|
"Should the cursor be captured (hidden) while performing free look");
|
|
|
|
"Should the cursor be captured (hidden) while performing free look")
|
|
|
|
|
|
|
|
->DataElement(
|
|
|
|
|
|
|
|
AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_defaultCameraPositionX, "Default Camera X Position",
|
|
|
|
|
|
|
|
"Default Camera X Position when a level is opened")
|
|
|
|
|
|
|
|
->DataElement(
|
|
|
|
|
|
|
|
AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_defaultCameraPositionY, "Default Camera Y Position",
|
|
|
|
|
|
|
|
"Default Camera Y Position when a level is opened")
|
|
|
|
|
|
|
|
->DataElement(
|
|
|
|
|
|
|
|
AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_defaultCameraPositionZ, "Default Camera Z Position",
|
|
|
|
|
|
|
|
"Default Camera Z Position when a level is opened");
|
|
|
|
|
|
|
|
|
|
|
|
editContext->Class<CameraInputSettings>("Camera Input Settings", "")
|
|
|
|
editContext->Class<CameraInputSettings>("Camera Input Settings", "")
|
|
|
|
->DataElement(
|
|
|
|
->DataElement(
|
|
|
|
@ -271,6 +283,12 @@ void CEditorPreferencesPage_ViewportCamera::OnApply()
|
|
|
|
SandboxEditor::SetCameraOrbitYawRotationInverted(m_cameraMovementSettings.m_orbitYawRotationInverted);
|
|
|
|
SandboxEditor::SetCameraOrbitYawRotationInverted(m_cameraMovementSettings.m_orbitYawRotationInverted);
|
|
|
|
SandboxEditor::SetCameraPanInvertedX(m_cameraMovementSettings.m_panInvertedX);
|
|
|
|
SandboxEditor::SetCameraPanInvertedX(m_cameraMovementSettings.m_panInvertedX);
|
|
|
|
SandboxEditor::SetCameraPanInvertedY(m_cameraMovementSettings.m_panInvertedY);
|
|
|
|
SandboxEditor::SetCameraPanInvertedY(m_cameraMovementSettings.m_panInvertedY);
|
|
|
|
|
|
|
|
SandboxEditor::SetDefaultCameraEditorPosition(
|
|
|
|
|
|
|
|
AZ::Vector3(
|
|
|
|
|
|
|
|
m_cameraMovementSettings.m_defaultCameraPositionX,
|
|
|
|
|
|
|
|
m_cameraMovementSettings.m_defaultCameraPositionY,
|
|
|
|
|
|
|
|
m_cameraMovementSettings.m_defaultCameraPositionZ
|
|
|
|
|
|
|
|
));
|
|
|
|
|
|
|
|
|
|
|
|
SandboxEditor::SetCameraTranslateForwardChannelId(m_cameraInputSettings.m_translateForwardChannelId);
|
|
|
|
SandboxEditor::SetCameraTranslateForwardChannelId(m_cameraInputSettings.m_translateForwardChannelId);
|
|
|
|
SandboxEditor::SetCameraTranslateBackwardChannelId(m_cameraInputSettings.m_translateBackwardChannelId);
|
|
|
|
SandboxEditor::SetCameraTranslateBackwardChannelId(m_cameraInputSettings.m_translateBackwardChannelId);
|
|
|
|
@ -308,6 +326,11 @@ void CEditorPreferencesPage_ViewportCamera::InitializeSettings()
|
|
|
|
m_cameraMovementSettings.m_panInvertedX = SandboxEditor::CameraPanInvertedX();
|
|
|
|
m_cameraMovementSettings.m_panInvertedX = SandboxEditor::CameraPanInvertedX();
|
|
|
|
m_cameraMovementSettings.m_panInvertedY = SandboxEditor::CameraPanInvertedY();
|
|
|
|
m_cameraMovementSettings.m_panInvertedY = SandboxEditor::CameraPanInvertedY();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AZ::Vector3 defaultCameraPosition = SandboxEditor::DefaultEditorCameraPosition();
|
|
|
|
|
|
|
|
m_cameraMovementSettings.m_defaultCameraPositionX = defaultCameraPosition.GetX();
|
|
|
|
|
|
|
|
m_cameraMovementSettings.m_defaultCameraPositionY = defaultCameraPosition.GetY();
|
|
|
|
|
|
|
|
m_cameraMovementSettings.m_defaultCameraPositionZ = defaultCameraPosition.GetZ();
|
|
|
|
|
|
|
|
|
|
|
|
m_cameraInputSettings.m_translateForwardChannelId = SandboxEditor::CameraTranslateForwardChannelId().GetName();
|
|
|
|
m_cameraInputSettings.m_translateForwardChannelId = SandboxEditor::CameraTranslateForwardChannelId().GetName();
|
|
|
|
m_cameraInputSettings.m_translateBackwardChannelId = SandboxEditor::CameraTranslateBackwardChannelId().GetName();
|
|
|
|
m_cameraInputSettings.m_translateBackwardChannelId = SandboxEditor::CameraTranslateBackwardChannelId().GetName();
|
|
|
|
m_cameraInputSettings.m_translateLeftChannelId = SandboxEditor::CameraTranslateLeftChannelId().GetName();
|
|
|
|
m_cameraInputSettings.m_translateLeftChannelId = SandboxEditor::CameraTranslateLeftChannelId().GetName();
|
|
|
|
|