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

Add lane markings to the city generator

This commit is contained in:
nsubiron 2017-03-13 18:51:10 +01:00
parent 037b82a300
commit 8c8caf02cd
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Carla/CityMapGenerator.cpp
View File

@ -124,6 +124,7 @@ void ACityMapGenerator::GenerateRoads() {
AddInstance(ECityMapMeshTag::RoadTwoLanes_LaneRight, source.x, y, HALF_PI); AddInstance(ECityMapMeshTag::RoadTwoLanes_LaneRight, source.x, y, HALF_PI);
AddInstance(ECityMapMeshTag::RoadTwoLanes_SidewalkLeft, source.x, y, HALF_PI); AddInstance(ECityMapMeshTag::RoadTwoLanes_SidewalkLeft, source.x, y, HALF_PI);
AddInstance(ECityMapMeshTag::RoadTwoLanes_SidewalkRight, source.x, y, HALF_PI); AddInstance(ECityMapMeshTag::RoadTwoLanes_SidewalkRight, source.x, y, HALF_PI);
AddInstance(ECityMapMeshTag::RoadTwoLanes_LaneMarkingBroken, source.x, y, HALF_PI);
} }
} else if (source.y == target.y) { } else if (source.y == target.y) {
// horizontal // horizontal
@ -134,6 +135,7 @@ void ACityMapGenerator::GenerateRoads() {
AddInstance(ECityMapMeshTag::RoadTwoLanes_LaneRight, x, source.y); AddInstance(ECityMapMeshTag::RoadTwoLanes_LaneRight, x, source.y);
AddInstance(ECityMapMeshTag::RoadTwoLanes_SidewalkLeft, x, source.y); AddInstance(ECityMapMeshTag::RoadTwoLanes_SidewalkLeft, x, source.y);
AddInstance(ECityMapMeshTag::RoadTwoLanes_SidewalkRight, x, source.y); AddInstance(ECityMapMeshTag::RoadTwoLanes_SidewalkRight, x, source.y);
AddInstance(ECityMapMeshTag::RoadTwoLanes_LaneMarkingBroken, x, source.y);
} }
} else { } else {
UE_LOG(LogCarla, Warning, TEXT("Diagonal edge ignored")); UE_LOG(LogCarla, Warning, TEXT("Diagonal edge ignored"));
@ -148,7 +150,8 @@ void ACityMapGenerator::GenerateRoads() {
AddInstance(tag ##_Sidewalk0, x, y, angle); \ AddInstance(tag ##_Sidewalk0, x, y, angle); \
AddInstance(tag ##_Sidewalk1, x, y, angle); \ AddInstance(tag ##_Sidewalk1, x, y, angle); \
AddInstance(tag ##_Sidewalk2, x, y, angle); \ AddInstance(tag ##_Sidewalk2, x, y, angle); \
AddInstance(tag ##_Sidewalk3, x, y, angle); AddInstance(tag ##_Sidewalk3, x, y, angle); \
AddInstance(tag ##_LaneMarking, x, y, angle);
// For each node add the intersection. // For each node add the intersection.
for (auto &node : graph.GetNodes()) { for (auto &node : graph.GetNodes()) {

5
Source/Carla/MapGen/CityMapMeshTag.h
View File

@ -13,6 +13,8 @@ enum class ECityMapMeshTag : uint8
RoadTwoLanes_LaneRight UMETA(DisplayName = "Road: Two Lanes - Lane Right"), RoadTwoLanes_LaneRight UMETA(DisplayName = "Road: Two Lanes - Lane Right"),
RoadTwoLanes_SidewalkLeft UMETA(DisplayName = "Road: Two Lanes - Sidewalk Left"), RoadTwoLanes_SidewalkLeft UMETA(DisplayName = "Road: Two Lanes - Sidewalk Left"),
RoadTwoLanes_SidewalkRight UMETA(DisplayName = "Road: Two Lanes - Sidewalk Right"), RoadTwoLanes_SidewalkRight UMETA(DisplayName = "Road: Two Lanes - Sidewalk Right"),
RoadTwoLanes_LaneMarkingSolid UMETA(DisplayName = "Road: Two Lanes - Lane Marking Solid"),
RoadTwoLanes_LaneMarkingBroken UMETA(DisplayName = "Road: Two Lanes - Lane Marking Broken"),
Road90DegTurn_Lane0 UMETA(DisplayName = "Road: 90 Degree Turn - Lane 0"), Road90DegTurn_Lane0 UMETA(DisplayName = "Road: 90 Degree Turn - Lane 0"),
Road90DegTurn_Lane1 UMETA(DisplayName = "Road: 90 Degree Turn - Lane 1"), Road90DegTurn_Lane1 UMETA(DisplayName = "Road: 90 Degree Turn - Lane 1"),
@ -22,6 +24,7 @@ enum class ECityMapMeshTag : uint8
Road90DegTurn_Sidewalk1 UMETA(DisplayName = "Road: 90 Degree Turn - Sidewalk 1"), Road90DegTurn_Sidewalk1 UMETA(DisplayName = "Road: 90 Degree Turn - Sidewalk 1"),
Road90DegTurn_Sidewalk2 UMETA(DisplayName = "Road: 90 Degree Turn - Sidewalk 2"), Road90DegTurn_Sidewalk2 UMETA(DisplayName = "Road: 90 Degree Turn - Sidewalk 2"),
Road90DegTurn_Sidewalk3 UMETA(DisplayName = "Road: 90 Degree Turn - Sidewalk 3"), Road90DegTurn_Sidewalk3 UMETA(DisplayName = "Road: 90 Degree Turn - Sidewalk 3"),
Road90DegTurn_LaneMarking UMETA(DisplayName = "Road: 90 Degree Turn - Lane Marking"),
RoadTIntersection_Lane0 UMETA(DisplayName = "Road: T-Intersection - Lane 0"), RoadTIntersection_Lane0 UMETA(DisplayName = "Road: T-Intersection - Lane 0"),
RoadTIntersection_Lane1 UMETA(DisplayName = "Road: T-Intersection - Lane 1"), RoadTIntersection_Lane1 UMETA(DisplayName = "Road: T-Intersection - Lane 1"),
@ -31,6 +34,7 @@ enum class ECityMapMeshTag : uint8
RoadTIntersection_Sidewalk1 UMETA(DisplayName = "Road: T-Intersection - Sidewalk 1"), RoadTIntersection_Sidewalk1 UMETA(DisplayName = "Road: T-Intersection - Sidewalk 1"),
RoadTIntersection_Sidewalk2 UMETA(DisplayName = "Road: T-Intersection - Sidewalk 2"), RoadTIntersection_Sidewalk2 UMETA(DisplayName = "Road: T-Intersection - Sidewalk 2"),
RoadTIntersection_Sidewalk3 UMETA(DisplayName = "Road: T-Intersection - Sidewalk 3"), RoadTIntersection_Sidewalk3 UMETA(DisplayName = "Road: T-Intersection - Sidewalk 3"),
RoadTIntersection_LaneMarking UMETA(DisplayName = "Road: T-Intersection - Lane Marking"),
RoadXIntersection_Lane0 UMETA(DisplayName = "Road: X-Intersection - Lane 0"), RoadXIntersection_Lane0 UMETA(DisplayName = "Road: X-Intersection - Lane 0"),
RoadXIntersection_Lane1 UMETA(DisplayName = "Road: X-Intersection - Lane 1"), RoadXIntersection_Lane1 UMETA(DisplayName = "Road: X-Intersection - Lane 1"),
@ -40,6 +44,7 @@ enum class ECityMapMeshTag : uint8
RoadXIntersection_Sidewalk1 UMETA(DisplayName = "Road: X-Intersection - Sidewalk 1"), RoadXIntersection_Sidewalk1 UMETA(DisplayName = "Road: X-Intersection - Sidewalk 1"),
RoadXIntersection_Sidewalk2 UMETA(DisplayName = "Road: X-Intersection - Sidewalk 2"), RoadXIntersection_Sidewalk2 UMETA(DisplayName = "Road: X-Intersection - Sidewalk 2"),
RoadXIntersection_Sidewalk3 UMETA(DisplayName = "Road: X-Intersection - Sidewalk 3"), RoadXIntersection_Sidewalk3 UMETA(DisplayName = "Road: X-Intersection - Sidewalk 3"),
RoadXIntersection_LaneMarking UMETA(DisplayName = "Road: X-Intersection - Lane Marking"),
NUMBER_OF_TAGS UMETA(Hidden) NUMBER_OF_TAGS UMETA(Hidden)
}; };