add rock/stone tag (#8598)

Co-authored-by: yhr <yuanhaoran@synkrotron.ai>
This commit is contained in:
yuanhaorannnnnn 2025-01-24 18:28:18 +08:00 committed by GitHub
parent c5b08f1624
commit eaa5122b65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 1 deletions

View File

@ -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

View File

@ -45,6 +45,7 @@ namespace rpc {
Bridge = 26u,
RailTrack = 27u,
GuardRail = 28u,
Rock = 29u,
Any = 0xFF
};

View File

@ -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)
;

View File

@ -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
}