diff --git a/.gitignore b/.gitignore index 48aed118..1d09522c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ *.sublime* -/docs/*.d.ts /target diff --git a/build.sh b/build.sh index 023e9e8a..3c80f6cd 100755 --- a/build.sh +++ b/build.sh @@ -7,16 +7,10 @@ if ! [[ $(wasm-bindgen --version) ]]; then cargo install -f wasm-bindgen-cli fi -if ! [[ -f docs/webassembly.d.ts ]]; then - curl https://raw.githubusercontent.com/01alchemist/webassembly-types/master/webassembly.d.ts > docs/webassembly.d.ts -fi - BUILD=debug # BUILD=release # Clear output from old stuff: -# rm -rf docs/*.d.ts -rm -rf docs/*.js rm -rf docs/*.wasm function build_rust @@ -28,15 +22,8 @@ function build_rust FOLDER_NAME=${PWD##*/} TARGET_NAME="emgui_wasm.wasm" wasm-bindgen "target/wasm32-unknown-unknown/$BUILD/$TARGET_NAME" \ - --out-dir docs --no-modules + --out-dir docs --no-modules --no-typescript # --no-modules-global hoboho } build_rust - -echo "Compile typescript:" -tsc - -# wait || exit $? - -# 3.4 s diff --git a/docs/emgui_wasm_bg.wasm b/docs/emgui_wasm_bg.wasm index 4aa49673..e9e901a6 100644 Binary files a/docs/emgui_wasm_bg.wasm and b/docs/emgui_wasm_bg.wasm differ diff --git a/docs/frontend.js b/docs/frontend.js deleted file mode 100644 index 9e92e013..00000000 --- a/docs/frontend.js +++ /dev/null @@ -1,86 +0,0 @@ -// we'll defer our execution until the wasm is ready to go -function wasm_loaded() { - console.log("wasm loaded"); - initialize(); -} -// here we tell bindgen the path to the wasm file so it can start -// initialization and return to us a promise when it's done -wasm_bindgen("./emgui_wasm_bg.wasm") - .then(wasm_loaded)["catch"](console.error); -// ---------------------------------------------------------------------------- -var g_webgl_painter = null; -function paint_gui(canvas, input) { - if (g_webgl_painter === null) { - g_webgl_painter = wasm_bindgen.new_webgl_painter("canvas"); - } - wasm_bindgen.paint_webgl(g_webgl_painter, JSON.stringify(input)); -} -// ---------------------------------------------------------------------------- -var g_mouse_pos = { x: -1000.0, y: -1000.0 }; -var g_mouse_down = false; -function auto_resize_canvas(canvas) { - if (true) { - canvas.setAttribute("width", window.innerWidth); - canvas.setAttribute("height", window.innerHeight); - } - else { - // TODO: this stuff - var pixels_per_point = window.devicePixelRatio || 1; - var ctx = canvas.getContext("2d"); - ctx.scale(pixels_per_point, pixels_per_point); - canvas.setAttribute("width", window.innerWidth * pixels_per_point); - canvas.setAttribute("height", window.innerHeight * pixels_per_point); - } -} -function get_input(canvas) { - return { - mouse_down: g_mouse_down, - mouse_pos: g_mouse_pos, - screen_size: { x: canvas.width, y: canvas.height } - }; -} -function mouse_pos_from_event(canvas, event) { - var rect = canvas.getBoundingClientRect(); - return { - x: event.clientX - rect.left, - y: event.clientY - rect.top - }; -} -function initialize() { - console.log("window.devicePixelRatio: " + window.devicePixelRatio); - var canvas = document.getElementById("canvas"); - auto_resize_canvas(canvas); - var repaint = function () { return paint_gui(canvas, get_input(canvas)); }; - canvas.addEventListener("mousemove", function (event) { - g_mouse_pos = mouse_pos_from_event(canvas, event); - repaint(); - event.stopPropagation(); - event.preventDefault(); - }); - canvas.addEventListener("mouseleave", function (event) { - g_mouse_pos = { x: -1000.0, y: -1000.0 }; - repaint(); - event.stopPropagation(); - event.preventDefault(); - }); - canvas.addEventListener("mousedown", function (event) { - g_mouse_pos = mouse_pos_from_event(canvas, event); - g_mouse_down = true; - repaint(); - event.stopPropagation(); - event.preventDefault(); - }); - canvas.addEventListener("mouseup", function (event) { - g_mouse_pos = mouse_pos_from_event(canvas, event); - g_mouse_down = false; - repaint(); - event.stopPropagation(); - event.preventDefault(); - }); - window.addEventListener("load", repaint); - window.addEventListener("pagehide", repaint); - window.addEventListener("pageshow", repaint); - window.addEventListener("resize", repaint); - // setInterval(repaint, 16); - repaint(); -} diff --git a/docs/frontend.ts b/docs/frontend.ts deleted file mode 100644 index 09fe4ccc..00000000 --- a/docs/frontend.ts +++ /dev/null @@ -1,128 +0,0 @@ -interface Vec2 { - x: number; - y: number; -} - -/// What the integration gives to the gui. -interface RawInput { - /// Is the button currently down? - mouse_down: boolean; - - /// Current position of the mouse in points. - mouse_pos: Vec2; - - /// Size of the screen in points. - screen_size: Vec2; -} - -// ---------------------------------------------------------------------------- - -// the `wasm_bindgen` global is set to the exports of the Rust module. Override with wasm-bindgen --no-modules-global -declare var wasm_bindgen: any; - -// we'll defer our execution until the wasm is ready to go -function wasm_loaded() { - console.log(`wasm loaded`); - initialize(); -} - -// here we tell bindgen the path to the wasm file so it can start -// initialization and return to us a promise when it's done -wasm_bindgen("./emgui_wasm_bg.wasm") - .then(wasm_loaded) - .catch(console.error); - -// ---------------------------------------------------------------------------- - -let g_webgl_painter = null; - -function paint_gui(canvas, input: RawInput) { - if (g_webgl_painter === null) { - g_webgl_painter = wasm_bindgen.new_webgl_painter("canvas"); - } - wasm_bindgen.paint_webgl(g_webgl_painter, JSON.stringify(input)); -} - -// ---------------------------------------------------------------------------- - -let g_mouse_pos = { x: -1000.0, y: -1000.0 }; -let g_mouse_down = false; - -function auto_resize_canvas(canvas) { - if (true) { - canvas.setAttribute("width", window.innerWidth); - canvas.setAttribute("height", window.innerHeight); - } else { - // TODO: this stuff - const pixels_per_point = window.devicePixelRatio || 1; - - const ctx = canvas.getContext("2d"); - ctx.scale(pixels_per_point, pixels_per_point); - - canvas.setAttribute("width", window.innerWidth * pixels_per_point); - canvas.setAttribute("height", window.innerHeight * pixels_per_point); - } -} - -function get_input(canvas): RawInput { - return { - mouse_down: g_mouse_down, - mouse_pos: g_mouse_pos, - screen_size: { x: canvas.width, y: canvas.height }, - }; -} - -function mouse_pos_from_event(canvas, event): Vec2 { - const rect = canvas.getBoundingClientRect(); - return { - x: event.clientX - rect.left, - y: event.clientY - rect.top, - }; -} - -function initialize() { - console.log(`window.devicePixelRatio: ${window.devicePixelRatio}`); - - const canvas = document.getElementById("canvas"); - auto_resize_canvas(canvas); - const repaint = () => paint_gui(canvas, get_input(canvas)); - - canvas.addEventListener("mousemove", event => { - g_mouse_pos = mouse_pos_from_event(canvas, event); - repaint(); - event.stopPropagation(); - event.preventDefault(); - }); - - canvas.addEventListener("mouseleave", event => { - g_mouse_pos = { x: -1000.0, y: -1000.0 }; - repaint(); - event.stopPropagation(); - event.preventDefault(); - }); - - canvas.addEventListener("mousedown", event => { - g_mouse_pos = mouse_pos_from_event(canvas, event); - g_mouse_down = true; - repaint(); - event.stopPropagation(); - event.preventDefault(); - }); - - canvas.addEventListener("mouseup", event => { - g_mouse_pos = mouse_pos_from_event(canvas, event); - g_mouse_down = false; - repaint(); - event.stopPropagation(); - event.preventDefault(); - }); - - window.addEventListener("load", repaint); - window.addEventListener("pagehide", repaint); - window.addEventListener("pageshow", repaint); - window.addEventListener("resize", repaint); - - // setInterval(repaint, 16); - - repaint(); -} diff --git a/docs/index.html b/docs/index.html index 27cc38ec..18f2d6b4 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,42 +1,136 @@ - -
-