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
base: master
from

Conversation

2 participants
@Squareys
Copy link
Contributor

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

@Squareys Squareys referenced this pull request Nov 13, 2018

Merged

Move Imgui integration #33

10 of 10 tasks complete

@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

Show resolved Hide resolved src/imgui/ImGuiExample.cpp Outdated

@Squareys Squareys force-pushed the Squareys:imgui-example branch from 6fd8602 to f6de140 Nov 14, 2018

@Squareys Squareys force-pushed the Squareys:imgui-example branch from f6de140 to 3f5aa2b Nov 26, 2018

@mosra
Copy link
Owner

mosra left a comment

😍

Show resolved Hide resolved doc/imgui.dox Outdated
Show resolved Hide resolved src/imgui/ImGuiExample.cpp Outdated

@Squareys Squareys force-pushed the Squareys:imgui-example branch from 3f5aa2b to 1fe2820 Dec 1, 2018

@Squareys Squareys changed the title [WIP] ImGuiIntegration example ImGuiIntegration example Dec 1, 2018

@Squareys

This comment has been minimized.

Copy link
Contributor Author

Squareys commented Dec 1, 2018

@mosra Ready for review! :)

@mosra
Copy link
Owner

mosra left a comment

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? ;)

Show resolved Hide resolved 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
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.

This comment has been minimized.

@mosra

mosra Dec 3, 2018

Owner

Sounds like a thing I should do post-merge, haha :)

Show resolved Hide resolved src/imgui/ImGuiExample.cpp Outdated
Show resolved Hide resolved doc/imgui.dox Outdated

@Squareys Squareys force-pushed the Squareys:imgui-example branch from 69d874f to ada2127 Dec 5, 2018

Show resolved Hide resolved doc/imgui.dox Outdated

@Squareys Squareys force-pushed the Squareys:imgui-example branch from ada2127 to 309e84c Dec 8, 2018

@Squareys Squareys force-pushed the Squareys:imgui-example branch 3 times, most recently from 779b454 to f498e76 Dec 15, 2018

@Squareys

This comment has been minimized.

Copy link
Contributor Author

Squareys commented Dec 15, 2018

Updated the find modules and rebased onto master :)

@mosra
Copy link
Owner

mosra left a comment

And there's still the superfluous webvr_original.png file ;)

Show resolved Hide resolved 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

@Squareys Squareys force-pushed the Squareys:imgui-example branch 4 times, most recently from dd94ea3 to 49dcc4d Dec 16, 2018

@Squareys

This comment has been minimized.

Copy link
Contributor Author

Squareys commented Dec 16, 2018

Alright, now it should be done :D

imgui: Add initial ImGuiIntegration example code
Signed-off-by: Squareys <squareys@googlemail.com>

@Squareys Squareys force-pushed the Squareys:imgui-example branch from 49dcc4d to decbab1 Dec 16, 2018

# Vladimír Vondruš <mosra@centrum.cz>
# 2018 — ShaddyAQN <ShaddyAQN@gmail.com>
# 2018 — Jonathan Hale <squareys@googlemail.com>
# 2018 — Thomas Skrivan <skrivantomas@seznam.cz>

This comment has been minimized.

@mosra

mosra Dec 16, 2018

Owner

2018 — Tomáš Skřivan <skrivantomas@seznam.cz>

... 😆

@mosra mosra referenced this pull request Dec 29, 2018

Closed

2019.01 #302

55 of 55 tasks complete
@mosra

This comment has been minimized.

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

This comment has been minimized.

Copy link
Contributor Author

Squareys commented Jan 10, 2019

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