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

Using CALL_RETURNING_LIST instead of custom function

This commit is contained in:
victor.anton 2020-01-23 14:06:48 +01:00 committed by Marc Garcia Puig
parent 2bf2b97d64
commit 86c4411b88
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
PythonAPI/carla/source/libcarla/Geom.cpp
View File

@ -86,25 +86,6 @@ static void TransformList(const carla::geom::Transform &self, boost::python::lis
}
}
template <typename TContainer>
static boost::python::list CreatePythonList(const TContainer &container) {
boost::python::list py_list;
for (auto iter = container.begin(); iter != container.end(); ++iter) {
py_list.append(*iter);
}
return py_list;
}
static boost::python::list BBoxGetLocalVerticesPython(const carla::geom::BoundingBox &self) {
return CreatePythonList(self.GetLocalVertices());
}
static boost::python::list BBoxGetWorldVerticesPython(
const carla::geom::BoundingBox &self,
const carla::geom::Transform &bbox_transform) {
return CreatePythonList(self.GetWorldVertices(bbox_transform));
}
void export_geom() {
using namespace boost::python;
namespace cg = carla::geom;
@ -201,8 +182,8 @@ void export_geom() {
.def_readwrite("location", &cg::BoundingBox::location)
.def_readwrite("extent", &cg::BoundingBox::extent)
.def("contains", &cg::BoundingBox::Contains, arg("point"), arg("bbox_transform"))
.def("get_local_vertices", &BBoxGetLocalVerticesPython)
.def("get_world_vertices", &BBoxGetWorldVerticesPython, arg("bbox_transform"))
.def("get_local_vertices", CALL_RETURNING_LIST(cg::BoundingBox, GetLocalVertices))
.def("get_world_vertices", CALL_RETURNING_LIST_1(cg::BoundingBox, GetWorldVertices, const cg::Transform&), arg("bbox_transform"))
.def("__eq__", &cg::BoundingBox::operator==)
.def("__ne__", &cg::BoundingBox::operator!=)
.def(self_ns::str(self_ns::self))