Browse Source

Fix NavigationObstacle height

Fixes NavigationObstacle height.

(cherry picked from commit 3f26191d167f6d5f767811d0042ceb4716bb3fec)
smix8 1 year ago
parent
commit
b0179bba74
1 changed files with 2 additions and 0 deletions
  1. 2 0
      modules/navigation/nav_map.cpp

+ 2 - 0
modules/navigation/nav_map.cpp

@@ -1116,6 +1116,7 @@ void NavMap::_update_rvo_obstacles_tree_2d() {
 		rvo_2d_vertices.reserve(_obstacle_vertices.size());
 		rvo_2d_vertices.reserve(_obstacle_vertices.size());
 
 
 		uint32_t _obstacle_avoidance_layers = obstacle->get_avoidance_layers();
 		uint32_t _obstacle_avoidance_layers = obstacle->get_avoidance_layers();
+		real_t _obstacle_height = obstacle->get_height();
 
 
 		for (const Vector3 &_obstacle_vertex : _obstacle_vertices) {
 		for (const Vector3 &_obstacle_vertex : _obstacle_vertices) {
 			rvo_2d_vertices.push_back(RVO2D::Vector2(_obstacle_vertex.x + _obstacle_position.x, _obstacle_vertex.z + _obstacle_position.z));
 			rvo_2d_vertices.push_back(RVO2D::Vector2(_obstacle_vertex.x + _obstacle_position.x, _obstacle_vertex.z + _obstacle_position.z));
@@ -1126,6 +1127,7 @@ void NavMap::_update_rvo_obstacles_tree_2d() {
 		for (size_t i = 0; i < rvo_2d_vertices.size(); i++) {
 		for (size_t i = 0; i < rvo_2d_vertices.size(); i++) {
 			RVO2D::Obstacle2D *rvo_2d_obstacle = new RVO2D::Obstacle2D();
 			RVO2D::Obstacle2D *rvo_2d_obstacle = new RVO2D::Obstacle2D();
 			rvo_2d_obstacle->point_ = rvo_2d_vertices[i];
 			rvo_2d_obstacle->point_ = rvo_2d_vertices[i];
+			rvo_2d_obstacle->height_ = _obstacle_height;
 			rvo_2d_obstacle->elevation_ = _obstacle_position.y;
 			rvo_2d_obstacle->elevation_ = _obstacle_position.y;
 
 
 			rvo_2d_obstacle->avoidance_layers_ = _obstacle_avoidance_layers;
 			rvo_2d_obstacle->avoidance_layers_ = _obstacle_avoidance_layers;