asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix physics tick counter

Browse source 
The counter is now incremented at the start of a physics tick rather than the end.
This commit is contained in:
lawnjelly 2024-06-09 15:34:23 +01:00
parent e2c7073b4e
commit 40961d62e2
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
main/input_default.cpp
View file

@ -506,13 +506,14 @@ void InputDefault::_parse_input_event_impl(const Ref<InputEvent> &p_event, bool
// If not echo and action pressed state has changed // If not echo and action pressed state has changed
if (!p_event->is_echo() && is_action_pressed(E->key(), false) != p_event->is_action_pressed(E->key())) { if (!p_event->is_echo() && is_action_pressed(E->key(), false) != p_event->is_action_pressed(E->key())) {
// As input may come in part way through a physics tick, the earliest we can react to it is the next physics tick.
if (p_event->is_action_pressed(E->key())) { if (p_event->is_action_pressed(E->key())) {
action.pressed = true; action.pressed = true;
action.pressed_physics_frame = Engine::get_singleton()->get_physics_frames(); action.pressed_physics_frame = Engine::get_singleton()->get_physics_frames() + 1;
action.pressed_idle_frame = Engine::get_singleton()->get_idle_frames(); action.pressed_idle_frame = Engine::get_singleton()->get_idle_frames();
} else { } else {
action.pressed = false; action.pressed = false;
action.released_physics_frame = Engine::get_singleton()->get_physics_frames(); action.released_physics_frame = Engine::get_singleton()->get_physics_frames() + 1;
action.released_idle_frame = Engine::get_singleton()->get_idle_frames(); action.released_idle_frame = Engine::get_singleton()->get_idle_frames();
} }
action.strength = 0.0f; action.strength = 0.0f;

2
main/main.cpp
View file

@ -2364,6 +2364,7 @@ bool Main::iteration() {
} }
Engine::get_singleton()->_in_physics = true; Engine::get_singleton()->_in_physics = true;
Engine::get_singleton()->_physics_frames++;
uint64_t physics_begin = OS::get_singleton()->get_ticks_usec(); uint64_t physics_begin = OS::get_singleton()->get_ticks_usec();
@ -2398,7 +2399,6 @@ bool Main::iteration() {
physics_process_ticks = MAX(physics_process_ticks, OS::get_singleton()->get_ticks_usec() - physics_begin); // keep the largest one for reference physics_process_ticks = MAX(physics_process_ticks, OS::get_singleton()->get_ticks_usec() - physics_begin); // keep the largest one for reference
physics_process_max = MAX(OS::get_singleton()->get_ticks_usec() - physics_begin, physics_process_max); physics_process_max = MAX(OS::get_singleton()->get_ticks_usec() - physics_begin, physics_process_max);
Engine::get_singleton()->_physics_frames++;
Engine::get_singleton()->_in_physics = false; Engine::get_singleton()->_in_physics = false;
} }

2
scene/2d/camera_2d.h
View file

@ -98,7 +98,7 @@ protected:
struct InterpolationData { struct InterpolationData {
Transform2D xform_curr; Transform2D xform_curr;
Transform2D xform_prev; Transform2D xform_prev;
uint32_t last_update_physics_tick = 0; uint32_t last_update_physics_tick = UINT32_MAX;
} _interpolation_data; } _interpolation_data;
protected: protected:

2
scene/2d/navigation_agent_2d.h
View file

@ -70,7 +70,7 @@ class NavigationAgent2D : public Node {
bool target_reached = false; bool target_reached = false;
bool navigation_finished = true; bool navigation_finished = true;
// No initialized on purpose // No initialized on purpose
uint32_t update_frame_id = 0; uint32_t update_frame_id = UINT32_MAX;
protected: protected:
static void _bind_methods(); static void _bind_methods();