twiddlingbits · JohnDog3112 · Nov 16, 2024 · Nov 16, 2024 · Nov 23, 2024 · Nov 23, 2024
diff --git a/examples/pong/entry-point.cpp b/examples/pong/entry-point.cpp
@@ -11,39 +11,44 @@ static int ANIMATION_LOOP_EVENT_ID = -1;
 static int KEY_DOWN_EVENT_ID = -1;
 static int KEY_UP_EVENT_ID = -1;
 extern "C" {
-   __attribute__((import_name("registerKeyUpEvent")))
-   void register_key_up_event(int event_id);
+   // __attribute__((import_name("registerKeyUpEvent")))
+   // void register_key_up_event(int event_id);
 
-   __attribute__((import_name("registerKeyDownEvent")))
-   void register_key_down_event(int event_id);
+   // __attribute__((import_name("registerKeyDownEvent")))
+   // void register_key_down_event(int event_id);
 
-   __attribute__((import_name("registerAnimationLoop")))
-   void register_animation_loop(int event_id);
+   // __attribute__((import_name("registerAnimationLoop")))
+   // void register_animation_loop(int event_id);
 
-   __attribute__((import_name("registerMouseMoveEvent")))
-   void register_mouse_move_event(int event_id, const char* element_id, bool relative);
+   // __attribute__((import_name("registerMouseMoveEvent")))
+   // void register_mouse_move_event(int event_id, const char* element_id, bool relative);
 
-   __attribute__((import_name("registerMousePressEvent")))
-   void register_mouse_press_event(int event_id, const char* element_id, bool relative);
+   // __attribute__((import_name("registerMousePressEvent")))
+   // void register_mouse_press_event(int event_id, const char* element_id, bool relative);
 
 
 
    __attribute__((export_name("initMenu")))
    void init_menu() {
       MOUSE_MOVE_EVENT_ID = twr_register_callback("menuMouseMoveCallback");
-      register_mouse_move_event(MOUSE_MOVE_EVENT_ID, "twr_d2dcanvas", true);
+      // register_mouse_move_event(MOUSE_MOVE_EVENT_ID, "twr_d2dcanvas", true);
+      d2d_register_event(D2D_MOUSE_MOVE, MOUSE_MOVE_EVENT_ID);
 
       MOUSE_PRESS_EVENT_ID = twr_register_callback("menuMousePressCallback");
-      register_mouse_press_event(MOUSE_PRESS_EVENT_ID, "twr_d2dcanvas", true);
+      // register_mouse_press_event(MOUSE_PRESS_EVENT_ID, "twr_d2dcanvas", true);
+      d2d_register_event(D2D_MOUSE_DOWN, MOUSE_PRESS_EVENT_ID);
 
       ANIMATION_LOOP_EVENT_ID = twr_register_callback("menuAnimationLoopCallback");
-      register_animation_loop(ANIMATION_LOOP_EVENT_ID);
+      // register_animation_loop(ANIMATION_LOOP_EVENT_ID);
+      d2d_register_event(D2D_ANIMATION_FRAME, ANIMATION_LOOP_EVENT_ID);
 
       KEY_DOWN_EVENT_ID = twr_register_callback("menuKeyDownCallback");
-      register_key_down_event(KEY_DOWN_EVENT_ID);
+      // register_key_down_event(KEY_DOWN_EVENT_ID);
+      d2d_register_event(D2D_KEY_DOWN, KEY_DOWN_EVENT_ID);
 
       KEY_UP_EVENT_ID = twr_register_callback("menuKeyUpCallback");
-      register_key_up_event(KEY_UP_EVENT_ID);
+      // register_key_up_event(KEY_UP_EVENT_ID);
+      d2d_register_event(D2D_KEY_UP, KEY_UP_EVENT_ID);
 
       menu.setBounds(d2d_get_canvas_prop("canvasWidth"), d2d_get_canvas_prop("canvasHeight"));
    }

diff --git a/examples/pong/index.html b/examples/pong/index.html
@@ -12,7 +12,7 @@
         </script>
     </head>
     <body>
-        <canvas id="twr_d2dcanvas" width="900" height="600"></canvas><br>
+        <canvas id="twr_d2dcanvas" width="900" height="600" tabindex="1"></canvas><br>
         <a id="control_text"></a>
 
         <script type="module">

diff --git a/examples/window/Makefile b/examples/window/Makefile
@@ -0,0 +1,30 @@
+CC := clang
+TWRCFLAGS := --target=wasm32 -nostdinc -nostdlib -isystem  ../../include
+CPPLIB := ../twr-cpp
+CFLAGS := -c -Wall -O3 $(TWRCFLAGS) -I $(CPPLIB)
+CFLAGS_DEBUG := -c -Wall -g -O0  $(TWRCFLAGS) -I $(CPPLIB)
+
+$(info $(shell mkdir -p out))
+
+.PHONY: default
+
+default: window.wasm window-a.wasm
+
+window.o: window.c
+	$(CC) $(CFLAGS)  $< -o $@
+
+window-a.o: window.c
+	$(CC) $(CFLAGS)  $< -o $@ -DASYNC
+
+window.wasm: window.o
+	wasm-ld  window.o ../../lib-c/twr.a -o window.wasm \
+		--no-entry --initial-memory=4063232 --max-memory=4063232 \
+
+window-a.wasm: window-a.o
+	wasm-ld window-a.o ../../lib-c/twr.a -o window-a.wasm \
+		--no-entry --shared-memory --no-check-features --initial-memory=4063232 --max-memory=4063232 \
+
+clean:
+	rm -f *.o
+	rm -f *.wasm
+	rm -f out/*
diff --git a/examples/window/index.html b/examples/window/index.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Audio Tests</title>
+
+        <script type="importmap">
+            {
+                "imports": {
+                    "twr-wasm": "../../lib-js/index.js"
+                }
+            }
+        </script>
+    </head>
+    <body>
+         <div id="window-resizable-div" style="resize:both;overflow:hidden;width:640px;height:480px;min-width:200px;min-height:200px;">
+            <canvas id="window" width="640px" height="480px" tabindex="1"></canvas>
+         </div>
+
+         <script type="module">
+            "use strict";
+
+            import {twrWasmModule, twrWasmModuleAsync, twrConsoleWindow} from "twr-wasm";
+
+            const is_async = window.location.hash=="#async";
+
+            const modCon = is_async ? twrWasmModuleAsync : twrWasmModule;
+
+            const windowCanvas = document.getElementById("window");
+            if (windowCanvas == undefined) throw new Error(`Window example: Couldn't find window canvas!`);
+            const windowConsole = new twrConsoleWindow(windowCanvas);
+            const mod = new modCon({io:{
+               window: windowConsole,
+            }});
+            await mod.loadWasm(is_async ? "./window-a.wasm" : "./window.wasm");
+
+            await mod.callC(["init"]);
+
+            const windowDiv = document.getElementById("window-resizable-div");
+            if (windowDiv == undefined) throw new Error(`Window example: couldn't find window canvas div!`);
+            // window.windowConsole = windowConsole;
+            let prevDivWidth = windowDiv.clientWidth;
+            let prevDivHeight = windowDiv.clientHeight;
+            let resizeObserver = new ResizeObserver(() => {
+               const width = windowDiv.clientWidth;
+               const height = windowDiv.clientHeight;
+               if (width != prevDivWidth || height != prevDivHeight) {
+                  prevDivWidth = width;
+                  prevDivHeight = height;
+                  console.log(`resizing: ${width}, ${height}`);
+                  windowConsole.resizeWindow(width, height);
+               }
+            });
+            resizeObserver.observe(windowDiv);
+         </script>
+    </body>
+</html>
diff --git a/examples/window/package.json b/examples/window/package.json
@@ -0,0 +1,11 @@
+{
+   "@parcel/resolver-default": {
+        "packageExports": true
+   },
+   "alias": {
+        "twr-wasm": "../../lib-js/index.js"
+   },
+   "dependencies": {
+        "twr-wasm": "^2.0.0"
+   }
+}