From 568b2541b878c0eac426d35110bd156ed40058e3 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 4 Sep 2023 16:35:59 +0200 Subject: [PATCH] Backported from godot4: Fix NavigationAgent3D debug path duplicated points Fixes duplicated points in NavigationAgent3D debug path. - smix8 https://github.com/godotengine/godot/commit/0b8798a9950ca7a86b1b2e20f69f22ba4396d55a --- scene/3d/navigation_agent.cpp | 47 +++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/scene/3d/navigation_agent.cpp b/scene/3d/navigation_agent.cpp index 18c897e2f..db1813a29 100644 --- a/scene/3d/navigation_agent.cpp +++ b/scene/3d/navigation_agent.cpp @@ -177,7 +177,7 @@ void NavigationAgent::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "debug_enabled"), "set_debug_enabled", "get_debug_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "debug_use_custom"), "set_debug_use_custom", "get_debug_use_custom"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "debug_path_custom_color"), "set_debug_path_custom_color", "get_debug_path_custom_color"); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "debug_path_custom_point_size", PROPERTY_HINT_RANGE, "1,50,1,suffix:px"), "set_debug_path_custom_point_size", "get_debug_path_custom_point_size"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "debug_path_custom_point_size", PROPERTY_HINT_RANGE, "0,50,0.01,or_greater,suffix:px"), "set_debug_path_custom_point_size", "get_debug_path_custom_point_size"); #endif // DEBUG_ENABLED ADD_SIGNAL(MethodInfo("path_changed")); @@ -932,7 +932,8 @@ Color NavigationAgent::get_debug_path_custom_color() const { } void NavigationAgent::set_debug_path_custom_point_size(float p_point_size) { - debug_path_custom_point_size = p_point_size; + debug_path_custom_point_size = MAX(0.0, p_point_size); + ; debug_path_dirty = true; } @@ -998,28 +999,30 @@ void NavigationAgent::_update_debug_path() { debug_path_mesh->surface_set_material(0, debug_agent_path_line_material); } - Vector debug_path_points_vertex_array; + if (debug_path_custom_point_size > 0.0) { + Vector debug_path_points_vertex_array; - for (int i = 0; i < navigation_path.size(); i++) { - debug_path_points_vertex_array.push_back(navigation_path[i]); - } - - Array debug_path_points_mesh_array; - debug_path_points_mesh_array.resize(Mesh::ARRAY_MAX); - debug_path_points_mesh_array[Mesh::ARRAY_VERTEX] = debug_path_lines_vertex_array; - - debug_path_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_POINTS, debug_path_points_mesh_array); - - Ref debug_agent_path_point_material = NavigationServer::get_singleton()->get_debug_navigation_agent_path_point_material(); - if (debug_use_custom) { - if (!debug_agent_path_point_custom_material.is_valid()) { - debug_agent_path_point_custom_material = debug_agent_path_point_material->duplicate(); + for (int i = 0; i < navigation_path.size(); i++) { + debug_path_points_vertex_array.push_back(navigation_path[i]); + } + + Array debug_path_points_mesh_array; + debug_path_points_mesh_array.resize(Mesh::ARRAY_MAX); + debug_path_points_mesh_array[Mesh::ARRAY_VERTEX] = debug_path_points_vertex_array; + + debug_path_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_POINTS, debug_path_points_mesh_array); + + Ref debug_agent_path_point_material = NavigationServer::get_singleton()->get_debug_navigation_agent_path_point_material(); + if (debug_use_custom) { + if (!debug_agent_path_point_custom_material.is_valid()) { + debug_agent_path_point_custom_material = debug_agent_path_point_material->duplicate(); + } + debug_agent_path_point_custom_material->set_albedo(debug_path_custom_color); + debug_agent_path_point_custom_material->set_point_size(debug_path_custom_point_size); + debug_path_mesh->surface_set_material(1, debug_agent_path_point_custom_material); + } else { + debug_path_mesh->surface_set_material(1, debug_agent_path_point_material); } - debug_agent_path_point_custom_material->set_albedo(debug_path_custom_color); - debug_agent_path_point_custom_material->set_point_size(debug_path_custom_point_size); - debug_path_mesh->surface_set_material(1, debug_agent_path_point_custom_material); - } else { - debug_path_mesh->surface_set_material(1, debug_agent_path_point_material); } RS::get_singleton()->instance_set_base(debug_path_instance, debug_path_mesh->get_rid());