Emscripten crossbuild support #359
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| [settings] | ||
| os=Emscripten | ||
| arch=x86 | ||
| #arch=wasm | ||
| os_build=Linux | ||
| arch_build=x86_64 | ||
| compiler=clang | ||
| compiler.version=10 | ||
| #compiler.version=6.0 | ||
| compiler.libcxx=libc++ | ||
| [options] | ||
| threads=true | ||
| [build_requires] | ||
| emsdk_installer/1.39.6@bincrafters/stable | ||
| [options] | ||
| libjpeg-turbo:SIMD = False | ||
| sdl2_image:tif = False |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,12 @@ | |
| #include <SDL.h> | ||
| #include <SDL_ttf.h> | ||
|
|
||
| #ifdef __EMSCRIPTEN__ | ||
| #include <emscripten.h> | ||
| #endif | ||
|
|
||
| void gameLoop(void* arg_); | ||
|
|
||
| #ifdef USE_ANGELSCRIPT | ||
| #include "Scripting/ScriptEngine.hxx" | ||
| #endif | ||
|
|
@@ -26,6 +32,17 @@ | |
| template void Game::LoopMain<GameLoopMQ, Game::GameVisitor>(Game::GameContext &, Game::GameVisitor); | ||
| template void Game::LoopMain<UILoopMQ, Game::UIVisitor>(Game::GameContext &, Game::UIVisitor); | ||
|
|
||
| typedef struct loop_arg { | ||
| Engine *engine; | ||
| EventManager *evManager; | ||
| UIManager *uiManager; | ||
| } loop_arg; | ||
|
|
||
| // FPS Counter variables | ||
| const float fpsIntervall = 1.0; // interval the fps counter is refreshed in seconds. | ||
| Uint32 fpsLastTime = SDL_GetTicks(); | ||
| Uint32 fpsFrames = 0; | ||
|
|
||
| Game::Game() | ||
| : m_GameContext(&m_UILoopMQ, &m_GameLoopMQ, | ||
| #ifdef USE_AUDIO | ||
|
|
@@ -240,24 +257,32 @@ void Game::mainMenu() | |
|
|
||
| void Game::run(bool SkipMenu) | ||
| { | ||
| loop_arg* arg = new loop_arg; | ||
| Timer benchmarkTimer; | ||
| LOG(LOG_INFO) << VERSION; | ||
|
|
||
| Engine &engine = Engine::instance(); | ||
| EventManager &evManager = EventManager::instance(); | ||
| UIManager &uiManager = UIManager::instance(); | ||
|
|
||
|
|
||
| if (SkipMenu) | ||
| { | ||
| Engine::instance().newGame(); | ||
| } | ||
|
|
||
| benchmarkTimer.start(); | ||
|
|
||
| // SDL_Event event; | ||
|
|
||
| arg->engine = &engine; | ||
| arg->evManager = &evManager; | ||
| arg->uiManager = &uiManager; | ||
|
|
||
| LOG(LOG_DEBUG) << "Map initialized in " << benchmarkTimer.getElapsedTime() << "ms"; | ||
| Camera::centerScreenOnMapCenter(); | ||
|
|
||
|
|
||
| uiManager.init(); | ||
|
|
||
| #ifdef USE_ANGELSCRIPT | ||
|
|
@@ -278,55 +303,18 @@ void Game::run(bool SkipMenu) | |
| } | ||
| #endif // USE_AUDIO | ||
|
|
||
| #ifdef __EMSCRIPTEN__ | ||
| emscripten_set_main_loop_arg(&gameLoop, arg, 0, 1); | ||
| #else | ||
|
|
||
| // GameLoop | ||
| while (engine.isGameRunning()) | ||
| { | ||
| gameLoop( arg); | ||
| } | ||
| #endif | ||
|
|
||
| delete arg; | ||
| } | ||
|
|
||
| void Game::shutdown() | ||
|
|
@@ -370,3 +358,46 @@ template <typename MQType, typename Visitor> void Game::LoopMain(GameContext &co | |
| // @todo: Call shutdown() here in a safe way | ||
| } | ||
| } | ||
|
|
||
| void gameLoop(void* arg_) | ||
|
There was a problem hiding this comment. It's good that you were able to get it to work this way. However I don't think this is the right solution. If Emscripten truly doesn't support multithreading then we can try using coroutines instead. For now, this is a good starting point There was a problem hiding this comment. i was sure you wouldn't be happy with this solution. (Because i'm not too) According to the documentation: https://emscripten.org/docs/porting/emscripten-runtime-environment.html#browser-main-loop it seems to be the only way to do this. |
||
| // void gameLoop(Engine &engine, EventManager &evManager, UIManager &uiManager) | ||
| { | ||
|
|
||
| loop_arg* arg = (loop_arg*)arg_; | ||
| #ifdef MICROPROFILE_ENABLED | ||
| MICROPROFILE_SCOPEI("Map", "Gameloop", MP_GREEN); | ||
| #endif | ||
| SDL_RenderClear(WindowManager::instance().getRenderer()); | ||
| SDL_Event event; | ||
| arg->evManager->checkEvents(event, *arg->engine); | ||
|
|
||
| // render the tileMap | ||
| if (arg->engine->map != nullptr) | ||
| arg->engine->map->renderMap(); | ||
|
|
||
| // render the ui | ||
| arg->uiManager->drawUI(); | ||
|
|
||
| // reset renderer color back to black | ||
| SDL_SetRenderDrawColor(WindowManager::instance().getRenderer(), 0, 0, 0, SDL_ALPHA_OPAQUE); | ||
|
|
||
| // Render the Frame | ||
| SDL_RenderPresent(WindowManager::instance().getRenderer()); | ||
|
|
||
| fpsFrames++; | ||
|
|
||
| if (fpsLastTime < SDL_GetTicks() - fpsIntervall * 1000) | ||
| { | ||
| fpsLastTime = SDL_GetTicks(); | ||
| arg->uiManager->setFPSCounterText(std::to_string(fpsFrames) + " FPS"); | ||
| fpsFrames = 0; | ||
| } | ||
|
|
||
| #ifndef __EMSCRIPTEN__ | ||
| SDL_Delay(1); | ||
| #endif | ||
|
|
||
| #ifdef MICROPROFILE_ENABLED | ||
| MicroProfileFlip(nullptr); | ||
| #endif | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,7 +56,7 @@ void EventManager::checkEvents(SDL_Event &event, Engine &engine) | |
|
|
||
| case SDLK_0: | ||
| break; | ||
| case SDLK_m: | ||
| m_uiManager.toggleDebugMenu(); | ||
| break; | ||
| case SDLK_1: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,8 +4,10 @@ | |
| #include "Exception.hxx" | ||
| #include "LOG.hxx" | ||
|
|
||
| #ifndef __EMSCRIPTEN__ | ||
| #include <signal.h> | ||
| void SIG_handler(int signal); | ||
| #endif | ||
|
|
||
| SDL_AssertState AssertionHandler(const SDL_AssertData *, void *); | ||
|
|
||
|
|
@@ -24,6 +26,10 @@ int protected_main(int argc, char **argv) | |
| skipMenu = true; | ||
| } | ||
| } | ||
|
|
||
| #ifdef __EMSCRIPTEN__ | ||
| skipMenu = true; | ||
| #endif | ||
|
|
||
| LOG(LOG_DEBUG) << "Launching Cytopia"; | ||
|
|
||
|
|
@@ -52,11 +58,12 @@ int protected_main(int argc, char **argv) | |
| int main(int argc, char **argv) | ||
| { | ||
|
|
||
| #ifndef __EMSCRIPTEN__ | ||
| /* Register handler for Segmentation Fault, Interrupt, Terminate */ | ||
| signal(SIGSEGV, SIG_handler); | ||
| signal(SIGINT, SIG_handler); | ||
| signal(SIGTERM, SIG_handler); | ||
| #endif | ||
| /* All SDL2 Assertion failures must be handled | ||
| * by our handler */ | ||
| SDL_SetAssertionHandler(AssertionHandler, 0); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -42,12 +42,14 @@ void SIG_handler(int signal) | |||
| exit(1); | ||||
| } | ||||
|
|
||||
| // #else | ||||
|
There was a problem hiding this comment. I think you should remove this comment
Suggested change
|
||||
| #elif __unix__ && !__EMSCRIPTEN__ | ||||
|
|
||||
| #include <unistd.h> | ||||
| #include <signal.h> | ||||
|
|
||||
| #include <execinfo.h> | ||||
|
|
||||
| void SIG_handler(int signal) | ||||
| { | ||||
| switch (signal) | ||||
|
|
@@ -93,7 +95,7 @@ SDL_AssertState AssertionHandler(const SDL_AssertData *data, void *) | |||
| SYMBOL_INFO symbol; | ||||
| for (int i = 0; i < size; ++i) | ||||
| std::cout << "\tat " << symbol.Name << "\n"; | ||||
| #elif __unix__ && !__EMSCRIPTEN__ | ||||
| /* We print the last 10 calls */ | ||||
| void *buffer[10]; | ||||
| size_t size; | ||||
|
|
||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
I'm not sure this is good practice...
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.
The hash is likely to change... We should use the proper conan way to do this
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.
You're right about both, but i don't know how to do this with conan. Maybe @AnotherFoxGuy could help us out here?