birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small camera updates (#1460, LYN-2315)

Browse Source 
* add interpolation for goto position/orientation

* resize default camera look-at point
This commit is contained in:
Tom Hulton-Harrop
2021-06-22 12:53:20 +01:00
committed by GitHub
parent 706cf0e9c3
commit dc343e2b65
4 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/EditorViewportCamera.cpp
+18 -2
View File
@@ -14,9 +14,15 @@
#include <Atom/RPI.Public/ViewportContext.h>
#include <Atom/RPI.Public/ViewportContextBus.h>
#include <AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h>
namespace SandboxEditor
{
static AZ::Quaternion CameraRotation(const float pitch, const float yaw)
{
return AZ::Quaternion::CreateRotationZ(yaw) * AZ::Quaternion::CreateRotationX(pitch);
}
void SetDefaultViewportCameraPosition(const AZ::Vector3& position)
{
auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
@@ -33,10 +39,20 @@ namespace SandboxEditor
auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
if (auto viewportContext = viewportContextManager->GetDefaultViewportContext())
{
const auto rotation = AZ::Quaternion::CreateRotationZ(yaw) * AZ::Quaternion::CreateRotationX(pitch);
const auto& currentCameraTransform = viewportContext->GetCameraTransform();
viewportContext->SetCameraTransform(
AZ::Transform::CreateFromQuaternionAndTranslation(rotation, currentCameraTransform.GetTranslation()));
AZ::Transform::CreateFromQuaternionAndTranslation(CameraRotation(pitch, yaw), currentCameraTransform.GetTranslation()));
}
}
void InterpolateDefaultViewportCameraToTransform(const AZ::Vector3& position, const float pitch, const float yaw)
{
auto viewportContextManager = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
if (auto viewportContext = viewportContextManager->GetDefaultViewportContext())
{
AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
viewportContext->GetId(), &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform,
AZ::Transform::CreateFromQuaternionAndTranslation(CameraRotation(pitch, yaw), position), 0.0f);
}
}