p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when generating signals with an s position equal to the road length.

This commit is contained in:
Axel1092 2020-04-13 15:43:41 +02:00 committed by bernat
parent 45dc963ea6
commit 6bcb390d1f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LibCarla/source/carla/road/Map.cpp
View File

@ -240,8 +240,7 @@ namespace road {
const Road &road = _data.GetRoad(waypoint.road_id);
// check the 's' distance
if (s < 0.0f || s >= road.GetLength())
{
if (s < 0.0f || s >= road.GetLength()) {
return boost::optional<Waypoint>{};
}

6
LibCarla/source/carla/road/MapBuilder.cpp
View File

@ -283,8 +283,12 @@ namespace road {
const double t_position,
const std::string signal_reference_orientation) {
const double epsilon = 0.00001;
RELEASE_ASSERT(s_position >= 0.0);
// Prevent s_position from being equal to the road length
double fixed_s = geom::Math::Clamp(s_position, 0.0, road->GetLength() - epsilon);
_temp_road_info_container[road].emplace_back(std::make_unique<element::RoadInfoSignal>(
signal_id, road->GetId(), s_position, t_position, signal_reference_orientation));
signal_id, road->GetId(), fixed_s, t_position, signal_reference_orientation));
auto road_info_signal = static_cast<element::RoadInfoSignal*>(
_temp_road_info_container[road].back().get());
_temp_signal_reference_container.emplace_back(road_info_signal);