summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-07-17 11:44:31 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-07-17 11:44:31 +0200
commit59737bf3f03f4f783229c9a24963ddb169e6673d (patch)
tree28f66d6eb480cc6e396ae01f1ce4b3dc530db027 /core
parentcb2650cea9a7f9e50847927a9a83cbcfa52e1d82 (diff)
parentb41ec93d633530a80ca6f9f55b41da0e0bcd2acb (diff)
downloadredot-engine-59737bf3f03f4f783229c9a24963ddb169e6673d.tar.gz
Merge pull request #94413 from rburing/fix_action_press_tick
Fix physics tick count in `Input.action_press` and `Input.action_release`
Diffstat (limited to 'core')
-rw-r--r--core/input/input.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/input/input.cpp b/core/input/input.cpp
index ed9debee85..91378591b0 100644
--- a/core/input/input.cpp
+++ b/core/input/input.cpp
@@ -890,8 +890,9 @@ void Input::action_press(const StringName &p_action, float p_strength) {
// Create or retrieve existing action.
ActionState &action_state = action_states[p_action];
+ // As input may come in part way through a physics tick, the earliest we can react to it is the next physics tick.
if (!action_state.cache.pressed) {
- action_state.pressed_physics_frame = Engine::get_singleton()->get_physics_frames();
+ action_state.pressed_physics_frame = Engine::get_singleton()->get_physics_frames() + 1;
action_state.pressed_process_frame = Engine::get_singleton()->get_process_frames();
}
action_state.exact = true;
@@ -908,7 +909,8 @@ void Input::action_release(const StringName &p_action) {
action_state.cache.pressed = 0;
action_state.cache.strength = 0.0;
action_state.cache.raw_strength = 0.0;
- action_state.released_physics_frame = Engine::get_singleton()->get_physics_frames();
+ // As input may come in part way through a physics tick, the earliest we can react to it is the next physics tick.
+ action_state.released_physics_frame = Engine::get_singleton()->get_physics_frames() + 1;
action_state.released_process_frame = Engine::get_singleton()->get_process_frames();
action_state.device_states.clear();
action_state.exact = true;