godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93286 from rune-scape/fix-rare-physics-crash 

GodotPhysics: Fix crash on null space
This commit is contained in:
Rémi Verschelde 2024-06-18 14:08:58 +02:00
parent 6c399a434d ef9b82a076
commit 29654bdc4f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/physics_2d/godot_body_2d.cpp
View File

@ -616,6 +616,8 @@ void GodotBody2D::integrate_velocities(real_t p_step) {
return; return;
} }
ERR_FAIL_NULL(get_space());
if (fi_callback_data || body_state_callback.is_valid()) { if (fi_callback_data || body_state_callback.is_valid()) {
get_space()->body_add_to_state_query_list(&direct_state_query_list); get_space()->body_add_to_state_query_list(&direct_state_query_list);
} }
@ -705,6 +707,8 @@ bool GodotBody2D::sleep_test(real_t p_step) {
return false; return false;
} }
ERR_FAIL_NULL_V(get_space(), true);
if (Math::abs(angular_velocity) < get_space()->get_body_angular_velocity_sleep_threshold() && Math::abs(linear_velocity.length_squared()) < get_space()->get_body_linear_velocity_sleep_threshold() * get_space()->get_body_linear_velocity_sleep_threshold()) { if (Math::abs(angular_velocity) < get_space()->get_body_angular_velocity_sleep_threshold() && Math::abs(linear_velocity.length_squared()) < get_space()->get_body_linear_velocity_sleep_threshold() * get_space()->get_body_linear_velocity_sleep_threshold()) {
still_time += p_step; still_time += p_step;

4
servers/physics_3d/godot_body_3d.cpp
View File

@ -675,6 +675,8 @@ void GodotBody3D::integrate_velocities(real_t p_step) {
return; return;
} }
ERR_FAIL_NULL(get_space());
if (fi_callback_data || body_state_callback.is_valid()) { if (fi_callback_data || body_state_callback.is_valid()) {
get_space()->body_add_to_state_query_list(&direct_state_query_list); get_space()->body_add_to_state_query_list(&direct_state_query_list);
} }
@ -784,6 +786,8 @@ bool GodotBody3D::sleep_test(real_t p_step) {
return false; return false;
} }
ERR_FAIL_NULL_V(get_space(), true);
if (Math::abs(angular_velocity.length()) < get_space()->get_body_angular_velocity_sleep_threshold() && Math::abs(linear_velocity.length_squared()) < get_space()->get_body_linear_velocity_sleep_threshold() * get_space()->get_body_linear_velocity_sleep_threshold()) { if (Math::abs(angular_velocity.length()) < get_space()->get_body_angular_velocity_sleep_threshold() && Math::abs(linear_velocity.length_squared()) < get_space()->get_body_linear_velocity_sleep_threshold() * get_space()->get_body_linear_velocity_sleep_threshold()) {
still_time += p_step; still_time += p_step;