Skip to content

NavigationAgent3D: fix for avoidance stored_y_velocity #108277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Open

NavigationAgent3D: fix for avoidance stored_y_velocity #108277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions scene/3d/navigation/navigation_agent_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,6 @@ void NavigationAgent3D::_notification(int p_what) {
velocity_submitted = false;
if (avoidance_enabled) {
if (!use_3d_avoidance) {
if (keep_y_velocity) {
stored_y_velocity = velocity.y;
}
velocity.y = 0.0;
}
NavigationServer3D::get_singleton()->agent_set_velocity(agent, velocity);
Expand Down Expand Up @@ -776,6 +773,9 @@ void NavigationAgent3D::set_velocity_forced(Vector3 p_velocity) {
void NavigationAgent3D::set_velocity(const Vector3 p_velocity) {
velocity = p_velocity;
velocity_submitted = true;
if (!use_3d_avoidance && keep_y_velocity) {
stored_y_velocity = velocity.y;
}
}

void NavigationAgent3D::_avoidance_done(Vector3 p_new_velocity) {
Expand Down Expand Up @@ -989,7 +989,9 @@ void NavigationAgent3D::_transition_to_navigation_finished() {
NavigationServer3D::get_singleton()->agent_set_position(agent, agent_parent->get_global_transform().origin);
NavigationServer3D::get_singleton()->agent_set_velocity(agent, Vector3(0.0, 0.0, 0.0));
NavigationServer3D::get_singleton()->agent_set_velocity_forced(agent, Vector3(0.0, 0.0, 0.0));
stored_y_velocity = 0.0;
if (use_3d_avoidance) {
stored_y_velocity = 0.0;
}
}

emit_signal(SNAME("navigation_finished"));
Expand Down