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

Merge pull request #3967 from aws-lumberyard-dev/Atom/guthadam/adding_null_checks_to_gestures_gem

Browse Source 
Adding null checks to Gestures gem if gEnv isn't set
This commit is contained in:
Guthrie Adams
2021-09-07 18:45:48 -05:00
committed by GitHub
parent 9fe3c87f4e 214ebb7308
commit 6b5b82717d
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Gestures/Code/Include/Gestures/GestureRecognizerClickOrTap.inl
+3 -3
View File
@@ -73,7 +73,7 @@ inline Gestures::RecognizerClickOrTap::~RecognizerClickOrTap()
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerClickOrTap::OnPressedEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}
@@ -120,7 +120,7 @@ inline bool Gestures::RecognizerClickOrTap::OnPressedEvent(const AZ::Vector2& sc
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerClickOrTap::OnDownEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}
@@ -159,7 +159,7 @@ inline bool Gestures::RecognizerClickOrTap::OnDownEvent(const AZ::Vector2& scree
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerClickOrTap::OnReleasedEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}
Gems/Gestures/Code/Include/Gestures/GestureRecognizerDrag.inl
+2 -2
View File
@@ -59,7 +59,7 @@ inline Gestures::RecognizerDrag::~RecognizerDrag()
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerDrag::OnPressedEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}
@@ -90,7 +90,7 @@ inline bool Gestures::RecognizerDrag::OnPressedEvent(const AZ::Vector2& screenPo
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerDrag::OnDownEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}
Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.h
+1 -1
View File
@@ -64,7 +64,7 @@ namespace Gestures
AZ::Vector2 GetStartPosition() const { return m_startPosition; }
AZ::Vector2 GetCurrentPosition() const { return m_currentPosition; }
float GetDuration() const { return gEnv->pTimer->GetFrameStartTime().GetDifferenceInSeconds(m_startTime); }
float GetDuration() const { return (gEnv && gEnv->pTimer) ? gEnv->pTimer->GetFrameStartTime().GetDifferenceInSeconds(m_startTime) : 0.0f; }
private:
enum class State
Gems/Gestures/Code/Include/Gestures/GestureRecognizerHold.inl
+2 -2
View File
@@ -59,7 +59,7 @@ inline Gestures::RecognizerHold::~RecognizerHold()
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerHold::OnPressedEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}
@@ -90,7 +90,7 @@ inline bool Gestures::RecognizerHold::OnPressedEvent(const AZ::Vector2& screenPo
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerHold::OnDownEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}
Gems/Gestures/Code/Include/Gestures/GestureRecognizerPinch.inl
+1 -1
View File
@@ -106,7 +106,7 @@ inline float AngleInDegreesBetweenVectors(const AZ::Vector2& vec0, const AZ::Vec
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerPinch::OnDownEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex > s_maxPinchPointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex > s_maxPinchPointerIndex)
{
return false;
}
Gems/Gestures/Code/Include/Gestures/GestureRecognizerRotate.inl
+1 -1
View File
@@ -95,7 +95,7 @@ inline bool Gestures::RecognizerRotate::OnPressedEvent(const AZ::Vector2& screen
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerRotate::OnDownEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex > s_maxRotatePointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex > s_maxRotatePointerIndex)
{
return false;
}
Gems/Gestures/Code/Include/Gestures/GestureRecognizerSwipe.inl
+3 -3
View File
@@ -59,7 +59,7 @@ inline Gestures::RecognizerSwipe::~RecognizerSwipe()
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerSwipe::OnPressedEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}
@@ -89,7 +89,7 @@ inline bool Gestures::RecognizerSwipe::OnPressedEvent(const AZ::Vector2& screenP
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerSwipe::OnDownEvent([[maybe_unused]] const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}
@@ -125,7 +125,7 @@ inline bool Gestures::RecognizerSwipe::OnDownEvent([[maybe_unused]] const AZ::Ve
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool Gestures::RecognizerSwipe::OnReleasedEvent(const AZ::Vector2& screenPosition, uint32_t pointerIndex)
{
if (pointerIndex != m_config.pointerIndex)
if (!gEnv || !gEnv->pTimer || pointerIndex != m_config.pointerIndex)
{
return false;
}