GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gamepad-button-axis' of https://github.com/Tryibion/FlaxEngine into Tryibion-gamepad-button-axis

Browse Source
This commit is contained in:
Wojtek Figat
2024-08-21 23:04:36 +02:00
parent fe33bd4c83 aa3cf2e077
commit f9f6c27cb5
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Input/Input.cpp
View File

@@ -157,6 +157,8 @@ void InputSettings::Deserialize(DeserializeStream& stream, ISerializeModifier* m
config.Gamepad = JsonTools::GetEnum(v, "Gamepad", InputGamepadIndex::All); config.Gamepad = JsonTools::GetEnum(v, "Gamepad", InputGamepadIndex::All);
config.PositiveButton = JsonTools::GetEnum(v, "PositiveButton", KeyboardKeys::None); config.PositiveButton = JsonTools::GetEnum(v, "PositiveButton", KeyboardKeys::None);
config.NegativeButton = JsonTools::GetEnum(v, "NegativeButton", KeyboardKeys::None); config.NegativeButton = JsonTools::GetEnum(v, "NegativeButton", KeyboardKeys::None);
config.GamepadPositiveButton = JsonTools::GetEnum(v, "GamepadPositiveButton", GamepadButton::None);
config.GamepadNegativeButton = JsonTools::GetEnum(v, "GamepadNegativeButton", GamepadButton::None);
config.DeadZone = JsonTools::GetFloat(v, "DeadZone", 0.1f); config.DeadZone = JsonTools::GetFloat(v, "DeadZone", 0.1f);
config.Sensitivity = JsonTools::GetFloat(v, "Sensitivity", 0.4f); config.Sensitivity = JsonTools::GetFloat(v, "Sensitivity", 0.4f);
config.Gravity = JsonTools::GetFloat(v, "Gravity", 1.0f); config.Gravity = JsonTools::GetFloat(v, "Gravity", 1.0f);
@@ -873,8 +875,8 @@ void InputService::Update()
const AxisData& data = Axes[name]; const AxisData& data = Axes[name];
// Get key raw value // Get key raw value
const bool isPositiveKey = Input::GetKey(config.PositiveButton); const bool isPositiveKey = Input::GetKey(config.PositiveButton) || Input::GetGamepadButton(config.Gamepad, config.GamepadPositiveButton);
const bool isNegativeKey = Input::GetKey(config.NegativeButton); const bool isNegativeKey = Input::GetKey(config.NegativeButton) || Input::GetGamepadButton(config.Gamepad, config.GamepadNegativeButton);
float keyRawValue = 0; float keyRawValue = 0;
if (isPositiveKey && !isNegativeKey) if (isPositiveKey && !isNegativeKey)
{ {

12
Source/Engine/Input/VirtualInput.h
View File

@@ -87,6 +87,18 @@ API_STRUCT() struct AxisConfig
API_FIELD(Attributes="EditorOrder(40)") API_FIELD(Attributes="EditorOrder(40)")
KeyboardKeys NegativeButton; KeyboardKeys NegativeButton;
/// <summary>
/// The button to be pressed for movement in positive direction. Use <see cref="GamepadButton.None"/> to ignore it.
/// </summary>
API_FIELD(Attributes="EditorOrder(45)")
GamepadButton GamepadPositiveButton;
/// <summary>
/// The button to be pressed for movement in negative direction. Use <see cref="GamepadButton.None"/> to ignore it.
/// </summary>
API_FIELD(Attributes="EditorOrder(46)")
GamepadButton GamepadNegativeButton;
/// <summary> /// <summary>
/// Any positive or negative values that are less than this number will register as zero. Useful for gamepads to specify the deadzone. /// Any positive or negative values that are less than this number will register as zero. Useful for gamepads to specify the deadzone.
/// </summary> /// </summary>