asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #92261 from bruvzg/js_tts_init3

Browse source 
[3.x, Web] Fix TTS configuration loaded too early.
This commit is contained in:
lawnjelly 2024-05-22 19:51:46 +01:00 committed by GitHub
commit 83f5407177
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platform/javascript/os_javascript.cpp
View file

@ -779,6 +779,8 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver,
swap_ok_cancel = godot_js_display_is_swap_ok_cancel() == 1; swap_ok_cancel = godot_js_display_is_swap_ok_cancel() == 1;
tts = GLOBAL_GET("audio/general/text_to_speech");
EmscriptenWebGLContextAttributes attributes; EmscriptenWebGLContextAttributes attributes;
emscripten_webgl_init_context_attributes(&attributes); emscripten_webgl_init_context_attributes(&attributes);
attributes.alpha = GLOBAL_GET("display/window/per_pixel_transparency/allowed"); attributes.alpha = GLOBAL_GET("display/window/per_pixel_transparency/allowed");
@ -1179,8 +1181,6 @@ OS_JavaScript *OS_JavaScript::get_singleton() {
} }
OS_JavaScript::OS_JavaScript() { OS_JavaScript::OS_JavaScript() {
tts = GLOBAL_GET("audio/general/text_to_speech");
// Expose method for requesting quit. // Expose method for requesting quit.
godot_js_os_request_quit_cb(&request_quit_callback); godot_js_os_request_quit_cb(&request_quit_callback);
// Set canvas ID // Set canvas ID
@ -1198,6 +1198,7 @@ OS_JavaScript::OS_JavaScript() {
main_loop = NULL; main_loop = NULL;
visual_server = NULL; visual_server = NULL;
tts = false;
swap_ok_cancel = false; swap_ok_cancel = false;
idb_available = godot_js_os_fs_is_persistent() != 0; idb_available = godot_js_os_fs_is_persistent() != 0;
idb_needs_sync = false; idb_needs_sync = false;