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

Emscripten support take 2 #2172

Open
wants to merge 58 commits into
base: master
Choose a base branch
from

Commits on Dec 13, 2018

  1. Configuration menu
    Copy the full SHA
    3cd6805 View commit details
    Browse the repository at this point in the history
  2. add ci_emscripten_app

    sortofsleepy committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    cf7505b View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2018

  1. Configuration menu
    Copy the full SHA
    1bd6958 View commit details
    Browse the repository at this point in the history
  2. rest of the core changes that need to be made for Emscripten to be run.

    - to avoid confusion, this is the last half of changes needed, first half was core files needed just to get an app to spin up.
    sortofsleepy committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    717b52a View commit details
    Browse the repository at this point in the history
  3. Add Emscripten samples

    sortofsleepy committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    d53a220 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    706d4cd View commit details
    Browse the repository at this point in the history
  5. add audio stuff

    sortofsleepy committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    a20b341 View commit details
    Browse the repository at this point in the history
  6. add Emscripten env source script when generating samples just in case…

    … it gets in there on accident.
    sortofsleepy committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    ae4928b View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2018

  1. Configuration menu
    Copy the full SHA
    481e8cc View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Add dat.gui sample

    sortofsleepy committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    0843b2c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    492052a View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. - Remove WebAudioNode

    - Fix helpers.js so we aren't using ES6 and getting errors when building release.
    sortasleepy committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    20b8abf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dfe32a3 View commit details
    Browse the repository at this point in the history
  3. Minor style updates to CinderEmscripten.h + add note about non-functi…

    …onality of NativeWebAudioNode and mention about current roadblocks.
    sortofsleepy committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    30cb766 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. - Minor comment updating

    - oops, completely forgot about ES6 `let` statements, did that here
    sortasleepy committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    b6c0e11 View commit details
    Browse the repository at this point in the history
  2. Update documentation with

    - documentation about emscripten::val
    - update upcoming cmake changes
    - update in-dev audio api notes.
    sortofsleepy committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    6426036 View commit details
    Browse the repository at this point in the history
  3. update guide index.html

    sortofsleepy committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    ce82abf View commit details
    Browse the repository at this point in the history
  4. - one last bit of ES6 to remove that I somehow missed in helpers.js

    - add note about strange GL_RGB16F incompatibility
    - minor update in style to datgui.cpp
    - doc update with new notes of things that differ between desktop and Emscripten
    sortofsleepy committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    d02ee0e View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2018

  1. Configuration menu
    Copy the full SHA
    98e6928 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of github.com:sortofsleepy/Cinder + add simple …

    …transform feedback sample
    
    # Conflicts:
    #	docs/htmlsrc/guides/emscripten/part7.html
    sortasleepy committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    7f6888a View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2018

  1. - fix Cinder.cmake so incorrect closure argument isn't processed

    - add emscripten version of smoke particlces sample
    sortasleepy committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    69e4e33 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4113a86 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e5f4d46 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fcbea31 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    abe9069 View commit details
    Browse the repository at this point in the history
  6. merging @PetrosKataras commit 21a35d8

    PetrosKataras authored and sortasleepy committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    8ee8c50 View commit details
    Browse the repository at this point in the history
  7. adding @PetrosKataras commit f9b8e6c

    PetrosKataras authored and sortasleepy committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    5240192 View commit details
    Browse the repository at this point in the history
  8. Fix closure parameter passing.

    PetrosKataras authored and sortasleepy committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    32c5b43 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    876f309 View commit details
    Browse the repository at this point in the history
  10. merging @PetrosKataras commit cba9ce7

    PetrosKataras authored and sortasleepy committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    58f8b55 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    2097921 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    d3baf95 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2018

  1. 1. fix JS namespace for worklets after find + replace fail

    2. temporary removal of closure compiler as it's currently causing issues with release builds.
    sortasleepy committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    269b9bd View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2018

  1. Move + rename simpleaudio. Also more cleanup

    - rename simpleaudio to AudioPlayer and move into cinder/emscripten instead of cinder/audio/emscripten
    - add implementation file for AudioPlayer
    - remove node_modules folder
    - add node_modules to gitignore
    sortasleepy committed Dec 27, 2018
    Configuration menu
    Copy the full SHA
    4d9ee65 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2018

  1. Tweaks to how audio files get loaded. Other minor adjustments

    - WebAudioLoader becomes FileWebAudio and integrated into ci::audio::Source
    - tweak voice sample to use correct path + wrap in try / catch in case things break again
    - In PlatformEmscripten, make sure something is returned if a large file is requested instead of just a blank path.
    - remove namespaces from EmscriptenVideo.h
    - minor cleanup in EmscriptenVideo.cpp
    sortasleepy committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    b8c8141 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2018

  1. Move some things over to implementaiton files

    - add FileWebAudio implementation file
    - clean up VoiceBasic sample a little so log makes sense.
    - update build cmake file
    sortasleepy committed Dec 29, 2018
    Configuration menu
    Copy the full SHA
    7fd1b0d View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2019

  1. Minor style changes + small fixes to AudioPlayer

    - remove ContextWebAudio include form FileWebAudio
    - add missing semi-colon + correct "createElement" calls in AudioPlayer
    - minor commenting + add helpers to get current browser window width/height
    sortasleepy committed Jan 1, 2019
    Configuration menu
    Copy the full SHA
    b3aaf65 View commit details
    Browse the repository at this point in the history
  2. - correct Voice.cpp to use FileWebAudio instead of WebAudioLoader

    - delete WebAudioLoader
    sortasleepy committed Jan 1, 2019
    Configuration menu
    Copy the full SHA
    c131696 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2019

  1. Configuration menu
    Copy the full SHA
    73db188 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2019

  1. start drag-n-drop sample

    sortasleepy committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    7a571b4 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2019

  1. finish drag-n-drop sample

    sortasleepy committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    9242350 View commit details
    Browse the repository at this point in the history
  2. minor style cleanup

    sortasleepy committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    b4da3de View commit details
    Browse the repository at this point in the history
  3. Simplify video sample.

    - remove VideoCube sample in favor of drag-n-drop based sample
    - add note to app source detailing what the sample is showing.
    sortasleepy committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    83e1857 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2020

  1. Configuration menu
    Copy the full SHA
    7cad518 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Merge branch 'master' of https://github.com/cinder/Cinder into 0.9.3-…

    …merge
    
    # Conflicts:
    #	.gitignore
    #	include/cinder/gl/platform.h
    #	include/cinder/linux/gl_es_load.h
    #	proj/cmake/libcinder_source_files.cmake
    #	src/cinder/gl/ConstantConversions.cpp
    #	src/cinder/gl/EnvironmentEs.cpp
    #	src/cinder/linux/gl_es_load.cpp
    sortasleepy committed May 8, 2020
    Configuration menu
    Copy the full SHA
    b9e86d7 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. Configuration menu
    Copy the full SHA
    e19be57 View commit details
    Browse the repository at this point in the history
  2. - reconfigure cmake files a bit - Emscripten doesn't set CMAKE_SYSTEM…

    …_NAME properly so add boolean check to ensure we load the right toolchain
    
    - also set CINDER_SRC_DIR temporarily as that doesn' appear to get set either.
    
    (tested on WSL)
    sortasleepy committed May 29, 2020
    Configuration menu
    Copy the full SHA
    0a722b2 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2020

  1. clean up some of the previous changes.

    - also add the appropriate statements now needed to suppot GLAD.
    sortasleepy committed May 30, 2020
    Configuration menu
    Copy the full SHA
    971b086 View commit details
    Browse the repository at this point in the history
  2. Fixing up some more stuff

    - remove globalbindings.h as that is likely old, Embind has to be used in the implementation file
    - add some checks to libcinder_configure as there are some thiings we don't really need and some things that for some reason have needed to end up there(zlib)
    - fix up cinderEmscriptenMakeApp to use new Asyncify system to be compatible with Emscripten's pure WASM backend. Add some more comments + clean some stuff up
    - fix up drag and drop sample
    - fix up smoke particles sample
    - remove Emscripten check in globalbindings.cpp to try and see if it would binding event listeners would work again. Needs more testing as it's currently not working for some reason.
    sortasleepy committed May 30, 2020
    Configuration menu
    Copy the full SHA
    70caa56 View commit details
    Browse the repository at this point in the history
  3. remove audio related classes as they should probabbly just be a Cinde…

    …rBlock in order ot better support future apis which rely on Javascript.
    sortasleepy committed May 30, 2020
    Configuration menu
    Copy the full SHA
    2e50d3d View commit details
    Browse the repository at this point in the history

