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

Camera locking when its transform is locked (#5996)

Browse Source 
* Locking the camera when its entity transform is locked

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Added function to unposses camera when transform locks

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Basic camera behaviour

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Addressed codereview suggestions

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
This commit is contained in:
AMZN-Igarri
2021-11-30 10:39:07 +01:00
committed by GitHub
parent 3922280cec
commit 271004635c
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Camera/Code/Source/CameraComponentController.cpp
+8 -2
View File
@@ -151,7 +151,12 @@ namespace Camera
void CameraComponentController::SetShouldActivateFunction(AZStd::function<bool()> shouldActivateFunction)
{
m_shouldActivateFn = shouldActivateFunction;
m_shouldActivateFn = AZStd::move(shouldActivateFunction);
}
void CameraComponentController::SetIsLockedFunction(AZStd::function<bool()> isLockedFunction)
{
m_isLockedFn = AZStd::move(isLockedFunction);
}
void CameraComponentController::Reflect(AZ::ReflectContext* context)
@@ -195,10 +200,11 @@ namespace Camera
{
m_onViewMatrixChanged = AZ::Event<const AZ::Matrix4x4&>::Handler([this](const AZ::Matrix4x4&)
{
if (!m_updatingTransformFromEntity)
if (!m_updatingTransformFromEntity && !m_isLockedFn())
{
AZ::TransformBus::Event(m_entityId, &AZ::TransformInterface::SetWorldTM, m_atomCamera->GetCameraTransform());
}
});
}