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

Use Emscripten application #10

Closed
wants to merge 4 commits into from

Conversation

@Squareys
Copy link
Contributor

commented May 7, 2019

Hi @mosra !

As part of mosra/magnum#300, here are the ports of player and ui-gallery.

Best, Jonathan.

@Squareys Squareys referenced this pull request May 7, 2019
24 of 24 tasks complete
@mosra
Copy link
Owner

left a comment

I guess I'll merge this after I fix the bug with animation progress being negative.

src/player/Player.cpp Outdated Show resolved Hide resolved
src/player/CMakeLists.txt Outdated Show resolved Hide resolved
src/player/CMakeLists.txt Show resolved Hide resolved

@Squareys Squareys force-pushed the Squareys:emscripten-application branch from 31aa803 to 351ad0b May 23, 2019

@codecov-io

This comment has been minimized.

Copy link

commented May 23, 2019

Codecov Report

Merging #10 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master     #10   +/-   ##
======================================
  Coverage    18.7%   18.7%           
======================================
  Files          35      35           
  Lines        1449    1449           
======================================
  Hits          271     271           
  Misses       1178    1178

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c807881...3dfe7ca. Read the comment docs.

@Squareys Squareys force-pushed the Squareys:emscripten-application branch from 351ad0b to 2bb3909 May 23, 2019

@Squareys

This comment has been minimized.

Copy link
Contributor Author

commented May 23, 2019

@mosra This is also ready for the next review!

@mosra
Copy link
Owner

left a comment

Looks good to me -- can you rebase on latest master and try w/o the assert hotfix?

src/player/Player.cpp Outdated Show resolved Hide resolved

Squareys added some commits May 6, 2019

player: Fix "unclosed openend string list" compilation error on emscr…
…ipten

Signed-off-by: Squareys <squareys@googlemail.com>
modules: Update FindMangum.cmake
Signed-off-by: Squareys <squareys@googlemail.com>
ui-gallery: Use EmscriptenApplication
Signed-off-by: Squareys <squareys@googlemail.com>
player: Use EmscriptenApplication
Signed-off-by: Squareys <squareys@googlemail.com>

@Squareys Squareys force-pushed the Squareys:emscripten-application branch from 2bb3909 to 3dfe7ca May 26, 2019

@mosra mosra added this to the 2019.0b milestone Jun 6, 2019

@mosra mosra added this to TODO in UI via automation Jun 6, 2019

@mosra mosra added this to TODO in Player via automation Jun 6, 2019

@mosra

This comment has been minimized.

Copy link
Owner

commented Jun 6, 2019

Merged as a4caa32, 4828c09 and eca4562, the apps are also shipped on https://magnum.graphics/showcase/ and working nicely. I omitted 3ab1574 because while that one fixes it for cmd.exe, it breaks it on the macOS shell (Travis complaining):

ERROR:root:a problem occurred in evaluating content after a "-s", specifically  EXTRA_EXPORTED_RUNTIME_METHODS=[ccall] . one possible cause of this is missing quotation marks (this depends on the shell you are running in; you may need quotation marks around the entire  EXTRA_EXPORTED_RUNTIME_METHODS=[ccall] , or on an individual element)
Traceback (most recent call last):
  File "/usr/local/Cellar/emscripten/1.37.36/libexec/em++", line 15, in <module>
    python_selector.run(emcc, profile=True)
  File "/usr/local/Cellar/emscripten/1.37.36/libexec/tools/python_selector.py", line 43, in run
    sys.exit(run_by_import(filename, main) if on_allowed_version() else run_by_subprocess(filename))
  File "/usr/local/Cellar/emscripten/1.37.36/libexec/tools/python_selector.py", line 13, in run_by_import
    return getattr(importlib.import_module(os.path.basename(filename)), main)()
  File "/usr/local/Cellar/emscripten/1.37.36/libexec/emcc.py", line 909, in run
    raise e
NameError: name 'ccall' is not defined

This worked correctly on my bash, but apparently not on macOS. Not sure what's the proper fix 😅

@mosra mosra closed this Jun 6, 2019

UI automation moved this from TODO to Done Jun 6, 2019

Player automation moved this from TODO to Done Jun 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
You can’t perform that action at this time.