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

Fix for "GameLauncher crashes silently after any interaction within it"

Browse Source 
Fix for "GameLauncher crashes silently after any interaction within it"
This commit is contained in:
bosnichd
2021-04-22 16:07:20 -06:00
committed by GitHub
parent 5d3774521f
commit ea965dc78a
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Gestures/Code/CMakeLists.txt
+3
View File
@@ -20,6 +20,9 @@ ly_add_target(
PUBLIC
Include
BUILD_DEPENDENCIES
PUBLIC
Gem::Atom_RPI.Public
AZ::AtomCore
PRIVATE
Legacy::CryCommon
)
Gems/Gestures/Code/Include/Gestures/IGestureRecognizer.h
+23 -4
View File
@@ -19,6 +19,9 @@
#include <AzFramework/Input/Devices/Mouse/InputDeviceMouse.h>
#include <AzFramework/Input/Devices/Touch/InputDeviceTouch.h>
#include <Atom/RPI.Public/ViewportContext.h>
#include <Atom/RPI.Public/ViewportContextBus.h>
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace Gestures
{
@@ -184,8 +187,16 @@ namespace Gestures
return;
}
const AZ::Vector2 eventScreenPositionPixels = positionData2D->ConvertToScreenSpaceCoordinates(static_cast<float>(gEnv->pRenderer->GetWidth()),
static_cast<float>(gEnv->pRenderer->GetHeight()));
auto atomViewportRequests = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
AZ::RPI::ViewportContextPtr viewportContext = atomViewportRequests->GetDefaultViewportContext();
if (viewportContext == nullptr)
{
return;
}
AzFramework::WindowSize windowSize = viewportContext->GetViewportSize();
const AZ::Vector2 eventScreenPositionPixels = positionData2D->ConvertToScreenSpaceCoordinates(static_cast<float>(windowSize.m_width),
static_cast<float>(windowSize.m_height));
if (inputChannel.IsStateBegan())
{
o_hasBeenConsumed = OnPressedEvent(eventScreenPositionPixels, pointerIndex);
@@ -225,8 +236,16 @@ namespace Gestures
////////////////////////////////////////////////////////////////////////////////////////////////
inline void IRecognizer::UpdateNormalizedPositionAndDeltaFromScreenPosition(const AZ::Vector2& screenPositionPixels)
{
const AZ::Vector2 normalizedPosition(screenPositionPixels.GetX() / static_cast<float>(gEnv->pRenderer->GetWidth()),
screenPositionPixels.GetY() / static_cast<float>(gEnv->pRenderer->GetHeight()));
auto atomViewportRequests = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get();
AZ::RPI::ViewportContextPtr viewportContext = atomViewportRequests->GetDefaultViewportContext();
if (viewportContext == nullptr)
{
return;
}
AzFramework::WindowSize windowSize = viewportContext->GetViewportSize();
const AZ::Vector2 normalizedPosition(screenPositionPixels.GetX() / static_cast<float>(windowSize.m_width),
screenPositionPixels.GetY() / static_cast<float>(windowSize.m_height));
AzFramework::InputChannel::PositionData2D::UpdateNormalizedPositionAndDelta(normalizedPosition);
}
}