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

Fixed bool comparison overloads in pyhon client

This commit is contained in:
Marc Garcia Puig 2019-02-11 18:09:36 +01:00
parent 792cd25c75
commit a81ff1e90c
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
PythonAPI/source/libcarla/Blueprint.cpp
View File

@ -98,33 +98,33 @@ void export_blueprint() {
;
class_<cc::ActorAttribute>("ActorAttribute", no_init)
.add_property("id", CALL_RETURNING_COPY(cc::ActorAttribute, GetId))
.add_property("type", &cc::ActorAttribute::GetType)
.add_property("recommended_values", CALL_RETURNING_LIST(cc::ActorAttribute, GetRecommendedValues))
.add_property("is_modifiable", &cc::ActorAttribute::IsModifiable)
.def("as_bool", &cc::ActorAttribute::As<bool>)
.def("as_int", &cc::ActorAttribute::As<int>)
.def("as_float", &cc::ActorAttribute::As<float>)
.def("as_str", &cc::ActorAttribute::As<std::string>)
.def("as_color", &cc::ActorAttribute::As<csd::Color>)
// .def("__eq__", &cc::ActorAttribute::operator==<bool>)
// .def("__eq__", &cc::ActorAttribute::operator==<int>)
// .def("__eq__", &cc::ActorAttribute::operator==<float>)
// .def("__eq__", &cc::ActorAttribute::operator==<std::string>)
// .def("__eq__", &cc::ActorAttribute::operator==<csd::Color>)
// .def("__eq__", &cc::ActorAttribute::operator==<cc::ActorAttribute>)
// .def("__ne__", &cc::ActorAttribute::operator!=<bool>)
// .def("__ne__", &cc::ActorAttribute::operator!=<int>)
// .def("__ne__", &cc::ActorAttribute::operator!=<float>)
// .def("__ne__", &cc::ActorAttribute::operator!=<std::string>)
// .def("__ne__", &cc::ActorAttribute::operator!=<csd::Color>)
// .def("__ne__", &cc::ActorAttribute::operator!=<cc::ActorAttribute>)
.def("__nonzero__", &cc::ActorAttribute::As<bool>)
.def("__bool__", &cc::ActorAttribute::As<bool>)
.def("__int__", &cc::ActorAttribute::As<int>)
.def("__float__", &cc::ActorAttribute::As<float>)
.def("__str__", &cc::ActorAttribute::As<std::string>)
.def(self_ns::str(self_ns::self))
.add_property("id", CALL_RETURNING_COPY(cc::ActorAttribute, GetId))
.add_property("type", &cc::ActorAttribute::GetType)
.add_property("recommended_values", CALL_RETURNING_LIST(cc::ActorAttribute, GetRecommendedValues))
.add_property("is_modifiable", &cc::ActorAttribute::IsModifiable)
.def("as_bool", &cc::ActorAttribute::As<bool>)
.def("as_int", &cc::ActorAttribute::As<int>)
.def("as_float", &cc::ActorAttribute::As<float>)
.def("as_str", &cc::ActorAttribute::As<std::string>)
.def("as_color", &cc::ActorAttribute::As<csd::Color>)
.def("__eq__", &cc::ActorAttributeValueAccess::operator==<bool>)
.def("__eq__", &cc::ActorAttributeValueAccess::operator==<int>)
.def("__eq__", &cc::ActorAttributeValueAccess::operator==<float>)
.def("__eq__", &cc::ActorAttributeValueAccess::operator==<std::string>)
.def("__eq__", &cc::ActorAttributeValueAccess::operator==<csd::Color>)
.def("__eq__", &cc::ActorAttributeValueAccess::operator==<cc::ActorAttribute>)
.def("__ne__", &cc::ActorAttributeValueAccess::operator!=<bool>)
.def("__ne__", &cc::ActorAttributeValueAccess::operator!=<int>)
.def("__ne__", &cc::ActorAttributeValueAccess::operator!=<float>)
.def("__ne__", &cc::ActorAttributeValueAccess::operator!=<std::string>)
.def("__ne__", &cc::ActorAttributeValueAccess::operator!=<csd::Color>)
.def("__ne__", &cc::ActorAttributeValueAccess::operator!=<cc::ActorAttribute>)
.def("__nonzero__", &cc::ActorAttribute::As<bool>)
.def("__bool__", &cc::ActorAttribute::As<bool>)
.def("__int__", &cc::ActorAttribute::As<int>)
.def("__float__", &cc::ActorAttribute::As<float>)
.def("__str__", &cc::ActorAttribute::As<std::string>)
.def(self_ns::str(self_ns::self))
;
class_<cc::ActorBlueprint>("ActorBlueprint", no_init)