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

More renames

Browse Source
This commit is contained in:
Olly Rybak
2023-05-12 09:30:35 +10:00
parent 4b4bf833a9
commit b8ed115f63
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,13 +29,13 @@ struct ActionData
{ {
bool Active; bool Active;
uint64 FrameIndex; uint64 FrameIndex;
InputActionState Phase; InputActionState State;
ActionData() ActionData()
{ {
Active = false; Active = false;
FrameIndex = 0; FrameIndex = 0;
Phase = InputActionState::Waiting; State = InputActionState::Waiting;
} }
}; };
@@ -604,7 +604,7 @@ InputActionState Input::GetActionState(const StringView& name)
const auto e = Actions.TryGet(name); const auto e = Actions.TryGet(name);
if (e != nullptr) if (e != nullptr)
{ {
return e->Phase; return e->State;
} }
return InputActionState::None; return InputActionState::None;
} }
@@ -818,7 +818,7 @@ void InputService::Update()
ActionData& data = Actions[name]; ActionData& data = Actions[name];
data.Active = false; data.Active = false;
data.Phase = InputActionState::Waiting; data.State = InputActionState::Waiting;
// Mark as updated in this frame // Mark as updated in this frame
data.FrameIndex = frame; data.FrameIndex = frame;
@@ -845,15 +845,15 @@ void InputService::Update()
if (Input::GetKeyDown(config.Key) || Input::GetMouseButtonDown(config.MouseButton) || Input::GetGamepadButtonDown(config.Gamepad, config.GamepadButton)) if (Input::GetKeyDown(config.Key) || Input::GetMouseButtonDown(config.MouseButton) || Input::GetGamepadButtonDown(config.Gamepad, config.GamepadButton))
{ {
data.Phase = InputActionState::Press; data.State = InputActionState::Press;
} }
else if (Input::GetKey(config.Key) || Input::GetMouseButton(config.MouseButton) || Input::GetGamepadButton(config.Gamepad, config.GamepadButton)) else if (Input::GetKey(config.Key) || Input::GetMouseButton(config.MouseButton) || Input::GetGamepadButton(config.Gamepad, config.GamepadButton))
{ {
data.Phase = InputActionState::Pressing; data.State = InputActionState::Pressing;
} }
else if (Input::GetKeyUp(config.Key) || Input::GetMouseButtonUp(config.MouseButton) || Input::GetGamepadButtonUp(config.Gamepad, config.GamepadButton)) else if (Input::GetKeyUp(config.Key) || Input::GetMouseButtonUp(config.MouseButton) || Input::GetGamepadButtonUp(config.Gamepad, config.GamepadButton))
{ {
data.Phase = InputActionState::Release; data.State = InputActionState::Release;
} }
data.Active |= isActive; data.Active |= isActive;