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

Add section_id to waypoints

This commit is contained in:
nsubiron 2019-03-22 13:03:51 +01:00
parent 7dcbdbefbe
commit 6c0371e4a1
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LibCarla/source/carla/road/element/Waypoint.cpp
View File

@ -15,6 +15,7 @@ namespace std {
WaypointHash::result_type WaypointHash::operator()(const argument_type &waypoint) const { WaypointHash::result_type WaypointHash::operator()(const argument_type &waypoint) const {
WaypointHash::result_type seed = 0u; WaypointHash::result_type seed = 0u;
boost::hash_combine(seed, waypoint.road_id); boost::hash_combine(seed, waypoint.road_id);
boost::hash_combine(seed, waypoint.section_id);
boost::hash_combine(seed, waypoint.lane_id); boost::hash_combine(seed, waypoint.lane_id);
boost::hash_combine(seed, static_cast<float>(std::floor(waypoint.s * 200.0))); boost::hash_combine(seed, static_cast<float>(std::floor(waypoint.s * 200.0)));
return seed; return seed;

2
LibCarla/source/carla/road/element/Waypoint.h
View File

@ -19,6 +19,8 @@ namespace element {
RoadId road_id = 0u; RoadId road_id = 0u;
SectionId section_id = 0u;
LaneId lane_id = 0; LaneId lane_id = 0;
float s = 0.0f; float s = 0.0f;