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

Merge remote-tracking branch 'origin/opendrive_testing' into jenkins/opendrive

This commit is contained in:
Marc Garcia Puig 2019-03-20 20:29:32 +01:00
parent f21f7830f1 f407e2ca5a
commit 4ded71e4f3
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
LibCarla/source/carla/opendrive/parser/RoadParser.cpp
View File

@ -141,8 +141,26 @@ namespace parser {
section.lanes.emplace_back(lane);
}
// center lane (we don't need this info, the Id is always 0 and has no pre. and successor)
// section.lanes.emplace_back( { 0, 0, 0 });
// center lane
for (pugi::xml_node node_lane : node_section.child("center").children("lane")) {
Lane lane { 0, "none", false, 0, 0 };
lane.id = node_lane.attribute("id").as_int();
lane.type = node_lane.attribute("type").value();
lane.level = node_lane.attribute("level").as_bool();
// link (probably it never exists)
pugi::xml_node link2 = node_lane.child("link");
if (link2) {
if (link2.child("predecessor"))
lane.predecessor = link2.child("predecessor").attribute("id").as_int();
if (link2.child("successor"))
lane.successor = link2.child("successor").attribute("id").as_int();
}
// add it
section.lanes.emplace_back(lane);
}
// right lane
for (pugi::xml_node node_lane : node_section.child("right").children("lane")) {