From 3d1777a83996330d2fa482abeeddf94d08bd91e1 Mon Sep 17 00:00:00 2001 From: jiepengtan Date: Thu, 12 Sep 2024 18:36:38 +0800 Subject: [PATCH] Feat: skip js warp when not use go wasm --- platform/web/js/libs/library_godot_display.js | 6 +++++- platform/web/os_web.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/web/js/libs/library_godot_display.js b/platform/web/js/libs/library_godot_display.js index 62c7e6e54f34..bee0b9cd6fbf 100644 --- a/platform/web/js/libs/library_godot_display.js +++ b/platform/web/js/libs/library_godot_display.js @@ -801,7 +801,11 @@ const GodotDisplay = { godot_js_on_load_gdextension__sig: 'viii', godot_js_on_load_gdextension : function (p_name, p_get_proc_address, p_library, r_initialization) { const text = GodotRuntime.parseString(p_name); - console.log("C++ called JavaScript function godot_js_on_load_gdextension", p_name); + if ("goWasmInit" !== text) { + console.log("not go wasm environment, just skip ", text); + return; + } + console.log("C++ called JavaScript function godot_js_on_load_gdextension", text); }, }; diff --git a/platform/web/os_web.cpp b/platform/web/os_web.cpp index 979e95eb1a13..cfb3c60fe571 100644 --- a/platform/web/os_web.cpp +++ b/platform/web/os_web.cpp @@ -255,7 +255,7 @@ bool OS_Web::indirect_call_dynamic_library(const String p_name, void* p_get_proc print_line("indirect_call_dynamic_library ",p_name); CharString string = p_name.utf8(); godot_js_on_load_gdextension(string.get_data(), p_get_proc_address, p_library, r_initialization); - return true; + return p_name == "goWasmInit"; } OS_Web *OS_Web::get_singleton() {