Added type to EnvironmentObject
This commit is contained in:
parent
6b8c40d60a
commit
ab16a64ffb
|
@ -31,11 +31,12 @@ namespace rpc {
|
|||
: transform(EnvironmentObject.Transform),
|
||||
bounding_box(EnvironmentObject.BoundingBox),
|
||||
id(EnvironmentObject.Id),
|
||||
name(TCHAR_TO_UTF8(*EnvironmentObject.Name)) {}
|
||||
name(TCHAR_TO_UTF8(*EnvironmentObject.Name)),
|
||||
type(EnvironmentObject.ObjectLabel) {}
|
||||
|
||||
#endif // LIBCARLA_INCLUDED_FROM_UE4
|
||||
|
||||
MSGPACK_DEFINE_ARRAY(transform, bounding_box, id, name);
|
||||
MSGPACK_DEFINE_ARRAY(transform, bounding_box, id, name, type);
|
||||
};
|
||||
|
||||
} // namespace rpc
|
||||
|
|
|
@ -13,6 +13,17 @@
|
|||
|
||||
namespace crp = carla::rpc;
|
||||
|
||||
enum EnvironmentObjectType
|
||||
{
|
||||
Invalid,
|
||||
Vehicle,
|
||||
Character,
|
||||
TrafficLight,
|
||||
ISMComp,
|
||||
SMComp,
|
||||
SKMComp
|
||||
};
|
||||
|
||||
// Name is under discussion
|
||||
USTRUCT(BlueprintType)
|
||||
struct CARLA_API FEnvironmentObject
|
||||
|
@ -32,6 +43,8 @@ struct CARLA_API FEnvironmentObject
|
|||
|
||||
uint64 Id = 0;
|
||||
|
||||
EnvironmentObjectType Type = EnvironmentObjectType::Invalid;
|
||||
|
||||
crp::CityObjectLabel ObjectLabel;
|
||||
|
||||
bool CanTick = false;
|
||||
|
|
Loading…
Reference in New Issue