From 3ad3dfd6623e23ac3a5fef4559ba79052ee6656f Mon Sep 17 00:00:00 2001 From: Yuriy Toporovskyy Date: Thu, 5 Aug 2021 10:50:29 -0400 Subject: [PATCH] Address PR feedback Signed-off-by: Yuriy Toporovskyy --- Code/Editor/EditorViewportWidget.cpp | 2 +- Code/Editor/UndoViewRotation.cpp | 5 ++++- Code/Framework/AzCore/AzCore/Math/MatrixUtils.cpp | 2 +- .../Code/Source/Editor/AudioControlsEditorPlugin.cpp | 5 ++++- Gems/Camera/Code/Source/CameraSystemComponent.cpp | 9 +++++---- Gems/Camera/Code/Source/CameraSystemComponent.h | 3 ++- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp index b205ca5b78..26c96f54b1 100644 --- a/Code/Editor/EditorViewportWidget.cpp +++ b/Code/Editor/EditorViewportWidget.cpp @@ -2513,7 +2513,7 @@ void EditorViewportWidget::SetViewAndMovementLockFromEntityPerspective(const AZ: if (entityId.IsValid()) { - EBUS_EVENT_ID(entityId, Camera::CameraRequestBus, MakeActiveView); + Camera::CameraRequestBus::Event(entityId, &Camera::CameraRequestBus::Events::MakeActiveView); } else { diff --git a/Code/Editor/UndoViewRotation.cpp b/Code/Editor/UndoViewRotation.cpp index c3c6f4253a..a305641d3b 100644 --- a/Code/Editor/UndoViewRotation.cpp +++ b/Code/Editor/UndoViewRotation.cpp @@ -25,7 +25,10 @@ Ang3 CUndoViewRotation::GetActiveCameraRotation() { AZ::Transform activeCameraTm = AZ::Transform::CreateIdentity(); - EBUS_EVENT_RESULT(activeCameraTm, Camera::ActiveCameraRequestBus, GetActiveCameraTransform); + Camera::ActiveCameraRequestBus::BroadcastResult( + activeCameraTm, + &Camera::ActiveCameraRequestBus::Events::GetActiveCameraTransform + ); const AZ::Matrix3x4 cameraMatrix = AZ::Matrix3x4::CreateFromTransform(activeCameraTm); const Matrix33 cameraMatrixCry = AZMatrix3x3ToLYMatrix3x3(AZ::Matrix3x3::CreateFromMatrix3x4(cameraMatrix)); return RAD2DEG(Ang3::GetAnglesXYZ(cameraMatrixCry)); diff --git a/Code/Framework/AzCore/AzCore/Math/MatrixUtils.cpp b/Code/Framework/AzCore/AzCore/Math/MatrixUtils.cpp index c5b76cbab7..eabfcd8cf0 100644 --- a/Code/Framework/AzCore/AzCore/Math/MatrixUtils.cpp +++ b/Code/Framework/AzCore/AzCore/Math/MatrixUtils.cpp @@ -57,7 +57,7 @@ namespace AZ float GetPerspectiveMatrixFOV(const Matrix4x4& m) { - return 2.0 * atan(1.0f / m.GetElement(1, 1)); + return 2.0 * AZStd::atan(1.0f / m.GetElement(1, 1)); } Matrix4x4* MakeFrustumMatrixRH(Matrix4x4& out, float left, float right, float bottom, float top, float nearDist, float farDist, bool reverseDepth) diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp index 2a97bdfb92..2b7023df61 100644 --- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp +++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorPlugin.cpp @@ -151,7 +151,10 @@ void CAudioControlsEditorPlugin::ExecuteTrigger(const AZStd::string_view sTrigge if (ms_nAudioTriggerID != INVALID_AUDIO_CONTROL_ID) { AZ::Transform activeCameraTm = AZ::Transform::CreateIdentity(); - EBUS_EVENT_RESULT(activeCameraTm, Camera::ActiveCameraRequestBus, GetActiveCameraTransform); + Camera::ActiveCameraRequestBus::BroadcastResult( + activeCameraTm, + &Camera::ActiveCameraRequestBus::Events::GetActiveCameraTransform + ); const AZ::Matrix3x4 cameraMatrix = AZ::Matrix3x4::CreateFromTransform(activeCameraTm); Audio::SAudioRequest request; diff --git a/Gems/Camera/Code/Source/CameraSystemComponent.cpp b/Gems/Camera/Code/Source/CameraSystemComponent.cpp index 7c7dac429d..e9b0132cf8 100644 --- a/Gems/Camera/Code/Source/CameraSystemComponent.cpp +++ b/Gems/Camera/Code/Source/CameraSystemComponent.cpp @@ -1,5 +1,6 @@ /* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. + * Copyright (c) Contributors to the Open 3D Engine Project. + * For complete copyright and license terms please see the LICENSE at the root of this distribution. * * SPDX-License-Identifier: Apache-2.0 OR MIT * @@ -19,7 +20,7 @@ namespace Camera { void CameraSystemComponent::Reflect(AZ::ReflectContext* context) { - if (AZ::SerializeContext* serializeContext = azrtti_cast(context)) + if (auto serializeContext = azrtti_cast(context)) { serializeContext->Class() ->Version(1) @@ -36,9 +37,9 @@ namespace Camera void CameraSystemComponent::Deactivate() { - CameraSystemRequestBus::Handler::BusDisconnect(); - ActiveCameraRequestBus::Handler::BusDisconnect(); CameraNotificationBus::Handler::BusDisconnect(); + ActiveCameraRequestBus::Handler::BusDisconnect(); + CameraSystemRequestBus::Handler::BusDisconnect(); } AZ::EntityId CameraSystemComponent::GetActiveCamera() diff --git a/Gems/Camera/Code/Source/CameraSystemComponent.h b/Gems/Camera/Code/Source/CameraSystemComponent.h index 726975ff9d..1b8f31b91e 100644 --- a/Gems/Camera/Code/Source/CameraSystemComponent.h +++ b/Gems/Camera/Code/Source/CameraSystemComponent.h @@ -1,5 +1,6 @@ /* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. + * Copyright (c) Contributors to the Open 3D Engine Project. + * For complete copyright and license terms please see the LICENSE at the root of this distribution. * * SPDX-License-Identifier: Apache-2.0 OR MIT *