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

Fix Tunnel Semantic Segmentation

This commit is contained in:
XGodina 2022-11-21 17:18:38 +01:00 committed by bernat
parent 88dbe952ff
commit 30c2b12bef
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LibCarla/source/carla/image/CityScapesPalette.h
View File

@ -41,15 +41,15 @@ namespace detail {
{170u, 120u, 50u}, // dynamic = 20u, {170u, 120u, 50u}, // dynamic = 20u,
{ 45u, 60u, 150u}, // water = 21u, { 45u, 60u, 150u}, // water = 21u,
{145u, 170u, 100u}, // terrain = 22u, {145u, 170u, 100u}, // terrain = 22u,
{ 0u, 0u, 70u}, // truck = 24u, { 0u, 0u, 70u}, // truck = 23u,
// { 0u, 0u, 90u}, // caravan // { 0u, 0u, 90u}, // caravan
// { 0u, 0u, 110u}, // trailer // { 0u, 0u, 110u}, // trailer
// { 0u, 0u, 142u}, // license plate // { 0u, 0u, 142u}, // license plate
{ 0u, 0u, 230u}, // motorcycle = 26u, { 0u, 0u, 230u}, // motorcycle = 25u,
{ 0u, 60u, 100u}, // bus = 25u, { 0u, 60u, 100u}, // bus = 24u,
// { 0u, 80u, 100u}, // train // { 0u, 80u, 100u}, // train
{119u, 11u, 32u}, // bicycle = 27u, {119u, 11u, 32u}, // bicycle = 26u,
{150u, 120u, 90u}, // tunnel = 23u, //{150u, 120u, 90u}, // tunnel
// {153u, 153u, 153u}, // polegroup // {153u, 153u, 153u}, // polegroup
// {250u, 170u, 160u}, // parking // {250u, 170u, 160u}, // parking
// {255u, 0u, 0u}, // rider // {255u, 0u, 0u}, // rider

9
LibCarla/source/carla/rpc/ObjectLabel.h
View File

@ -37,11 +37,10 @@ namespace rpc {
Dynamic = 20u, Dynamic = 20u,
Water = 21u, Water = 21u,
Terrain = 22u, Terrain = 22u,
Tunnel = 23u, Truck = 23u,
Truck = 24u, Bus = 24u,
Bus = 25u, Motorcycle = 25u,
Motorcycle = 26u, Bicycle = 26u,
Bicycle = 27u,
Any = 0xFF Any = 0xFF
}; };

5
PythonAPI/carla/source/libcarla/World.cpp
View File

@ -225,11 +225,10 @@ void export_world() {
.value("Dynamic", cr::CityObjectLabel::Dynamic) .value("Dynamic", cr::CityObjectLabel::Dynamic)
.value("Water", cr::CityObjectLabel::Water) .value("Water", cr::CityObjectLabel::Water)
.value("Terrain", cr::CityObjectLabel::Terrain) .value("Terrain", cr::CityObjectLabel::Terrain)
.value("Tunnel", cr::CityObjectLabel::Tunnel)
.value("Truck", cr::CityObjectLabel::Truck) .value("Truck", cr::CityObjectLabel::Truck)
.value("bus", cr::CityObjectLabel::bus) .value("Bus", cr::CityObjectLabel::Bus)
.value("Motorcycle", cr::CityObjectLabel::Motorcycle) .value("Motorcycle", cr::CityObjectLabel::Motorcycle)
.value("bicycle", cr::CityObjectLabel::bicycle) .value("Bicycle", cr::CityObjectLabel::Bicycle)
.value("Any", cr::CityObjectLabel::Any) .value("Any", cr::CityObjectLabel::Any)

4
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/Tagger.cpp
View File

@ -46,8 +46,6 @@ crp::CityObjectLabel ATagger::GetLabelByFolderName(const FString &String) {
else if (String == "Dynamic") return crp::CityObjectLabel::Dynamic; else if (String == "Dynamic") return crp::CityObjectLabel::Dynamic;
else if (String == "Water") return crp::CityObjectLabel::Water; else if (String == "Water") return crp::CityObjectLabel::Water;
else if (String == "Terrain") return crp::CityObjectLabel::Terrain; else if (String == "Terrain") return crp::CityObjectLabel::Terrain;
else if (String == "Tunnel") return crp::CityObjectLabel::Tunnel;
else if (String == "Car") return crp::CityObjectLabel::Car;
else if (String == "Truck") return crp::CityObjectLabel::Truck; else if (String == "Truck") return crp::CityObjectLabel::Truck;
else if (String == "Bus") return crp::CityObjectLabel::Bus; else if (String == "Bus") return crp::CityObjectLabel::Bus;
else if (String == "Motorcycle") return crp::CityObjectLabel::Motorcycle; else if (String == "Motorcycle") return crp::CityObjectLabel::Motorcycle;
@ -258,9 +256,7 @@ FString ATagger::GetTagAsString(const crp::CityObjectLabel Label)
CARLA_GET_LABEL_STR(Dynamic) CARLA_GET_LABEL_STR(Dynamic)
CARLA_GET_LABEL_STR(Water) CARLA_GET_LABEL_STR(Water)
CARLA_GET_LABEL_STR(Terrain) CARLA_GET_LABEL_STR(Terrain)
CARLA_GET_LABEL_STR(Tunnel)
CARLA_GET_LABEL_STR(Truck) CARLA_GET_LABEL_STR(Truck)
CARLA_GET_LABEL_STR(Tunnel)
CARLA_GET_LABEL_STR(Bus) CARLA_GET_LABEL_STR(Bus)
CARLA_GET_LABEL_STR(Motorcycle) CARLA_GET_LABEL_STR(Motorcycle)
CARLA_GET_LABEL_STR(Bicycle) CARLA_GET_LABEL_STR(Bicycle)