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

Expose camera input channels to the UI and ensure the cached values are refreshed when updated (#3607)

Browse Source 
* expose camera input channels to the ui and ensure the cached values are refreshed when updated

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small fixes for tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>
This commit is contained in:
hultonha
2021-08-27 09:29:08 +01:00
committed by GitHub
parent 48c959e359
commit b0330ba26a
14 changed files with 624 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp
+4 -1
View File
@@ -139,7 +139,8 @@ namespace UnitTest
m_viewportMouseCursorRequests.Connect(TestViewportId, m_inputChannelMapper.get());
// create editor modular camera
auto controller = CreateModularViewportCameraController(TestViewportId);
m_editorModularViewportCameraComposer = AZStd::make_unique<SandboxEditor::EditorModularViewportCameraComposer>(TestViewportId);
auto controller = m_editorModularViewportCameraComposer->CreateModularViewportCameraController();
// set some overrides for the test
controller->SetCameraViewportContextBuilderCallback(
@@ -169,6 +170,7 @@ namespace UnitTest
void HaltCollaborators()
{
m_editorModularViewportCameraComposer.reset();
m_mockWindowRequests.Disconnect();
m_viewportMouseCursorRequests.Disconnect();
m_cameraViewportContextView = nullptr;
@@ -212,6 +214,7 @@ namespace UnitTest
ViewportMouseCursorRequestImpl m_viewportMouseCursorRequests;
AtomToolsFramework::ModularCameraViewportContext* m_cameraViewportContextView = nullptr;
AZStd::unique_ptr<AZ::SettingsRegistryInterface> m_settingsRegistry;
AZStd::unique_ptr<SandboxEditor::EditorModularViewportCameraComposer> m_editorModularViewportCameraComposer;
};
const AzFramework::ViewportId ModularViewportCameraControllerFixture::TestViewportId = AzFramework::ViewportId(0);