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

Bugfix - ViewportInteractionImp connected to the wrong id in RenderViewportWidget (#6867)

Browse Source 
Signed-off-by: rhhong <rhhong@amazon.com>
This commit is contained in:
Roman
2022-01-12 22:39:56 -08:00
committed by GitHub
parent 073994e8e7
commit e224fc2ee5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
+3 -2
View File
@@ -68,6 +68,7 @@ namespace AtomToolsFramework
{
return false;
}
const AzFramework::ViewportId newId = m_viewportContext->GetId();
SetControllerList(AZStd::make_shared<AzFramework::ViewportControllerList>());
@@ -78,14 +79,14 @@ namespace AtomToolsFramework
m_viewportInteractionImpl = AZStd::make_unique<ViewportInteractionImpl>(m_defaultCamera);
m_viewportInteractionImpl->m_deviceScalingFactorFn = [this] { return aznumeric_cast<float>(devicePixelRatioF()); };
m_viewportInteractionImpl->m_screenSizeFn = [this] { return AzFramework::ScreenSize(width(), height()); };
m_viewportInteractionImpl->Connect(id);
m_viewportInteractionImpl->Connect(newId);
AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler::BusConnect(GetId());
AzFramework::InputChannelEventListener::Connect();
AZ::TickBus::Handler::BusConnect();
AzFramework::WindowRequestBus::Handler::BusConnect(params.windowHandle);
m_inputChannelMapper = new AzToolsFramework::QtEventToAzInputMapper(this, id);
m_inputChannelMapper = new AzToolsFramework::QtEventToAzInputMapper(this, newId);
// Forward input events to our controller list.
QObject::connect(m_inputChannelMapper, &AzToolsFramework::QtEventToAzInputMapper::InputChannelUpdated, this,