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

Merge pull request #52367 from Duroxxigar/improve-nav-error-messages

Browse source 
Improve readability for failing errors in nav area
This commit is contained in:
Rémi Verschelde 2021-10-21 19:36:16 +02:00 committed by GitHub
parent 9f22ea2a76 54d305eebe
commit 133c1eb0af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/navigation/navigation_mesh_generator.cpp
View file

@ -489,7 +489,7 @@ NavigationMeshGenerator::~NavigationMeshGenerator() {
} }
void NavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node) { void NavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node) {
ERR_FAIL_COND(!p_nav_mesh.is_valid()); ERR_FAIL_COND_MSG(!p_nav_mesh.is_valid(), "Invalid navigation mesh.");
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
EditorProgress *ep(nullptr); EditorProgress *ep(nullptr);

4
scene/2d/navigation_agent_2d.cpp
View file

@ -184,7 +184,7 @@ Vector2 NavigationAgent2D::get_target_location() const {
Vector2 NavigationAgent2D::get_next_location() { Vector2 NavigationAgent2D::get_next_location() {
update_navigation(); update_navigation();
if (navigation_path.size() == 0) { if (navigation_path.size() == 0) {
ERR_FAIL_COND_V(agent_parent == nullptr, Vector2()); ERR_FAIL_COND_V_MSG(agent_parent == nullptr, Vector2(), "The agent has no parent.");
return agent_parent->get_global_position(); return agent_parent->get_global_position();
} else { } else {
return navigation_path[nav_path_index]; return navigation_path[nav_path_index];
@ -192,7 +192,7 @@ Vector2 NavigationAgent2D::get_next_location() {
} }
real_t NavigationAgent2D::distance_to_target() const { real_t NavigationAgent2D::distance_to_target() const {
ERR_FAIL_COND_V(agent_parent == nullptr, 0.0); ERR_FAIL_COND_V_MSG(agent_parent == nullptr, 0.0, "The agent has no parent.");
return agent_parent->get_global_position().distance_to(target_location); return agent_parent->get_global_position().distance_to(target_location);
} }

4
scene/3d/navigation_agent_3d.cpp
View file

@ -192,7 +192,7 @@ Vector3 NavigationAgent3D::get_target_location() const {
Vector3 NavigationAgent3D::get_next_location() { Vector3 NavigationAgent3D::get_next_location() {
update_navigation(); update_navigation();
if (navigation_path.size() == 0) { if (navigation_path.size() == 0) {
ERR_FAIL_COND_V(agent_parent == nullptr, Vector3()); ERR_FAIL_COND_V_MSG(agent_parent == nullptr, Vector3(), "The agent has no parent.");
return agent_parent->get_global_transform().origin; return agent_parent->get_global_transform().origin;
} else { } else {
return navigation_path[nav_path_index] - Vector3(0, navigation_height_offset, 0); return navigation_path[nav_path_index] - Vector3(0, navigation_height_offset, 0);
@ -200,7 +200,7 @@ Vector3 NavigationAgent3D::get_next_location() {
} }
real_t NavigationAgent3D::distance_to_target() const { real_t NavigationAgent3D::distance_to_target() const {
ERR_FAIL_COND_V(agent_parent == nullptr, 0.0); ERR_FAIL_COND_V_MSG(agent_parent == nullptr, 0.0, "The agent has no parent.");
return agent_parent->get_global_transform().origin.distance_to(target_location); return agent_parent->get_global_transform().origin.distance_to(target_location);
} }

2
scene/3d/navigation_region_3d.cpp
View file

@ -162,7 +162,7 @@ void _bake_navigation_mesh(void *p_user_data) {
} }
void NavigationRegion3D::bake_navigation_mesh() { void NavigationRegion3D::bake_navigation_mesh() {
ERR_FAIL_COND(bake_thread.is_started()); ERR_FAIL_COND_MSG(bake_thread.is_started(), "Unable to start another bake request. The navigation mesh bake thread is already baking a navigation mesh.");
BakeThreadsArgs *args = memnew(BakeThreadsArgs); BakeThreadsArgs *args = memnew(BakeThreadsArgs);
args->nav_region = this; args->nav_region = this;