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

more fixes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 10:09:44 -07:00
parent cf6c7c4d8d
commit a35464ca08
43 changed files with 28 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ImGui/Code/Source/ImGuiManager.cpp
-53
View File
@@ -81,59 +81,6 @@ namespace
const auto& it = AZStd::find(touches.cbegin(), touches.cend(), inputChannelId);
return it != touches.cend() ? static_cast<unsigned int>(it - touches.cbegin()) : UINT_MAX;
}
/**
Utility function to map an AzFrameworkInput controller button to its integer index.
@param inputChannelId the ID for an AzFrameworkInput controller button.
@return the index of the indicated button, or -1 if not found.
*/
unsigned int GetAzControllerButtonIndex(const InputChannelId& inputChannelId)
{
const auto& buttons = InputDeviceGamepad::Button::All;
const auto& triggers = InputDeviceGamepad::Trigger::All;
const auto& it = AZStd::find(buttons.cbegin(), buttons.cend(), inputChannelId);
if (it != buttons.cend())
{
return static_cast<unsigned int>(it - buttons.cbegin());
}
else
{
const auto& it2 = AZStd::find(triggers.cbegin(), triggers.cend(), inputChannelId);
if (it2 != triggers.cend())
{
return static_cast<unsigned int>(it2 - triggers.cbegin()) + AZ_ARRAY_SIZE(InputDeviceGamepad::Button::All);
}
}
return UINT_MAX;
}
/**
Utility function to map an AzFrameworkInput thumbstick movement to its integer index.
@param inputChannelId the ID for an AzFrameworkInput thumbstick movement.
@return the index of the indicated button, or -1 if not found.
*/
unsigned int GetAzControllerThumbstickIndex(const InputChannelId& inputChannelId)
{
const auto& thumbstickMovements = InputDeviceGamepad::ThumbStickDirection::All;
const auto& it = AZStd::find(thumbstickMovements.cbegin(), thumbstickMovements.cend(), inputChannelId);
return it != thumbstickMovements.cend() ? static_cast<unsigned int>(it - thumbstickMovements.cbegin()) : UINT_MAX;
}
/**
Utility function to map an AzFrameworkInput thumbstick movement amountto its integer index.
@param inputChannelId the ID for an AzFrameworkInput thumbstick movement amount.
@return the index of the indicated button, or -1 if not found.
*/
unsigned int GetAzControllerThumbstickAmountIndex(const InputChannelId& inputChannelId)
{
const auto& thumbstickMovementAmounts = InputDeviceGamepad::ThumbStickAxis1D::All;
const auto& it = AZStd::find(thumbstickMovementAmounts.cbegin(), thumbstickMovementAmounts.cend(), inputChannelId);
return it != thumbstickMovementAmounts.cend() ? static_cast<unsigned int>(it - thumbstickMovementAmounts.cbegin()) : UINT_MAX;
}
}
void ImGuiManager::Initialize()