Commits on May 31, 2020

  1. Fix up AssetLoader sample

    - fix copyToVector function with new updated method(still referenced at mentioned issue link)
    - also move some stuff around since those might be getting scrapped. Still wanna keep for historical reference though.
    sortasleepy committed May 31, 2020
    Configuration menu
    Copy the full SHA
    3d380e1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    80425d4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b65eda5 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. update some docs. Move emscripten listener binding to AppEmscripten a…

    …s for some reason it was not getting packaged in when it was in globalbindings.cpp
    sortasleepy committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    799465e View commit details
    Browse the repository at this point in the history
  2. - Move WebWorker sample out of _tests after testing.

    - clean up cinderEmscriptenApp file a bit, add support for overriding default output directory and fixing issue where worker flag was not getting appended. Also added mesage to status output indicating whether or not something is getting built as a worker.
    sortasleepy committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    67e4b1e View commit details
    Browse the repository at this point in the history
  3. Fix up HTML example and other misc fixes

    - fix up sample showing audio and HTML elements.
    - fix configure file, fix is not needed anymore.
    - include AudioPlayer in build.
    sortasleepy committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    f0afaec View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. Some last minute re-org

    sortasleepy committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    14beead View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. Configuration menu
    Copy the full SHA
    84def56 View commit details
    Browse the repository at this point in the history