Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-22 11:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify some logic in NavigationAgent2D.

Browse Source
This commit is contained in:
Relintai 2023-09-05 09:01:44 +02:00
parent 54acfac5e2
commit 6f3b1fac57
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scene/2d/navigation_agent_2d.cpp
View File

@ -373,14 +373,9 @@ void NavigationAgent2D::set_agent_parent(Node *p_agent_parent) {
if (Object::cast_to<Node2D>(p_agent_parent) != nullptr) { if (Object::cast_to<Node2D>(p_agent_parent) != nullptr) {
// place agent on navigation map first or else the RVO agent callback creation fails silently later // place agent on navigation map first or else the RVO agent callback creation fails silently later
agent_parent = Object::cast_to<Node2D>(p_agent_parent); agent_parent = Object::cast_to<Node2D>(p_agent_parent);
if (map_override.is_valid()) {
Navigation2DServer::get_singleton()->agent_set_map(get_rid(), map_override); Navigation2DServer::get_singleton()->agent_set_map(get_rid(), get_navigation_map());
} else if (navigation != nullptr) {
Navigation2DServer::get_singleton()->agent_set_map(get_rid(), navigation->get_rid());
} else {
// no navigation node found in parent nodes, use default navigation map from world resource
Navigation2DServer::get_singleton()->agent_set_map(get_rid(), agent_parent->get_world_2d()->get_navigation_map());
}
// create new avoidance callback if enabled // create new avoidance callback if enabled
Navigation2DServer::get_singleton()->agent_set_avoidance_callback(agent, get_instance_id(), "_avoidance_done"); Navigation2DServer::get_singleton()->agent_set_avoidance_callback(agent, get_instance_id(), "_avoidance_done");
} else { } else {