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.

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

ImGuiIntegration example #51

Closed
wants to merge 1 commit into from
Closed

Conversation

Squareys
Copy link
Contributor

@Squareys Squareys commented Nov 13, 2018

Hello everybody!

This is the WIP PR for integrating the example from magnum-imgui into the main magnum repositories.

Cheers,
Jonathan

TODOs

  • Add initial code
  • Adapt codestyle
  • Adapt to changes is ImGuiIntegration
  • Enable on CI
  • Add documentation and screenshot

@mosra mosra added this to TODO in Project management via automation Nov 13, 2018
@mosra mosra added this to the 2018.1d milestone Nov 13, 2018
src/imgui/ImGuiExample.cpp Outdated Show resolved Hide resolved
Copy link
Owner

@mosra mosra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😍

doc/imgui.dox Outdated Show resolved Hide resolved
src/imgui/ImGuiExample.cpp Outdated Show resolved Hide resolved
@Squareys Squareys changed the title [WIP] ImGuiIntegration example ImGuiIntegration example Dec 1, 2018
@Squareys
Copy link
Contributor Author

Squareys commented Dec 1, 2018

@mosra Ready for review! :)

Copy link
Owner

@mosra mosra left a 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? ;)

package/ci/appveyor-desktop-gles.bat Outdated Show resolved Hide resolved
package/ci/travis-desktop.sh Show resolved Hide resolved
package/ci/travis-emscripten.sh Show resolved Hide resolved
package/ci/travis-ios-simulator.sh Show resolved Hide resolved
src/imgui/CMakeLists.txt Show resolved Hide resolved
src/imgui/ImGuiExample.cpp Show resolved Hide resolved
doc/imgui.dox Outdated Show resolved Hide resolved
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.
Copy link
Owner

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 :)

src/imgui/ImGuiExample.cpp Outdated Show resolved Hide resolved
doc/imgui.dox Outdated Show resolved Hide resolved
doc/imgui.dox Outdated Show resolved Hide resolved
@Squareys
Copy link
Contributor Author

Updated the find modules and rebased onto master :)

Copy link
Owner

@mosra mosra left a 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 ;)

package/ci/appveyor.yml Outdated Show resolved Hide resolved
package/ci/travis-desktop.sh Show resolved Hide resolved
package/ci/travis-android-arm.sh Outdated Show resolved Hide resolved
package/ci/travis-emscripten.sh Outdated Show resolved Hide resolved
package/ci/travis.yml Outdated Show resolved Hide resolved
src/imgui/CMakeLists.txt Show resolved Hide resolved
@Squareys Squareys force-pushed the imgui-example branch 4 times, most recently from dd94ea3 to 49dcc4d Compare December 16, 2018 09:47
@Squareys
Copy link
Contributor Author

Alright, now it should be done :D

Signed-off-by: Squareys <squareys@googlemail.com>
# Vladimír Vondruš <mosra@centrum.cz>
# 2018 — ShaddyAQN <ShaddyAQN@gmail.com>
# 2018 — Jonathan Hale <squareys@googlemail.com>
# 2018 — Thomas Skrivan <skrivantomas@seznam.cz>
Copy link
Owner

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>

... 😆

@mosra mosra mentioned this pull request Dec 29, 2018
55 tasks
@mosra
Copy link
Owner

mosra commented Jan 9, 2019

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/

@mosra mosra closed this Jan 9, 2019
Project management automation moved this from TODO to Done Jan 9, 2019
@Squareys
Copy link
Contributor Author

Awesome! 🎉 And thank you so much for all the cleanup and improvements afterwards! 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants