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

Ensure CameraComponentController entities get synced with Atom camera changes.

Browse Source 
This ensures the camera entity's transform gets correctly set if the RPI::View (or ViewportContext) is directly used instead of adjusting the entity transform, for e.g. camera controllers.
This commit is contained in:
nvsickle
2021-05-05 16:54:31 -07:00
parent dca2294b36
commit 5d9c99436a
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Camera/Code/Source/CameraComponentController.cpp
+18
View File
@@ -160,6 +160,17 @@ namespace Camera
incompatible.push_back(AZ_CRC("CameraService", 0x1dd1caa4));
}
void CameraComponentController::Init()
{
m_onViewMatrixChanged = AZ::Event<const AZ::Matrix4x4&>::Handler([this](const AZ::Matrix4x4&)
{
if (!m_updatingTransformFromEntity)
{
AZ::TransformBus::Event(m_entityId, &AZ::TransformInterface::SetWorldTM, m_atomCamera->GetCameraTransform());
}
});
}
void CameraComponentController::Activate(AZ::EntityId entityId)
{
m_entityId = entityId;
@@ -218,6 +229,8 @@ namespace Camera
}
}
AZ::RPI::ViewProviderBus::Handler::BusConnect(m_entityId);
m_atomCamera->ConnectWorldToViewMatrixChangedHandler(m_onViewMatrixChanged);
}
UpdateCamera();
@@ -258,6 +271,7 @@ namespace Camera
if (atomViewportRequests)
{
AZ::RPI::ViewProviderBus::Handler::BusDisconnect(m_entityId);
m_onViewMatrixChanged.Disconnect();
}
DeactivateAtomView();
@@ -376,7 +390,9 @@ namespace Camera
if (m_atomCamera)
{
m_updatingTransformFromEntity = true;
m_atomCamera->SetCameraTransform(AZ::Matrix3x4::CreateFromTransform(world.GetOrthogonalized()));
m_updatingTransformFromEntity = false;
}
}
@@ -425,7 +441,9 @@ namespace Camera
m_config.m_nearClipDistance,
m_config.m_farClipDistance,
true);
m_updatingTransformFromEntity = true;
m_atomCamera->SetViewToClipMatrix(viewToClipMatrix);
m_updatingTransformFromEntity = false;
}
}
Gems/Camera/Code/Source/CameraComponentController.h
+3
View File
@@ -77,6 +77,7 @@ namespace Camera
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible);
void Init();
void Activate(AZ::EntityId entityId);
void Deactivate();
void SetConfiguration(const CameraComponentConfig& config);
@@ -121,6 +122,8 @@ namespace Camera
// Atom integration
AZ::RPI::ViewPtr m_atomCamera;
AZ::RPI::AuxGeomDrawPtr m_atomAuxGeom;
AZ::Event<const AZ::Matrix4x4&>::Handler m_onViewMatrixChanged;
bool m_updatingTransformFromEntity = false;
// Cry view integration
IView* m_view = nullptr;