|
10 | 10 |
|
11 | 11 | using namespace candlewick::multibody; |
12 | 12 |
|
| 13 | +#define DEF_PROP_PROXY(name) \ |
| 14 | + add_property(#name, bp::make_function( \ |
| 15 | + +[](Visualizer &v) -> auto & { return v.name(); }, \ |
| 16 | + bp::return_internal_reference<>())) |
| 17 | + |
13 | 18 | void exposeVisualizer() { |
14 | 19 | eigenpy::OptionalConverter<ConstVectorRef, std::optional>::registration(); |
15 | 20 | bp::class_<Visualizer::Config>("VisualizerConfig", bp::init<>()) |
16 | 21 | .def_readwrite("width", &Visualizer::Config::width) |
17 | 22 | .def_readwrite("height", &Visualizer::Config::height); |
18 | 23 |
|
19 | | - auto cl = |
20 | | - bp::class_<Visualizer, boost::noncopyable>("Visualizer", bp::no_init) |
21 | | - .def(bp::init<Visualizer::Config, const pin::Model &, |
22 | | - const pin::GeometryModel &>( |
23 | | - ("self"_a, "config", "model", "geomModel"))) |
24 | | - .def(pinocchio::python::VisualizerPythonVisitor<Visualizer>{}) |
25 | | - .def_readonly("renderer", &Visualizer::renderer) |
26 | | - .add_property("shouldExit", &Visualizer::shouldExit); |
27 | | - |
| 24 | + bp::class_<Visualizer, boost::noncopyable>("Visualizer", bp::no_init) |
| 25 | + .def(bp::init<Visualizer::Config, const pin::Model &, |
| 26 | + const pin::GeometryModel &>( |
| 27 | + ("self"_a, "config", "model", "geomModel"))) |
| 28 | + .def(pinocchio::python::VisualizerPythonVisitor<Visualizer>{}) |
| 29 | + .def_readonly("renderer", &Visualizer::renderer) |
28 | 30 | // fix for Pinocchio 3.5.0 |
29 | 31 | #if PINOCCHIO_VERSION_AT_MOST(3, 5, 0) |
30 | | -#define DEF_PROP_PROXY(name) \ |
31 | | - add_property(#name, bp::make_function( \ |
32 | | - +[](Visualizer &v) -> auto & { return v.name(); }, \ |
33 | | - bp::return_internal_reference<>())) |
34 | | - cl // |
35 | 32 | .DEF_PROP_PROXY(model) |
36 | 33 | .DEF_PROP_PROXY(visualModel) |
37 | 34 | .DEF_PROP_PROXY(collisionModel) |
38 | 35 | .DEF_PROP_PROXY(data) |
39 | 36 | .DEF_PROP_PROXY(visualData) |
40 | | - .DEF_PROP_PROXY(collisionData); |
41 | | -#undef DEF_PROP_PROXY |
| 37 | + .DEF_PROP_PROXY(collisionData) |
42 | 38 | #endif |
| 39 | + .add_property("shouldExit", &Visualizer::shouldExit); |
43 | 40 | } |
| 41 | +#undef DEF_PROP_PROXY |
0 commit comments