Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/py color support osg viewer #1398

Merged
merged 8 commits into from
Aug 17, 2019
Merged

Fix/py color support osg viewer #1398

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb04543
Add color support for dartpy osg Viewer and ImGuiViewer
chhinze Aug 15, 2019
07bfe08
Fix implicit conversion from python lists to numpy vector
chhinze Aug 15, 2019
c20cb0c
Merge branch 'master' into fix/pyColorSupportOsgViewer
jslee02 Aug 16, 2019
0a85e64
Merge branch 'master' into fix/pyColorSupportOsgViewer
jslee02 Aug 16, 2019
16493e5
Add white background color to
chhinze Aug 17, 2019
bf465bf
Merge branch 'fix/pyColorSupportOsgViewer' of github.com:chhinze/dart…
chhinze Aug 17, 2019
94dfb70
Fix wrong comment
chhinze Aug 17, 2019
ae82541
Merge branch 'master' into fix/pyColorSupportOsgViewer
jslee02 Aug 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions python/dartpy/gui/osg/ImGuiViewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ void ImGuiViewer(py::module& m)
dart::gui::osg::Viewer,
osg::ref_ptr<dart::gui::osg::ImGuiViewer>>(m, "ImGuiViewer")
.def(::py::init<>())
.def(
::py::init([](const Eigen::Vector4d& clearColor) {
return new ::dart::gui::osg::ImGuiViewer(eigToOsgVec4f(clearColor));
}),
::py::arg("clearColor"))
.def(::py::init<const osg::Vec4&>(), ::py::arg("clearColor"))
.def(
"getImGuiHandler",
Expand Down
5 changes: 5 additions & 0 deletions python/dartpy/gui/osg/Viewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ void Viewer(py::module& m)
dart::common::Subject,
::osg::ref_ptr<dart::gui::osg::Viewer>>(m, "Viewer")
.def(::py::init<>())
.def(
::py::init([](const Eigen::Vector4f& clearColor) {
return new ::dart::gui::osg::Viewer(eigToOsgVec4d(clearColor));
}),
::py::arg("clearColor"))
.def(::py::init<const osg::Vec4&>(), ::py::arg("clearColor"))
.def(
"captureScreen",
Expand Down