-
Notifications
You must be signed in to change notification settings - Fork 95
ImGuiIntegration example #51
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.
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
Conversation
6fd8602
to
f6de140
Compare
f6de140
to
3f5aa2b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😍
3f5aa2b
to
1fe2820
Compare
@mosra Ready for review! :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great, except for the inconsistencies in CI configs (and those will probably uncover some more issues).
Also, what's the webvr_original.png
doing here? ;)
The [ports branch](https://github.com/mosra/magnum-examples/tree/ports/src/imgui) | ||
contains additional patches for @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten" | ||
support that aren't present in `master` in order to keep the example code as | ||
simple as possible. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds like a thing I should do post-merge, haha :)
69d874f
to
ada2127
Compare
ada2127
to
309e84c
Compare
779b454
to
f498e76
Compare
Updated the find modules and rebased onto master :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And there's still the superfluous webvr_original.png
file ;)
dd94ea3
to
49dcc4d
Compare
Alright, now it should be done :D |
Signed-off-by: Squareys <squareys@googlemail.com>
49dcc4d
to
decbab1
Compare
# Vladimír Vondruš <mosra@centrum.cz> | ||
# 2018 — ShaddyAQN <ShaddyAQN@gmail.com> | ||
# 2018 — Jonathan Hale <squareys@googlemail.com> | ||
# 2018 — Thomas Skrivan <skrivantomas@seznam.cz> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2018 — Tomáš Skřivan <skrivantomas@seznam.cz>
... 😆
Merged in 37dab5b, thank you (and everyone else) for the great work! 🎉 Since this was impossible to test for you without the integration PR being merged, I amended the commit with up-to-date FindImGui and FindMagnumIntegration as well as other minor fixes in the CI scripts. The web demo is now ready as well: https://magnum.graphics/showcase/imgui/ |
Awesome! 🎉 And thank you so much for all the cleanup and improvements afterwards! 🙏 |
Hello everybody!
This is the WIP PR for integrating the example from magnum-imgui into the main magnum repositories.
Cheers,
Jonathan
TODOs