Fix broken model.vis repr
This commit is contained in:
@@ -1415,7 +1415,27 @@ PYBIND11_MODULE(_structs, m) {
|
|||||||
mjVisual.def("__deepcopy__", [](const MjVisualWrapper& other, py::dict) {
|
mjVisual.def("__deepcopy__", [](const MjVisualWrapper& other, py::dict) {
|
||||||
return MjVisualWrapper(other);
|
return MjVisualWrapper(other);
|
||||||
});
|
});
|
||||||
DefineStructFunctions(mjVisual);
|
mjVisual.def("__eq__", StructsEqual<MjVisualWrapper>);
|
||||||
|
// Special __repr__ implementation for MjVisual, since:
|
||||||
|
// 1. Types under MjVisual confuse StructRepr;
|
||||||
|
// 2. StructRepr does not handle the indentation of nested structs well.
|
||||||
|
mjVisual.def("__repr__", [](py::object self) {
|
||||||
|
std::ostringstream result;
|
||||||
|
result << "<"
|
||||||
|
<< self.attr("__class__").attr("__name__").cast<std::string_view>();
|
||||||
|
#define X(type, var) \
|
||||||
|
result << "\n " #var ": "; \
|
||||||
|
StructReprImpl<type>(self.attr(#var), result, 2);
|
||||||
|
X(raw::MjVisualGlobal, global_)
|
||||||
|
X(raw::MjVisualQuality, quality)
|
||||||
|
X(MjVisualHeadlightWrapper, headlight)
|
||||||
|
X(raw::MjVisualMap, map)
|
||||||
|
X(raw::MjVisualScale, scale)
|
||||||
|
X(MjVisualRgbaWrapper, rgba)
|
||||||
|
#undef X
|
||||||
|
result << "\n>";
|
||||||
|
return result.str();
|
||||||
|
});
|
||||||
|
|
||||||
py::class_<raw::MjVisualGlobal> mjVisualGlobal(mjVisual, "Global");
|
py::class_<raw::MjVisualGlobal> mjVisualGlobal(mjVisual, "Global");
|
||||||
mjVisualGlobal.def("__copy__", [](const raw::MjVisualGlobal& other) {
|
mjVisualGlobal.def("__copy__", [](const raw::MjVisualGlobal& other) {
|
||||||
|
|||||||
@@ -1206,8 +1206,7 @@ bool StructsEqual(pybind11::object lhs, pybind11::object rhs) {
|
|||||||
|
|
||||||
// Returns a string representation of a struct like object.
|
// Returns a string representation of a struct like object.
|
||||||
template <typename T>
|
template <typename T>
|
||||||
std::string StructRepr(pybind11::object self) {
|
void StructReprImpl(pybind11::object self, std::ostringstream& result, int indent) {
|
||||||
std::ostringstream result;
|
|
||||||
result << "<"
|
result << "<"
|
||||||
<< self.attr("__class__").attr("__name__").cast<std::string_view>();
|
<< self.attr("__class__").attr("__name__").cast<std::string_view>();
|
||||||
for (pybind11::handle f : Dir<T>()) {
|
for (pybind11::handle f : Dir<T>()) {
|
||||||
@@ -1216,10 +1215,16 @@ std::string StructRepr(pybind11::object self) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
result << "\n " << name << ": "
|
result << "\n" << std::string(indent + 2, ' ') << name << ": "
|
||||||
<< self.attr(f).attr("__repr__")().cast<std::string_view>();
|
<< self.attr(f).attr("__repr__")().cast<std::string_view>();
|
||||||
}
|
}
|
||||||
result << "\n>";
|
result << "\n" << std::string(indent, ' ') << ">";
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
std::string StructRepr(pybind11::object self) {
|
||||||
|
std::ostringstream result;
|
||||||
|
StructReprImpl<T>(self, result, 0);
|
||||||
return result.str();
|
return result.str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user