Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 00:13:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor canvas ID and locale handling.

Browse source
This commit is contained in:
Fabio Alessandrelli 2020-06-30 18:52:41 +02:00
parent 5b1cc2d1fc
commit fd92270b0a
4 changed files with 45 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

22
platform/javascript/javascript_main.cpp
View file

@ -30,7 +30,8 @@
#include "core/io/resource_loader.h"
#include "main/main.h"
#include "os_javascript.h"
#include "platform/javascript/display_server_javascript.h"
#include "platform/javascript/os_javascript.h"
#include <emscripten/emscripten.h>
@ -79,10 +80,10 @@ extern "C" EMSCRIPTEN_KEEPALIVE void main_after_fs_sync(char *p_idbfs_err) {
ResourceLoader::set_abort_on_missing_resources(false);
Main::start();
os->get_main_loop()->init();
emscripten_resume_main_loop();
// Immediately run the first iteration.
// We are inside an animation frame, we want to immediately draw on the newly setup canvas.
main_loop_callback();
emscripten_resume_main_loop();
}
int main(int argc, char *argv[]) {
@ -91,6 +92,23 @@ int main(int argc, char *argv[]) {
FS.mkdir('/userfs');
FS.mount(IDBFS, {}, '/userfs');
});
// Configure locale.
char locale_ptr[16];
/* clang-format off */
EM_ASM({
stringToUTF8(Module['locale'], $0, 16);
}, locale_ptr);
/* clang-format on */
setenv("LANG", locale_ptr, true);
// Ensure the canvas ID.
/* clang-format off */
EM_ASM({
stringToUTF8("#" + Module['canvas'].id, $0, 255);
}, DisplayServerJavaScript::canvas_id);
/* clang-format on */
os = new OS_JavaScript();
Main::setup(argv[0], argc - 1, &argv[1], false);
emscripten_set_main_loop(main_loop_callback, -1, false);