maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #47960 from smix8/issue_47334_navagent2d_target_reached

Browse source
This commit is contained in:
Rémi Verschelde 2021-04-27 13:34:48 +02:00 committed by GitHub
parent 3dfb740a20 0b87cb5e3d
commit 3a0cfd3d85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scene/2d/navigation_agent_2d.cpp
View file

@ -104,12 +104,7 @@ void NavigationAgent2D::_notification(int p_what) {
case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
if (agent_parent) {
NavigationServer2D::get_singleton()->agent_set_position(agent, agent_parent->get_global_transform().get_origin());
if (!target_reached) {
if (distance_to_target() < target_desired_distance) {
emit_signal("target_reached");
target_reached = true;
}
}
_check_distance_to_target();
}
} break;
}
@ -305,6 +300,7 @@ void NavigationAgent2D::update_navigation() {
while (o.distance_to(navigation_path[nav_path_index]) < target_desired_distance) {
nav_path_index += 1;
if (nav_path_index == navigation_path.size()) {
_check_distance_to_target();
nav_path_index -= 1;
navigation_finished = true;
emit_signal("navigation_finished");
@ -313,3 +309,12 @@ void NavigationAgent2D::update_navigation() {
}
}
}
void NavigationAgent2D::_check_distance_to_target() {
if (!target_reached) {
if (distance_to_target() < target_desired_distance) {
emit_signal("target_reached");
target_reached = true;
}
}
}

1
scene/2d/navigation_agent_2d.h
View file

@ -140,6 +140,7 @@ public:
private:
void update_navigation();
void _check_distance_to_target();
};
#endif