From 034515190cf328d8abbb93ddb378fb30d74c8e7f Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 5 Jul 2022 19:45:59 +0100 Subject: [PATCH] A few more wasm tweaks Signed-off-by: falkTX --- plugins/Cardinal/src/ImGuiWidget.cpp | 3 + src/Makefile.cardinal.mk | 3 +- src/emscripten/shell.html | 140 +++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 src/emscripten/shell.html diff --git a/plugins/Cardinal/src/ImGuiWidget.cpp b/plugins/Cardinal/src/ImGuiWidget.cpp index 65d129b..64e8848 100644 --- a/plugins/Cardinal/src/ImGuiWidget.cpp +++ b/plugins/Cardinal/src/ImGuiWidget.cpp @@ -504,4 +504,7 @@ void ImGuiWidget::drawFramebufferCommon(const Vec& fbSize, const float scaleFact ImGui_ImplOpenGL2_RenderDrawData(data); #endif } + + // FIXME + io.KeysDown[GLFW_KEY_DELETE] = io.KeysDown[GLFW_KEY_BACKSPACE] = io.KeysDown[GLFW_KEY_ENTER] = false; } diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 90d1e64..6acf199 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -205,7 +205,8 @@ BASE_FLAGS += -Wno-unused-variable # extra linker flags ifeq ($(WASM),true) -LINK_FLAGS += --preload-file=./resources -sALLOW_MEMORY_GROWTH +LINK_FLAGS += --preload-file=./resources -sALLOW_MEMORY_GROWTH -sINITIAL_MEMORY=32Mb -sLZ4=1 --shell-file=../emscripten/shell.html +# -sDISABLE_EXCEPTION_CATCHING=1 else ifeq ($(HAIKU),true) LINK_FLAGS += -lpthread else diff --git a/src/emscripten/shell.html b/src/emscripten/shell.html new file mode 100644 index 0000000..f3d8947 --- /dev/null +++ b/src/emscripten/shell.html @@ -0,0 +1,140 @@ + + + + + + Cardinal Synth + + + +
+ +
Cardinal
+
+
Downloading...
+
+ +
+
+ +
+ + + {{{ SCRIPT }}} + +