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

Merge pull request #56600 from Scony/fix-navigation-obstacle-errors-3.x

Browse source
This commit is contained in:
Rémi Verschelde 2022-01-28 23:18:57 +01:00 committed by GitHub
commit 9cdd110cc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/2d/navigation_obstacle_2d.cpp
View file

@ -57,9 +57,9 @@ void NavigationObstacle2D::_validate_property(PropertyInfo &p_property) const {
void NavigationObstacle2D::_notification(int p_what) { void NavigationObstacle2D::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_READY: { case NOTIFICATION_ENTER_TREE: {
initialize_agent();
parent_node2d = Object::cast_to<Node2D>(get_parent()); parent_node2d = Object::cast_to<Node2D>(get_parent());
reevaluate_agent_radius();
// Search the navigation node and set it // Search the navigation node and set it
{ {
@ -104,6 +104,7 @@ NavigationObstacle2D::NavigationObstacle2D() :
navigation(nullptr), navigation(nullptr),
agent(RID()) { agent(RID()) {
agent = Navigation2DServer::get_singleton()->agent_create(); agent = Navigation2DServer::get_singleton()->agent_create();
initialize_agent();
} }
NavigationObstacle2D::~NavigationObstacle2D() { NavigationObstacle2D::~NavigationObstacle2D() {
@ -148,7 +149,7 @@ void NavigationObstacle2D::initialize_agent() {
void NavigationObstacle2D::reevaluate_agent_radius() { void NavigationObstacle2D::reevaluate_agent_radius() {
if (!estimate_agent_radius()) { if (!estimate_agent_radius()) {
Navigation2DServer::get_singleton()->agent_set_radius(agent, radius); Navigation2DServer::get_singleton()->agent_set_radius(agent, radius);
} else if (parent_node2d) { } else if (parent_node2d && parent_node2d->is_inside_tree()) {
Navigation2DServer::get_singleton()->agent_set_radius(agent, estimate_agent_radius()); Navigation2DServer::get_singleton()->agent_set_radius(agent, estimate_agent_radius());
} }
} }

9
scene/3d/navigation_obstacle.cpp
View file

@ -57,9 +57,9 @@ void NavigationObstacle::_validate_property(PropertyInfo &p_property) const {
void NavigationObstacle::_notification(int p_what) { void NavigationObstacle::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_READY: { case NOTIFICATION_ENTER_TREE: {
initialize_agent();
parent_spatial = Object::cast_to<Spatial>(get_parent()); parent_spatial = Object::cast_to<Spatial>(get_parent());
reevaluate_agent_radius();
// Search the navigation node and set it // Search the navigation node and set it
{ {
@ -111,6 +111,7 @@ NavigationObstacle::NavigationObstacle() :
navigation(nullptr), navigation(nullptr),
agent(RID()) { agent(RID()) {
agent = NavigationServer::get_singleton()->agent_create(); agent = NavigationServer::get_singleton()->agent_create();
initialize_agent();
} }
NavigationObstacle::~NavigationObstacle() { NavigationObstacle::~NavigationObstacle() {
@ -129,7 +130,7 @@ void NavigationObstacle::set_navigation(Navigation *p_nav) {
void NavigationObstacle::set_navigation_node(Node *p_nav) { void NavigationObstacle::set_navigation_node(Node *p_nav) {
Navigation *nav = Object::cast_to<Navigation>(p_nav); Navigation *nav = Object::cast_to<Navigation>(p_nav);
ERR_FAIL_COND(nav); ERR_FAIL_NULL(nav);
set_navigation(nav); set_navigation(nav);
} }
@ -155,7 +156,7 @@ void NavigationObstacle::initialize_agent() {
void NavigationObstacle::reevaluate_agent_radius() { void NavigationObstacle::reevaluate_agent_radius() {
if (!estimate_radius) { if (!estimate_radius) {
NavigationServer::get_singleton()->agent_set_radius(agent, radius); NavigationServer::get_singleton()->agent_set_radius(agent, radius);
} else if (parent_spatial) { } else if (parent_spatial && parent_spatial->is_inside_tree()) {
NavigationServer::get_singleton()->agent_set_radius(agent, estimate_agent_radius()); NavigationServer::get_singleton()->agent_set_radius(agent, estimate_agent_radius());
} }
} }