From eaa5122b654ae0b7e13cdb98cee234cf88d48b94 Mon Sep 17 00:00:00 2001 From: yuanhaorannnnnn <37274406+yuanhaorannnnnn@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:28:18 +0800 Subject: [PATCH] add rock/stone tag (#8598) Co-authored-by: yhr --- LibCarla/source/carla/image/CityScapesPalette.h | 3 ++- LibCarla/source/carla/rpc/ObjectLabel.h | 1 + PythonAPI/carla/src/World.cpp | 1 + Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.cpp | 4 ++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/LibCarla/source/carla/image/CityScapesPalette.h b/LibCarla/source/carla/image/CityScapesPalette.h index 177feadf8..8eb468a08 100644 --- a/LibCarla/source/carla/image/CityScapesPalette.h +++ b/LibCarla/source/carla/image/CityScapesPalette.h @@ -48,7 +48,8 @@ namespace detail { { 81u, 0u, 81u}, // ground = 25u {150u, 100u, 100u}, // bridge = 26u {230u, 150u, 140u}, // rail track = 27u - {180u, 165u, 180u} // guard rail = 28u + {180u, 165u, 180u}, // guard rail = 28u + {180u, 130u, 70u}, // rock = 29u }; } // namespace detail diff --git a/LibCarla/source/carla/rpc/ObjectLabel.h b/LibCarla/source/carla/rpc/ObjectLabel.h index 86c9a7ecf..e102fb0f5 100644 --- a/LibCarla/source/carla/rpc/ObjectLabel.h +++ b/LibCarla/source/carla/rpc/ObjectLabel.h @@ -45,6 +45,7 @@ namespace rpc { Bridge = 26u, RailTrack = 27u, GuardRail = 28u, + Rock = 29u, Any = 0xFF }; diff --git a/PythonAPI/carla/src/World.cpp b/PythonAPI/carla/src/World.cpp index acd48af2c..3db868a24 100644 --- a/PythonAPI/carla/src/World.cpp +++ b/PythonAPI/carla/src/World.cpp @@ -228,6 +228,7 @@ void export_world() { .value("Bus", cr::CityObjectLabel::Bus) .value("Rider", cr::CityObjectLabel::Rider) .value("Train", cr::CityObjectLabel::Train) + .value("Rock", cr::CityObjectLabel::Rock) .value("Any", cr::CityObjectLabel::Any) ; diff --git a/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.cpp index 8c6d49d82..c9a8352f5 100644 --- a/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.cpp +++ b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Game/Tagger.cpp @@ -54,6 +54,8 @@ crp::CityObjectLabel ATagger::GetLabelByFolderName(const FString &String) { else if (String == "Bus") return crp::CityObjectLabel::Bus; else if (String == "Rider") return crp::CityObjectLabel::Rider; else if (String == "Train") return crp::CityObjectLabel::Train; + else if (String == "Rock") return crp::CityObjectLabel::Rock; + else if (String == "Stone") return crp::CityObjectLabel::Rock; else return crp::CityObjectLabel::None; } @@ -225,6 +227,7 @@ crp::CityObjectLabel ATagger::GetTagFromString(FString Tag) if(Tag.Contains("Bus")) return crp::CityObjectLabel::Bus; if(Tag.Contains("Rider")) return crp::CityObjectLabel::Rider; if(Tag.Contains("Train")) return crp::CityObjectLabel::Train; + if(Tag.Contains("Rock")) return crp::CityObjectLabel::Rock; return crp::CityObjectLabel::None; } @@ -262,6 +265,7 @@ FString ATagger::GetTagAsString(const crp::CityObjectLabel Label) CARLA_GET_LABEL_STR(Bus) CARLA_GET_LABEL_STR(Train) CARLA_GET_LABEL_STR(Rider) + CARLA_GET_LABEL_STR(Rock) #undef CARLA_GET_LABEL_STR }