diff --git a/Cargo.lock b/Cargo.lock index a18a3e2..8abe4f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "ab_glyph" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +checksum = "8e08104bebc65a46f8bc7aa733d39ea6874bfa7156f41a46b805785e3af1587d" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -197,9 +197,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "base64" @@ -233,7 +233,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -366,9 +366,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "1fd97381a8cc6493395a5afc4c691c1084b3768db713b73aa215217aa245d153" dependencies = [ "jobserver", "libc", @@ -423,9 +423,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -440,19 +440,19 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -543,9 +543,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -718,9 +718,9 @@ dependencies = [ [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "editor" @@ -864,7 +864,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -939,7 +939,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -984,7 +984,7 @@ dependencies = [ [[package]] name = "fyrox" version = "0.33.1" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "fyrox-impl", ] @@ -992,7 +992,7 @@ dependencies = [ [[package]] name = "fyrox-animation" version = "0.1.0" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "fxhash", "fyrox-core", @@ -1004,7 +1004,7 @@ dependencies = [ [[package]] name = "fyrox-core" version = "0.27.0" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "android-activity", "arrayvec", @@ -1015,7 +1015,7 @@ dependencies = [ "futures", "fxhash", "fyrox-core-derive", - "fyrox-math 0.1.0 (git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd)", + "fyrox-math 0.1.0 (git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70)", "instant", "js-sys", "lazy_static", @@ -1036,7 +1036,7 @@ dependencies = [ [[package]] name = "fyrox-core-derive" version = "0.22.0" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "convert_case", "darling", @@ -1049,7 +1049,7 @@ dependencies = [ [[package]] name = "fyrox-graph" version = "0.1.0" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "fxhash", "fyrox-core", @@ -1059,7 +1059,7 @@ dependencies = [ [[package]] name = "fyrox-impl" version = "0.33.1" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "base64", "bitflags 2.5.0", @@ -1090,6 +1090,7 @@ dependencies = [ "rayon", "ron", "serde", + "serde-wasm-bindgen", "strum", "strum_macros", "tbc", @@ -1114,7 +1115,7 @@ dependencies = [ [[package]] name = "fyrox-math" version = "0.1.0" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "arrayvec", "nalgebra", @@ -1126,7 +1127,7 @@ dependencies = [ [[package]] name = "fyrox-resource" version = "0.11.0" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "fxhash", "fyrox-core", @@ -1139,7 +1140,7 @@ dependencies = [ [[package]] name = "fyrox-sound" version = "0.34.0" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "fyrox-core", "fyrox-resource", @@ -1156,7 +1157,7 @@ dependencies = [ [[package]] name = "fyrox-ui" version = "0.24.0" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "copypasta", "fontdue", @@ -1176,7 +1177,7 @@ dependencies = [ [[package]] name = "fyroxed_base" version = "0.20.1" -source = "git+https://github.com/FyroxEngine/Fyrox?rev=7c5aacd#7c5aacd46834512dd7d3c71a6d340f6db013a51f" +source = "git+https://github.com/FyroxEngine/Fyrox?rev=7de5a3107da2dfab180fd23f4c79b2542b466d70#7de5a3107da2dfab180fd23f4c79b2542b466d70" dependencies = [ "cargo_metadata", "fyrox", @@ -1203,9 +1204,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" dependencies = [ "cfg-if", "js-sys", @@ -1320,9 +1321,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1487,9 +1488,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -1685,9 +1686,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -1700,9 +1701,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1737,9 +1738,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.4" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4541eb06dce09c0241ebbaab7102f0a01a0c8994afed2e5d0d66775016e25ac2" +checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef" dependencies = [ "approx", "matrixmultiply", @@ -1850,7 +1851,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -1911,7 +1912,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -2094,9 +2095,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2368,9 +2369,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "robust" @@ -2444,9 +2445,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" @@ -2515,6 +2516,17 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + [[package]] name = "serde_derive" version = "1.0.197" @@ -2523,14 +2535,14 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -2678,9 +2690,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -2698,7 +2710,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -2714,9 +2726,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -2761,7 +2773,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] [[package]] @@ -2997,7 +3009,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -3031,7 +3043,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3553,9 +3565,9 @@ checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "zerocopy" @@ -3574,5 +3586,5 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.58", ] diff --git a/Cargo.toml b/Cargo.toml index 0dc847f..1089d0d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,11 +5,11 @@ resolver = "2" [workspace.dependencies.fyrox] git = "https://github.com/FyroxEngine/Fyrox" -rev = "7c5aacd" +rev = "7de5a3107da2dfab180fd23f4c79b2542b466d70" [workspace.dependencies.fyroxed_base] git = "https://github.com/FyroxEngine/Fyrox" -rev = "7c5aacd" +rev = "7de5a3107da2dfab180fd23f4c79b2542b466d70" # Optimize the engine in debug builds, but leave project's code non-optimized. # By using this technique, you can still debug you code, but engine will be fully diff --git a/executor-wasm/pkg/executor_wasm.d.ts b/executor-wasm/pkg/executor_wasm.d.ts index 05cdd83..04b822a 100644 --- a/executor-wasm/pkg/executor_wasm.d.ts +++ b/executor-wasm/pkg/executor_wasm.d.ts @@ -12,13 +12,13 @@ export interface InitOutput { readonly __wbindgen_malloc: (a: number, b: number) => number; readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; readonly __wbindgen_export_2: WebAssembly.Table; - readonly wasm_bindgen__convert__closures__invoke1_mut__h0cf0487b290ee515: (a: number, b: number, c: number) => void; - readonly wasm_bindgen__convert__closures__invoke2_mut__h1e72dedd4c45cc2a: (a: number, b: number, c: number, d: number) => void; - readonly wasm_bindgen__convert__closures__invoke0_mut__ha79470fcd860256d: (a: number, b: number) => void; - readonly wasm_bindgen__convert__closures__invoke0_mut__h1766ce1cfdba25b3: (a: number, b: number) => void; - readonly wasm_bindgen__convert__closures__invoke1_mut__h05c77783bcb49ea5: (a: number, b: number, c: number) => void; - readonly wasm_bindgen__convert__closures__invoke0_mut__h2bdf352ddaf30b28: (a: number, b: number) => void; - readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h22a129863ce3f604: (a: number, b: number, c: number) => void; + readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2ac5caa64f614f2e: (a: number, b: number, c: number) => void; + readonly _dyn_core__ops__function__FnMut__A_B___Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc170cf40329e6731: (a: number, b: number, c: number, d: number) => void; + readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hfe38bb7ac4b6df42: (a: number, b: number) => void; + readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2cce366d7e1ef568: (a: number, b: number) => void; + readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf758f2f68df3f963: (a: number, b: number) => void; + readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h03c62e575fdfe974: (a: number, b: number, c: number) => void; + readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__ha401fff11c774e91: (a: number, b: number, c: number) => void; readonly __wbindgen_free: (a: number, b: number, c: number) => void; readonly __wbindgen_exn_store: (a: number) => void; } diff --git a/executor-wasm/pkg/executor_wasm.js b/executor-wasm/pkg/executor_wasm.js index 8f2a40d..a7a4e3b 100644 --- a/executor-wasm/pkg/executor_wasm.js +++ b/executor-wasm/pkg/executor_wasm.js @@ -21,15 +21,6 @@ function takeObject(idx) { return ret; } -function addHeapObject(obj) { - if (heap_next === heap.length) heap.push(heap.length + 1); - const idx = heap_next; - heap_next = heap[idx]; - - heap[idx] = obj; - return idx; -} - const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } ); if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); }; @@ -48,6 +39,37 @@ function getStringFromWasm0(ptr, len) { return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); } +function addHeapObject(obj) { + if (heap_next === heap.length) heap.push(heap.length + 1); + const idx = heap_next; + heap_next = heap[idx]; + + heap[idx] = obj; + return idx; +} + +function isLikeNone(x) { + return x === undefined || x === null; +} + +let cachedFloat64Memory0 = null; + +function getFloat64Memory0() { + if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) { + cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer); + } + return cachedFloat64Memory0; +} + +let cachedInt32Memory0 = null; + +function getInt32Memory0() { + if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) { + cachedInt32Memory0 = new Int32Array(wasm.memory.buffer); + } + return cachedInt32Memory0; +} + let WASM_VECTOR_LEN = 0; const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } ); @@ -104,28 +126,6 @@ function passStringToWasm0(arg, malloc, realloc) { return ptr; } -function isLikeNone(x) { - return x === undefined || x === null; -} - -let cachedInt32Memory0 = null; - -function getInt32Memory0() { - if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) { - cachedInt32Memory0 = new Int32Array(wasm.memory.buffer); - } - return cachedInt32Memory0; -} - -let cachedFloat64Memory0 = null; - -function getFloat64Memory0() { - if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) { - cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer); - } - return cachedFloat64Memory0; -} - function debugString(val) { // primitive types const type = typeof val; @@ -222,31 +222,31 @@ function makeMutClosure(arg0, arg1, dtor, f) { return real; } function __wbg_adapter_32(arg0, arg1, arg2) { - wasm.wasm_bindgen__convert__closures__invoke1_mut__h0cf0487b290ee515(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2ac5caa64f614f2e(arg0, arg1, addHeapObject(arg2)); } -function __wbg_adapter_35(arg0, arg1, arg2, arg3) { - wasm.wasm_bindgen__convert__closures__invoke2_mut__h1e72dedd4c45cc2a(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3)); +function __wbg_adapter_37(arg0, arg1, arg2, arg3) { + wasm._dyn_core__ops__function__FnMut__A_B___Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc170cf40329e6731(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3)); } -function __wbg_adapter_38(arg0, arg1) { - wasm.wasm_bindgen__convert__closures__invoke0_mut__ha79470fcd860256d(arg0, arg1); +function __wbg_adapter_42(arg0, arg1) { + wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hfe38bb7ac4b6df42(arg0, arg1); } function __wbg_adapter_49(arg0, arg1) { - wasm.wasm_bindgen__convert__closures__invoke0_mut__h1766ce1cfdba25b3(arg0, arg1); + wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2cce366d7e1ef568(arg0, arg1); } -function __wbg_adapter_52(arg0, arg1, arg2) { - wasm.wasm_bindgen__convert__closures__invoke1_mut__h05c77783bcb49ea5(arg0, arg1, addHeapObject(arg2)); +function __wbg_adapter_52(arg0, arg1) { + wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf758f2f68df3f963(arg0, arg1); } -function __wbg_adapter_57(arg0, arg1) { - wasm.wasm_bindgen__convert__closures__invoke0_mut__h2bdf352ddaf30b28(arg0, arg1); +function __wbg_adapter_55(arg0, arg1, arg2) { + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h03c62e575fdfe974(arg0, arg1, addHeapObject(arg2)); } function __wbg_adapter_68(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h22a129863ce3f604(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__ha401fff11c774e91(arg0, arg1, addHeapObject(arg2)); } /** @@ -255,6 +255,14 @@ export function main() { wasm.main(); } +function handleError(f, args) { + try { + return f.apply(this, args); + } catch (e) { + wasm.__wbindgen_exn_store(addHeapObject(e)); + } +} + let cachedFloat32Memory0 = null; function getFloat32Memory0() { @@ -288,14 +296,6 @@ function getArrayU32FromWasm0(ptr, len) { return getUint32Memory0().subarray(ptr / 4, ptr / 4 + len); } -function handleError(f, args) { - try { - return f.apply(this, args); - } catch (e) { - wasm.__wbindgen_exn_store(addHeapObject(e)); - } -} - async function __wbg_load(module, imports) { if (typeof Response === 'function' && module instanceof Response) { if (typeof WebAssembly.instantiateStreaming === 'function') { @@ -359,6 +359,14 @@ function __wbg_get_imports() { const ret = getObject(arg0) === undefined; return ret; }; + imports.wbg.__wbindgen_string_new = function(arg0, arg1) { + const ret = getStringFromWasm0(arg0, arg1); + return addHeapObject(ret); + }; + imports.wbg.__wbindgen_object_clone_ref = function(arg0) { + const ret = getObject(arg0); + return addHeapObject(ret); + }; imports.wbg.__wbindgen_cb_drop = function(arg0) { const obj = takeObject(arg0).original; if (obj.cnt-- == 1) { @@ -368,21 +376,10 @@ function __wbg_get_imports() { const ret = false; return ret; }; - imports.wbg.__wbindgen_object_clone_ref = function(arg0) { - const ret = getObject(arg0); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_string_new = function(arg0, arg1) { - const ret = getStringFromWasm0(arg0, arg1); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_string_get = function(arg0, arg1) { - const obj = getObject(arg1); - const ret = typeof(obj) === 'string' ? obj : undefined; - var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len1 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len1; - getInt32Memory0()[arg0 / 4 + 0] = ptr1; + imports.wbg.__wbindgen_is_object = function(arg0) { + const val = getObject(arg0); + const ret = typeof(val) === 'object' && val !== null; + return ret; }; imports.wbg.__wbindgen_boolean_get = function(arg0) { const v = getObject(arg0); @@ -395,10 +392,21 @@ function __wbg_get_imports() { getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret; getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret); }; + imports.wbg.__wbindgen_string_get = function(arg0, arg1) { + const obj = getObject(arg1); + const ret = typeof(obj) === 'string' ? obj : undefined; + var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len1 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len1; + getInt32Memory0()[arg0 / 4 + 0] = ptr1; + }; imports.wbg.__wbindgen_number_new = function(arg0) { const ret = arg0; return addHeapObject(ret); }; + imports.wbg.__wbg_set_f975102236d3c502 = function(arg0, arg1, arg2) { + getObject(arg0)[takeObject(arg1)] = takeObject(arg2); + }; imports.wbg.__wbg_offsetX_d08eda91526f22a2 = function(arg0) { const ret = getObject(arg0).offsetX; return ret; @@ -407,49 +415,49 @@ function __wbg_get_imports() { const ret = getObject(arg0).offsetY; return ret; }; - imports.wbg.__wbg_requestFullscreen_a851d70cb190396a = function(arg0) { - const ret = getObject(arg0).requestFullscreen; - return addHeapObject(ret); - }; - imports.wbg.__wbg_requestFullscreen_f4349fb8a7429cf9 = function(arg0) { - const ret = getObject(arg0).requestFullscreen(); - return addHeapObject(ret); - }; - imports.wbg.__wbg_onpointerrawupdate_e087759b4021ec00 = function(arg0) { - const ret = getObject(arg0).onpointerrawupdate; - return addHeapObject(ret); - }; - imports.wbg.__wbg_getCoalescedEvents_4665669d237be577 = function(arg0) { - const ret = getObject(arg0).getCoalescedEvents; + imports.wbg.__wbg_scheduler_8082c844a9cfc0df = function(arg0) { + const ret = getObject(arg0).scheduler; return addHeapObject(ret); }; imports.wbg.__wbg_scheduler_6932606c19435996 = function(arg0) { const ret = getObject(arg0).scheduler; return addHeapObject(ret); }; - imports.wbg.__wbg_scheduler_8082c844a9cfc0df = function(arg0) { - const ret = getObject(arg0).scheduler; + imports.wbg.__wbg_requestIdleCallback_081ddac93612a53e = function(arg0) { + const ret = getObject(arg0).requestIdleCallback; return addHeapObject(ret); }; imports.wbg.__wbg_postTask_4674878f9a603824 = function(arg0, arg1, arg2) { const ret = getObject(arg0).postTask(getObject(arg1), getObject(arg2)); return addHeapObject(ret); }; - imports.wbg.__wbg_requestIdleCallback_081ddac93612a53e = function(arg0) { - const ret = getObject(arg0).requestIdleCallback; + imports.wbg.__wbg_requestFullscreen_a851d70cb190396a = function(arg0) { + const ret = getObject(arg0).requestFullscreen; + return addHeapObject(ret); + }; + imports.wbg.__wbg_getCoalescedEvents_4665669d237be577 = function(arg0) { + const ret = getObject(arg0).getCoalescedEvents; + return addHeapObject(ret); + }; + imports.wbg.__wbg_onpointerrawupdate_e087759b4021ec00 = function(arg0) { + const ret = getObject(arg0).onpointerrawupdate; return addHeapObject(ret); }; imports.wbg.__wbg_Window_cc0273a5da2c36dc = function(arg0) { const ret = getObject(arg0).Window; return addHeapObject(ret); }; + imports.wbg.__wbg_webkitFullscreenElement_533c5f32e2ac8d0c = function(arg0) { + const ret = getObject(arg0).webkitFullscreenElement; + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }; imports.wbg.__wbg_prototype_8e5075a5dd95f801 = function() { const ret = ResizeObserverEntry.prototype; return addHeapObject(ret); }; - imports.wbg.__wbg_webkitFullscreenElement_533c5f32e2ac8d0c = function(arg0) { - const ret = getObject(arg0).webkitFullscreenElement; - return isLikeNone(ret) ? 0 : addHeapObject(ret); + imports.wbg.__wbg_requestFullscreen_f4349fb8a7429cf9 = function(arg0) { + const ret = getObject(arg0).requestFullscreen(); + return addHeapObject(ret); }; imports.wbg.__wbg_webkitRequestFullscreen_8abcfecec7127495 = function(arg0) { getObject(arg0).webkitRequestFullscreen(); @@ -465,6 +473,61 @@ function __wbg_get_imports() { imports.wbg.__wbg_log_6fe326b2dc7dddda = function(arg0, arg1) { console.log(getStringFromWasm0(arg0, arg1)); }; + imports.wbg.__wbg_instanceof_Window_f401953a2cf86220 = function(arg0) { + let result; + try { + result = getObject(arg0) instanceof Window; + } catch (_) { + result = false; + } + const ret = result; + return ret; + }; + imports.wbg.__wbg_document_5100775d18896c16 = function(arg0) { + const ret = getObject(arg0).document; + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }; + imports.wbg.__wbg_devicePixelRatio_efc553b59506f64c = function(arg0) { + const ret = getObject(arg0).devicePixelRatio; + return ret; + }; + imports.wbg.__wbg_cancelIdleCallback_3a36cf77475b492b = function(arg0, arg1) { + getObject(arg0).cancelIdleCallback(arg1 >>> 0); + }; + imports.wbg.__wbg_getComputedStyle_078292ffe423aded = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).getComputedStyle(getObject(arg1)); + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_matchMedia_66bb21e3ef19270c = function() { return handleError(function (arg0, arg1, arg2) { + const ret = getObject(arg0).matchMedia(getStringFromWasm0(arg1, arg2)); + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_requestIdleCallback_cee8e1d6bdcfae9e = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).requestIdleCallback(getObject(arg1)); + return ret; + }, arguments) }; + imports.wbg.__wbg_cancelAnimationFrame_111532f326e480af = function() { return handleError(function (arg0, arg1) { + getObject(arg0).cancelAnimationFrame(arg1); + }, arguments) }; + imports.wbg.__wbg_requestAnimationFrame_549258cfa66011f0 = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).requestAnimationFrame(getObject(arg1)); + return ret; + }, arguments) }; + imports.wbg.__wbg_clearTimeout_ba63ae54a36e111e = function(arg0, arg1) { + getObject(arg0).clearTimeout(arg1); + }; + imports.wbg.__wbg_fetch_5aed618e85a9cc28 = function(arg0, arg1, arg2) { + const ret = getObject(arg0).fetch(getStringFromWasm0(arg1, arg2)); + return addHeapObject(ret); + }; + imports.wbg.__wbg_setTimeout_d2b9a986d10a6182 = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).setTimeout(getObject(arg1)); + return ret; + }, arguments) }; + imports.wbg.__wbg_setTimeout_c172d5704ef82276 = function() { return handleError(function (arg0, arg1, arg2) { + const ret = getObject(arg0).setTimeout(getObject(arg1), arg2); + return ret; + }, arguments) }; imports.wbg.__wbg_instanceof_WebGl2RenderingContext_6b8f92d566ced9e1 = function(arg0) { let result; try { @@ -515,6 +578,12 @@ function __wbg_get_imports() { imports.wbg.__wbg_drawBuffers_6d32a0c370b9cb7f = function(arg0, arg1) { getObject(arg0).drawBuffers(getObject(arg1)); }; + imports.wbg.__wbg_readPixels_40ba392d7aaf6ac0 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) { + getObject(arg0).readPixels(arg1, arg2, arg3, arg4, arg5 >>> 0, arg6 >>> 0, getObject(arg7)); + }, arguments) }; + imports.wbg.__wbg_readPixels_db02ea1a888b611a = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) { + getObject(arg0).readPixels(arg1, arg2, arg3, arg4, arg5 >>> 0, arg6 >>> 0, arg7); + }, arguments) }; imports.wbg.__wbg_texImage2D_2558a70047650d54 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) { getObject(arg0).texImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, getObject(arg9)); }, arguments) }; @@ -745,61 +814,6 @@ function __wbg_get_imports() { imports.wbg.__wbg_viewport_7414e7e2a83afc72 = function(arg0, arg1, arg2, arg3, arg4) { getObject(arg0).viewport(arg1, arg2, arg3, arg4); }; - imports.wbg.__wbg_instanceof_Window_f401953a2cf86220 = function(arg0) { - let result; - try { - result = getObject(arg0) instanceof Window; - } catch (_) { - result = false; - } - const ret = result; - return ret; - }; - imports.wbg.__wbg_document_5100775d18896c16 = function(arg0) { - const ret = getObject(arg0).document; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_devicePixelRatio_efc553b59506f64c = function(arg0) { - const ret = getObject(arg0).devicePixelRatio; - return ret; - }; - imports.wbg.__wbg_cancelIdleCallback_3a36cf77475b492b = function(arg0, arg1) { - getObject(arg0).cancelIdleCallback(arg1 >>> 0); - }; - imports.wbg.__wbg_getComputedStyle_078292ffe423aded = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).getComputedStyle(getObject(arg1)); - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_matchMedia_66bb21e3ef19270c = function() { return handleError(function (arg0, arg1, arg2) { - const ret = getObject(arg0).matchMedia(getStringFromWasm0(arg1, arg2)); - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_requestIdleCallback_cee8e1d6bdcfae9e = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).requestIdleCallback(getObject(arg1)); - return ret; - }, arguments) }; - imports.wbg.__wbg_cancelAnimationFrame_111532f326e480af = function() { return handleError(function (arg0, arg1) { - getObject(arg0).cancelAnimationFrame(arg1); - }, arguments) }; - imports.wbg.__wbg_requestAnimationFrame_549258cfa66011f0 = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).requestAnimationFrame(getObject(arg1)); - return ret; - }, arguments) }; - imports.wbg.__wbg_clearTimeout_ba63ae54a36e111e = function(arg0, arg1) { - getObject(arg0).clearTimeout(arg1); - }; - imports.wbg.__wbg_fetch_5aed618e85a9cc28 = function(arg0, arg1, arg2) { - const ret = getObject(arg0).fetch(getStringFromWasm0(arg1, arg2)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_setTimeout_d2b9a986d10a6182 = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).setTimeout(getObject(arg1)); - return ret; - }, arguments) }; - imports.wbg.__wbg_setTimeout_c172d5704ef82276 = function() { return handleError(function (arg0, arg1, arg2) { - const ret = getObject(arg0).setTimeout(getObject(arg1), arg2); - return ret; - }, arguments) }; imports.wbg.__wbg_body_edb1908d3ceff3a1 = function(arg0) { const ret = getObject(arg0).body; return isLikeNone(ret) ? 0 : addHeapObject(ret); @@ -846,6 +860,9 @@ function __wbg_get_imports() { imports.wbg.__wbg_compressedTexImage2D_7281817b21d687b6 = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) { getObject(arg0).compressedTexImage2D(arg1 >>> 0, arg2, arg3 >>> 0, arg4, arg5, arg6, getObject(arg7)); }; + imports.wbg.__wbg_readPixels_551d0505625c865b = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) { + getObject(arg0).readPixels(arg1, arg2, arg3, arg4, arg5 >>> 0, arg6 >>> 0, getObject(arg7)); + }, arguments) }; imports.wbg.__wbg_texImage2D_a14a3c7863e25c89 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) { getObject(arg0).texImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, getObject(arg9)); }, arguments) }; @@ -1056,203 +1073,32 @@ function __wbg_get_imports() { imports.wbg.__wbg_viewport_221ade2aef6032c8 = function(arg0, arg1, arg2, arg3, arg4) { getObject(arg0).viewport(arg1, arg2, arg3, arg4); }; - imports.wbg.__wbg_vertexAttribDivisorANGLE_b258d7388e466921 = function(arg0, arg1, arg2) { - getObject(arg0).vertexAttribDivisorANGLE(arg1 >>> 0, arg2 >>> 0); - }; - imports.wbg.__wbg_addEventListener_53b787075bd5e003 = function() { return handleError(function (arg0, arg1, arg2, arg3) { - getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3)); - }, arguments) }; - imports.wbg.__wbg_removeEventListener_92cb9b3943463338 = function() { return handleError(function (arg0, arg1, arg2, arg3) { - getObject(arg0).removeEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3)); - }, arguments) }; imports.wbg.__wbg_setwidth_080107476e633963 = function(arg0, arg1) { getObject(arg0).width = arg1 >>> 0; }; imports.wbg.__wbg_setheight_dc240617639f1f51 = function(arg0, arg1) { getObject(arg0).height = arg1 >>> 0; }; - imports.wbg.__wbg_getContext_df50fa48a8876636 = function() { return handleError(function (arg0, arg1, arg2) { - const ret = getObject(arg0).getContext(getStringFromWasm0(arg1, arg2)); + imports.wbg.__wbg_getContext_fec464290556673c = function() { return handleError(function (arg0, arg1, arg2, arg3) { + const ret = getObject(arg0).getContext(getStringFromWasm0(arg1, arg2), getObject(arg3)); return isLikeNone(ret) ? 0 : addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_new_4e95a9abecc83cd4 = function() { return handleError(function (arg0) { - const ret = new IntersectionObserver(getObject(arg0)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_disconnect_e694940ce6d0ef91 = function(arg0) { - getObject(arg0).disconnect(); - }; - imports.wbg.__wbg_observe_538a6d1df0deb993 = function(arg0, arg1) { - getObject(arg0).observe(getObject(arg1)); - }; - imports.wbg.__wbg_bindVertexArrayOES_abe2fd389c6a2f56 = function(arg0, arg1) { - getObject(arg0).bindVertexArrayOES(getObject(arg1)); - }; - imports.wbg.__wbg_createVertexArrayOES_886be8a08db32ce6 = function(arg0) { - const ret = getObject(arg0).createVertexArrayOES(); - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_deleteVertexArrayOES_153f352862874f30 = function(arg0, arg1) { - getObject(arg0).deleteVertexArrayOES(getObject(arg1)); - }; - imports.wbg.__wbg_signal_a61f78a3478fd9bc = function(arg0) { - const ret = getObject(arg0).signal; - return addHeapObject(ret); - }; - imports.wbg.__wbg_new_0d76b0581eca6298 = function() { return handleError(function () { - const ret = new AbortController(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_abort_2aa7521d5690750e = function(arg0) { - getObject(arg0).abort(); - }; - imports.wbg.__wbg_new_61d4f20a1c08a45c = function() { return handleError(function (arg0) { - const ret = new ResizeObserver(getObject(arg0)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_disconnect_6675f32e2ae8deb7 = function(arg0) { - getObject(arg0).disconnect(); - }; - imports.wbg.__wbg_observe_a79646ce7bb08cb8 = function(arg0, arg1) { - getObject(arg0).observe(getObject(arg1)); - }; - imports.wbg.__wbg_observe_dc0ebcd59ee7cd17 = function(arg0, arg1, arg2) { - getObject(arg0).observe(getObject(arg1), getObject(arg2)); - }; - imports.wbg.__wbg_unobserve_55c93518cad6ac06 = function(arg0, arg1) { - getObject(arg0).unobserve(getObject(arg1)); - }; - imports.wbg.__wbg_x_c0e76d143979338a = function(arg0) { - const ret = getObject(arg0).x; + imports.wbg.__wbg_instanceof_Response_849eb93e75734b6e = function(arg0) { + let result; + try { + result = getObject(arg0) instanceof Response; + } catch (_) { + result = false; + } + const ret = result; return ret; }; - imports.wbg.__wbg_y_047a9fda606ab8ef = function(arg0) { - const ret = getObject(arg0).y; + imports.wbg.__wbg_status_61a01141acd3cf74 = function(arg0) { + const ret = getObject(arg0).status; return ret; }; - imports.wbg.__wbg_width_1e8430024cb82aba = function(arg0) { - const ret = getObject(arg0).width; - return ret; - }; - imports.wbg.__wbg_height_0c1394f089d7bb71 = function(arg0) { - const ret = getObject(arg0).height; - return ret; - }; - imports.wbg.__wbg_port1_d51a1bd2c33125d0 = function(arg0) { - const ret = getObject(arg0).port1; - return addHeapObject(ret); - }; - imports.wbg.__wbg_port2_f522a81e92362e7e = function(arg0) { - const ret = getObject(arg0).port2; - return addHeapObject(ret); - }; - imports.wbg.__wbg_new_34615e164dc78975 = function() { return handleError(function () { - const ret = new MessageChannel(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_ctrlKey_008695ce60a588f5 = function(arg0) { - const ret = getObject(arg0).ctrlKey; - return ret; - }; - imports.wbg.__wbg_shiftKey_1e76dbfcdd36a4b4 = function(arg0) { - const ret = getObject(arg0).shiftKey; - return ret; - }; - imports.wbg.__wbg_altKey_07da841b54bd3ed6 = function(arg0) { - const ret = getObject(arg0).altKey; - return ret; - }; - imports.wbg.__wbg_metaKey_86bfd3b0d3a8083f = function(arg0) { - const ret = getObject(arg0).metaKey; - return ret; - }; - imports.wbg.__wbg_button_367cdc7303e3cf9b = function(arg0) { - const ret = getObject(arg0).button; - return ret; - }; - imports.wbg.__wbg_buttons_d004fa75ac704227 = function(arg0) { - const ret = getObject(arg0).buttons; - return ret; - }; - imports.wbg.__wbg_movementX_b800a0cacd14d9bf = function(arg0) { - const ret = getObject(arg0).movementX; - return ret; - }; - imports.wbg.__wbg_movementY_7907e03eb8c0ea1e = function(arg0) { - const ret = getObject(arg0).movementY; - return ret; - }; - imports.wbg.__wbg_setbuffer_1793c076d39c6617 = function(arg0, arg1) { - getObject(arg0).buffer = getObject(arg1); - }; - imports.wbg.__wbg_setonended_ad220d8d48b1642c = function(arg0, arg1) { - getObject(arg0).onended = getObject(arg1); - }; - imports.wbg.__wbg_start_07ac75070dcdd1a2 = function() { return handleError(function (arg0, arg1) { - getObject(arg0).start(arg1); - }, arguments) }; - imports.wbg.__wbg_destination_0014df38da590ed6 = function(arg0) { - const ret = getObject(arg0).destination; - return addHeapObject(ret); - }; - imports.wbg.__wbg_currentTime_9bc85e1579050a3f = function(arg0) { - const ret = getObject(arg0).currentTime; - return ret; - }; - imports.wbg.__wbg_newwithcontextoptions_cd911d6d2ece88e4 = function() { return handleError(function (arg0) { - const ret = new lAudioContext(getObject(arg0)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_close_72f0f505a65b831b = function() { return handleError(function (arg0) { - const ret = getObject(arg0).close(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_createBuffer_2db05bc15a2e2745 = function() { return handleError(function (arg0, arg1, arg2, arg3) { - const ret = getObject(arg0).createBuffer(arg1 >>> 0, arg2 >>> 0, arg3); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_createBufferSource_0d65cd58ccd38511 = function() { return handleError(function (arg0) { - const ret = getObject(arg0).createBufferSource(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_resume_cda1a6cb84e7cf47 = function() { return handleError(function (arg0) { - const ret = getObject(arg0).resume(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_now_4e659b3d15f470d9 = function(arg0) { - const ret = getObject(arg0).now(); - return ret; - }; - imports.wbg.__wbg_deltaX_206576827ededbe5 = function(arg0) { - const ret = getObject(arg0).deltaX; - return ret; - }; - imports.wbg.__wbg_deltaY_032e327e216f2b2b = function(arg0) { - const ret = getObject(arg0).deltaY; - return ret; - }; - imports.wbg.__wbg_deltaMode_294b2eaf54047265 = function(arg0) { - const ret = getObject(arg0).deltaMode; - return ret; - }; - imports.wbg.__wbg_appendChild_580ccb11a660db68 = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).appendChild(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_contains_fdfd1dc667f36695 = function(arg0, arg1) { - const ret = getObject(arg0).contains(getObject(arg1)); - return ret; - }; - imports.wbg.__wbg_inlineSize_ff0e40258cefeba2 = function(arg0) { - const ret = getObject(arg0).inlineSize; - return ret; - }; - imports.wbg.__wbg_blockSize_73f4e5608c08713d = function(arg0) { - const ret = getObject(arg0).blockSize; - return ret; - }; - imports.wbg.__wbg_connect_186433827476e7d8 = function() { return handleError(function (arg0, arg1) { - const ret = getObject(arg0).connect(getObject(arg1)); + imports.wbg.__wbg_arrayBuffer_29931d52c7206b02 = function() { return handleError(function (arg0) { + const ret = getObject(arg0).arrayBuffer(); return addHeapObject(ret); }, arguments) }; imports.wbg.__wbg_getPropertyValue_fa32ee1811f224cb = function() { return handleError(function (arg0, arg1, arg2, arg3) { @@ -1272,8 +1118,12 @@ function __wbg_get_imports() { imports.wbg.__wbg_setProperty_ea7d15a2b591aa97 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { getObject(arg0).setProperty(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); }, arguments) }; - imports.wbg.__wbg_isIntersecting_082397a1d66e2e35 = function(arg0) { - const ret = getObject(arg0).isIntersecting; + imports.wbg.__wbg_width_1e8430024cb82aba = function(arg0) { + const ret = getObject(arg0).width; + return ret; + }; + imports.wbg.__wbg_height_0c1394f089d7bb71 = function(arg0) { + const ret = getObject(arg0).height; return ret; }; imports.wbg.__wbg_altKey_2e6c34c37088d8b1 = function(arg0) { @@ -1314,6 +1164,142 @@ function __wbg_get_imports() { getInt32Memory0()[arg0 / 4 + 1] = len1; getInt32Memory0()[arg0 / 4 + 0] = ptr1; }; + imports.wbg.__wbg_x_c0e76d143979338a = function(arg0) { + const ret = getObject(arg0).x; + return ret; + }; + imports.wbg.__wbg_y_047a9fda606ab8ef = function(arg0) { + const ret = getObject(arg0).y; + return ret; + }; + imports.wbg.__wbg_drawBuffersWEBGL_4c663e042e093892 = function(arg0, arg1) { + getObject(arg0).drawBuffersWEBGL(getObject(arg1)); + }; + imports.wbg.__wbg_addEventListener_53b787075bd5e003 = function() { return handleError(function (arg0, arg1, arg2, arg3) { + getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3)); + }, arguments) }; + imports.wbg.__wbg_removeEventListener_92cb9b3943463338 = function() { return handleError(function (arg0, arg1, arg2, arg3) { + getObject(arg0).removeEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3)); + }, arguments) }; + imports.wbg.__wbg_ctrlKey_008695ce60a588f5 = function(arg0) { + const ret = getObject(arg0).ctrlKey; + return ret; + }; + imports.wbg.__wbg_shiftKey_1e76dbfcdd36a4b4 = function(arg0) { + const ret = getObject(arg0).shiftKey; + return ret; + }; + imports.wbg.__wbg_altKey_07da841b54bd3ed6 = function(arg0) { + const ret = getObject(arg0).altKey; + return ret; + }; + imports.wbg.__wbg_metaKey_86bfd3b0d3a8083f = function(arg0) { + const ret = getObject(arg0).metaKey; + return ret; + }; + imports.wbg.__wbg_button_367cdc7303e3cf9b = function(arg0) { + const ret = getObject(arg0).button; + return ret; + }; + imports.wbg.__wbg_buttons_d004fa75ac704227 = function(arg0) { + const ret = getObject(arg0).buttons; + return ret; + }; + imports.wbg.__wbg_movementX_b800a0cacd14d9bf = function(arg0) { + const ret = getObject(arg0).movementX; + return ret; + }; + imports.wbg.__wbg_movementY_7907e03eb8c0ea1e = function(arg0) { + const ret = getObject(arg0).movementY; + return ret; + }; + imports.wbg.__wbg_inlineSize_ff0e40258cefeba2 = function(arg0) { + const ret = getObject(arg0).inlineSize; + return ret; + }; + imports.wbg.__wbg_blockSize_73f4e5608c08713d = function(arg0) { + const ret = getObject(arg0).blockSize; + return ret; + }; + imports.wbg.__wbg_preventDefault_b1a4aafc79409429 = function(arg0) { + getObject(arg0).preventDefault(); + }; + imports.wbg.__wbg_isIntersecting_082397a1d66e2e35 = function(arg0) { + const ret = getObject(arg0).isIntersecting; + return ret; + }; + imports.wbg.__wbg_contentRect_bce644376332c7a5 = function(arg0) { + const ret = getObject(arg0).contentRect; + return addHeapObject(ret); + }; + imports.wbg.__wbg_devicePixelContentBoxSize_d5bcdcd5e96671f3 = function(arg0) { + const ret = getObject(arg0).devicePixelContentBoxSize; + return addHeapObject(ret); + }; + imports.wbg.__wbg_new_4e95a9abecc83cd4 = function() { return handleError(function (arg0) { + const ret = new IntersectionObserver(getObject(arg0)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_disconnect_e694940ce6d0ef91 = function(arg0) { + getObject(arg0).disconnect(); + }; + imports.wbg.__wbg_observe_538a6d1df0deb993 = function(arg0, arg1) { + getObject(arg0).observe(getObject(arg1)); + }; + imports.wbg.__wbg_port1_d51a1bd2c33125d0 = function(arg0) { + const ret = getObject(arg0).port1; + return addHeapObject(ret); + }; + imports.wbg.__wbg_port2_f522a81e92362e7e = function(arg0) { + const ret = getObject(arg0).port2; + return addHeapObject(ret); + }; + imports.wbg.__wbg_new_34615e164dc78975 = function() { return handleError(function () { + const ret = new MessageChannel(); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_appendChild_580ccb11a660db68 = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).appendChild(getObject(arg1)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_contains_fdfd1dc667f36695 = function(arg0, arg1) { + const ret = getObject(arg0).contains(getObject(arg1)); + return ret; + }; + imports.wbg.__wbg_signal_a61f78a3478fd9bc = function(arg0) { + const ret = getObject(arg0).signal; + return addHeapObject(ret); + }; + imports.wbg.__wbg_new_0d76b0581eca6298 = function() { return handleError(function () { + const ret = new AbortController(); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_abort_2aa7521d5690750e = function(arg0) { + getObject(arg0).abort(); + }; + imports.wbg.__wbg_new_61d4f20a1c08a45c = function() { return handleError(function (arg0) { + const ret = new ResizeObserver(getObject(arg0)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_disconnect_6675f32e2ae8deb7 = function(arg0) { + getObject(arg0).disconnect(); + }; + imports.wbg.__wbg_observe_a79646ce7bb08cb8 = function(arg0, arg1) { + getObject(arg0).observe(getObject(arg1)); + }; + imports.wbg.__wbg_observe_dc0ebcd59ee7cd17 = function(arg0, arg1, arg2) { + getObject(arg0).observe(getObject(arg1), getObject(arg2)); + }; + imports.wbg.__wbg_unobserve_55c93518cad6ac06 = function(arg0, arg1) { + getObject(arg0).unobserve(getObject(arg1)); + }; + imports.wbg.__wbg_error_6e987ee48d9fdf45 = function(arg0, arg1) { + console.error(getObject(arg0), getObject(arg1)); + }; + imports.wbg.__wbg_connect_186433827476e7d8 = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).connect(getObject(arg1)); + return addHeapObject(ret); + }, arguments) }; imports.wbg.__wbg_pointerId_e030fa156647fedd = function(arg0) { const ret = getObject(arg0).pointerId; return ret; @@ -1333,30 +1319,9 @@ function __wbg_get_imports() { const ret = getObject(arg0).getCoalescedEvents(); return addHeapObject(ret); }; - imports.wbg.__wbg_contentRect_bce644376332c7a5 = function(arg0) { - const ret = getObject(arg0).contentRect; - return addHeapObject(ret); - }; - imports.wbg.__wbg_devicePixelContentBoxSize_d5bcdcd5e96671f3 = function(arg0) { - const ret = getObject(arg0).devicePixelContentBoxSize; - return addHeapObject(ret); - }; - imports.wbg.__wbg_persisted_cbb7e3c657029516 = function(arg0) { - const ret = getObject(arg0).persisted; - return ret; - }; - imports.wbg.__wbg_drawBuffersWEBGL_4c663e042e093892 = function(arg0, arg1) { - getObject(arg0).drawBuffersWEBGL(getObject(arg1)); - }; - imports.wbg.__wbg_error_6e987ee48d9fdf45 = function(arg0, arg1) { - console.error(getObject(arg0), getObject(arg1)); - }; imports.wbg.__wbg_copyToChannel_c5200b51ff33f8a3 = function() { return handleError(function (arg0, arg1, arg2, arg3) { getObject(arg0).copyToChannel(getArrayF32FromWasm0(arg1, arg2), arg3); }, arguments) }; - imports.wbg.__wbg_preventDefault_b1a4aafc79409429 = function(arg0) { - getObject(arg0).preventDefault(); - }; imports.wbg.__wbg_media_bcef0e2ec4383569 = function(arg0, arg1) { const ret = getObject(arg1).media; const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); @@ -1374,6 +1339,66 @@ function __wbg_get_imports() { imports.wbg.__wbg_removeListener_46f3ee00c5b95320 = function() { return handleError(function (arg0, arg1) { getObject(arg0).removeListener(getObject(arg1)); }, arguments) }; + imports.wbg.__wbg_persisted_cbb7e3c657029516 = function(arg0) { + const ret = getObject(arg0).persisted; + return ret; + }; + imports.wbg.__wbg_now_4e659b3d15f470d9 = function(arg0) { + const ret = getObject(arg0).now(); + return ret; + }; + imports.wbg.__wbg_deltaX_206576827ededbe5 = function(arg0) { + const ret = getObject(arg0).deltaX; + return ret; + }; + imports.wbg.__wbg_deltaY_032e327e216f2b2b = function(arg0) { + const ret = getObject(arg0).deltaY; + return ret; + }; + imports.wbg.__wbg_deltaMode_294b2eaf54047265 = function(arg0) { + const ret = getObject(arg0).deltaMode; + return ret; + }; + imports.wbg.__wbg_vertexAttribDivisorANGLE_b258d7388e466921 = function(arg0, arg1, arg2) { + getObject(arg0).vertexAttribDivisorANGLE(arg1 >>> 0, arg2 >>> 0); + }; + imports.wbg.__wbg_setbuffer_1793c076d39c6617 = function(arg0, arg1) { + getObject(arg0).buffer = getObject(arg1); + }; + imports.wbg.__wbg_setonended_ad220d8d48b1642c = function(arg0, arg1) { + getObject(arg0).onended = getObject(arg1); + }; + imports.wbg.__wbg_start_07ac75070dcdd1a2 = function() { return handleError(function (arg0, arg1) { + getObject(arg0).start(arg1); + }, arguments) }; + imports.wbg.__wbg_destination_0014df38da590ed6 = function(arg0) { + const ret = getObject(arg0).destination; + return addHeapObject(ret); + }; + imports.wbg.__wbg_currentTime_9bc85e1579050a3f = function(arg0) { + const ret = getObject(arg0).currentTime; + return ret; + }; + imports.wbg.__wbg_newwithcontextoptions_cd911d6d2ece88e4 = function() { return handleError(function (arg0) { + const ret = new lAudioContext(getObject(arg0)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_close_72f0f505a65b831b = function() { return handleError(function (arg0) { + const ret = getObject(arg0).close(); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_createBuffer_2db05bc15a2e2745 = function() { return handleError(function (arg0, arg1, arg2, arg3) { + const ret = getObject(arg0).createBuffer(arg1 >>> 0, arg2 >>> 0, arg3); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_createBufferSource_0d65cd58ccd38511 = function() { return handleError(function (arg0) { + const ret = getObject(arg0).createBufferSource(); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_resume_cda1a6cb84e7cf47 = function() { return handleError(function (arg0) { + const ret = getObject(arg0).resume(); + return addHeapObject(ret); + }, arguments) }; imports.wbg.__wbg_setonmessage_93bdba94dcd46c04 = function(arg0, arg1) { getObject(arg0).onmessage = getObject(arg1); }; @@ -1386,26 +1411,15 @@ function __wbg_get_imports() { imports.wbg.__wbg_start_5a293222bc398f51 = function(arg0) { getObject(arg0).start(); }; - imports.wbg.__wbg_instanceof_Response_849eb93e75734b6e = function(arg0) { - let result; - try { - result = getObject(arg0) instanceof Response; - } catch (_) { - result = false; - } - const ret = result; - return ret; + imports.wbg.__wbg_bindVertexArrayOES_abe2fd389c6a2f56 = function(arg0, arg1) { + getObject(arg0).bindVertexArrayOES(getObject(arg1)); }; - imports.wbg.__wbg_status_61a01141acd3cf74 = function(arg0) { - const ret = getObject(arg0).status; - return ret; + imports.wbg.__wbg_createVertexArrayOES_886be8a08db32ce6 = function(arg0) { + const ret = getObject(arg0).createVertexArrayOES(); + return isLikeNone(ret) ? 0 : addHeapObject(ret); }; - imports.wbg.__wbg_arrayBuffer_29931d52c7206b02 = function() { return handleError(function (arg0) { - const ret = getObject(arg0).arrayBuffer(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_queueMicrotask_481971b0d87f3dd4 = function(arg0) { - queueMicrotask(getObject(arg0)); + imports.wbg.__wbg_deleteVertexArrayOES_153f352862874f30 = function(arg0, arg1) { + getObject(arg0).deleteVertexArrayOES(getObject(arg1)); }; imports.wbg.__wbg_queueMicrotask_3cbae2ec6b6cd3d6 = function(arg0) { const ret = getObject(arg0).queueMicrotask; @@ -1415,24 +1429,22 @@ function __wbg_get_imports() { const ret = typeof(getObject(arg0)) === 'function'; return ret; }; - imports.wbg.__wbg_crypto_d05b68a3572bb8ca = function(arg0) { + imports.wbg.__wbg_queueMicrotask_481971b0d87f3dd4 = function(arg0) { + queueMicrotask(getObject(arg0)); + }; + imports.wbg.__wbg_crypto_6a16ba611e8c0315 = function(arg0) { const ret = getObject(arg0).crypto; return addHeapObject(ret); }; - imports.wbg.__wbindgen_is_object = function(arg0) { - const val = getObject(arg0); - const ret = typeof(val) === 'object' && val !== null; - return ret; - }; - imports.wbg.__wbg_process_b02b3570280d0366 = function(arg0) { + imports.wbg.__wbg_process_a378ed87357a05b7 = function(arg0) { const ret = getObject(arg0).process; return addHeapObject(ret); }; - imports.wbg.__wbg_versions_c1cb42213cedf0f5 = function(arg0) { + imports.wbg.__wbg_versions_d2a95fcf92a06460 = function(arg0) { const ret = getObject(arg0).versions; return addHeapObject(ret); }; - imports.wbg.__wbg_node_43b1089f407e4ec2 = function(arg0) { + imports.wbg.__wbg_node_e613ee965e542690 = function(arg0) { const ret = getObject(arg0).node; return addHeapObject(ret); }; @@ -1440,18 +1452,18 @@ function __wbg_get_imports() { const ret = typeof(getObject(arg0)) === 'string'; return ret; }; - imports.wbg.__wbg_msCrypto_10fc94afee92bd76 = function(arg0) { - const ret = getObject(arg0).msCrypto; - return addHeapObject(ret); - }; - imports.wbg.__wbg_require_9a7e0f667ead4995 = function() { return handleError(function () { + imports.wbg.__wbg_require_8c61ef97678a5df5 = function() { return handleError(function () { const ret = module.require; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_randomFillSync_b70ccbdf4926a99d = function() { return handleError(function (arg0, arg1) { + imports.wbg.__wbg_msCrypto_be5cc43833ce63e3 = function(arg0) { + const ret = getObject(arg0).msCrypto; + return addHeapObject(ret); + }; + imports.wbg.__wbg_randomFillSync_f356dd2f8c5b6843 = function() { return handleError(function (arg0, arg1) { getObject(arg0).randomFillSync(takeObject(arg1)); }, arguments) }; - imports.wbg.__wbg_getRandomValues_7e42b4fb8779dc6d = function() { return handleError(function (arg0, arg1) { + imports.wbg.__wbg_getRandomValues_1b2bd102b871e872 = function() { return handleError(function (arg0, arg1) { getObject(arg0).getRandomValues(getObject(arg1)); }, arguments) }; imports.wbg.__wbg_get_bd8e338fbd5f5cc8 = function(arg0, arg1) { @@ -1607,68 +1619,68 @@ function __wbg_get_imports() { const ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper6031 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 5473, __wbg_adapter_32); + imports.wbg.__wbindgen_closure_wrapper5477 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 5041, __wbg_adapter_32); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper6032 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 5473, __wbg_adapter_35); + imports.wbg.__wbindgen_closure_wrapper5478 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 5041, __wbg_adapter_32); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper6033 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 5473, __wbg_adapter_38); + imports.wbg.__wbindgen_closure_wrapper5479 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 5041, __wbg_adapter_37); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper6034 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 5473, __wbg_adapter_32); + imports.wbg.__wbindgen_closure_wrapper5480 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 5041, __wbg_adapter_32); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper6035 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 5473, __wbg_adapter_32); + imports.wbg.__wbindgen_closure_wrapper5481 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 5041, __wbg_adapter_42); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper6036 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 5473, __wbg_adapter_32); + imports.wbg.__wbindgen_closure_wrapper5482 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 5041, __wbg_adapter_32); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper6037 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 5473, __wbg_adapter_32); + imports.wbg.__wbindgen_closure_wrapper5483 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 5041, __wbg_adapter_32); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper41986 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 36440, __wbg_adapter_49); + imports.wbg.__wbindgen_closure_wrapper41656 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 36359, __wbg_adapter_49); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper43300 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 37073, __wbg_adapter_52); + imports.wbg.__wbindgen_closure_wrapper43120 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 37053, __wbg_adapter_52); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper43301 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 37073, __wbg_adapter_52); + imports.wbg.__wbindgen_closure_wrapper43121 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 37053, __wbg_adapter_55); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper43302 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 37073, __wbg_adapter_57); + imports.wbg.__wbindgen_closure_wrapper43122 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 37053, __wbg_adapter_55); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper43303 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 37073, __wbg_adapter_52); + imports.wbg.__wbindgen_closure_wrapper43123 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 37053, __wbg_adapter_55); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper43304 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 37073, __wbg_adapter_52); + imports.wbg.__wbindgen_closure_wrapper43124 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 37053, __wbg_adapter_55); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper43305 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 37073, __wbg_adapter_52); + imports.wbg.__wbindgen_closure_wrapper43125 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 37053, __wbg_adapter_55); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper43306 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 37073, __wbg_adapter_52); + imports.wbg.__wbindgen_closure_wrapper43126 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 37053, __wbg_adapter_55); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper45492 = function(arg0, arg1, arg2) { - const ret = makeMutClosure(arg0, arg1, 37558, __wbg_adapter_68); + imports.wbg.__wbindgen_closure_wrapper45301 = function(arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 37522, __wbg_adapter_68); return addHeapObject(ret); }; diff --git a/executor-wasm/pkg/executor_wasm_bg.wasm b/executor-wasm/pkg/executor_wasm_bg.wasm index e30b616..004916d 100644 Binary files a/executor-wasm/pkg/executor_wasm_bg.wasm and b/executor-wasm/pkg/executor_wasm_bg.wasm differ diff --git a/executor-wasm/pkg/executor_wasm_bg.wasm.d.ts b/executor-wasm/pkg/executor_wasm_bg.wasm.d.ts index 6779c26..1143891 100644 --- a/executor-wasm/pkg/executor_wasm_bg.wasm.d.ts +++ b/executor-wasm/pkg/executor_wasm_bg.wasm.d.ts @@ -5,12 +5,12 @@ export function main(): void; export function __wbindgen_malloc(a: number, b: number): number; export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number; export const __wbindgen_export_2: WebAssembly.Table; -export function wasm_bindgen__convert__closures__invoke1_mut__h0cf0487b290ee515(a: number, b: number, c: number): void; -export function wasm_bindgen__convert__closures__invoke2_mut__h1e72dedd4c45cc2a(a: number, b: number, c: number, d: number): void; -export function wasm_bindgen__convert__closures__invoke0_mut__ha79470fcd860256d(a: number, b: number): void; -export function wasm_bindgen__convert__closures__invoke0_mut__h1766ce1cfdba25b3(a: number, b: number): void; -export function wasm_bindgen__convert__closures__invoke1_mut__h05c77783bcb49ea5(a: number, b: number, c: number): void; -export function wasm_bindgen__convert__closures__invoke0_mut__h2bdf352ddaf30b28(a: number, b: number): void; -export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h22a129863ce3f604(a: number, b: number, c: number): void; +export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2ac5caa64f614f2e(a: number, b: number, c: number): void; +export function _dyn_core__ops__function__FnMut__A_B___Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc170cf40329e6731(a: number, b: number, c: number, d: number): void; +export function _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hfe38bb7ac4b6df42(a: number, b: number): void; +export function _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2cce366d7e1ef568(a: number, b: number): void; +export function _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf758f2f68df3f963(a: number, b: number): void; +export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h03c62e575fdfe974(a: number, b: number, c: number): void; +export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__ha401fff11c774e91(a: number, b: number, c: number): void; export function __wbindgen_free(a: number, b: number, c: number): void; export function __wbindgen_exn_store(a: number): void; diff --git a/game/src/lib.rs b/game/src/lib.rs index 6e3f21c..5edc9e4 100644 --- a/game/src/lib.rs +++ b/game/src/lib.rs @@ -21,7 +21,7 @@ use fyrox::{ text::TextBuilder, widget::WidgetBuilder, widget::WidgetMessage, - UiNode, UserInterface, + UiNode, UserInterface, UiContainer, }, keyboard::{KeyCode, PhysicalKey}, plugin::{Plugin, PluginContext}, @@ -89,27 +89,29 @@ impl Game { UserInterface::load_from_file("data/menu.ui", ctx.resource_manager.clone()), |result, game: &mut Game, ctx| match result { Ok(menu) => { - *ctx.user_interface = menu; + let mut ui_container = UiContainer::new(); + ui_container.add(menu); + *ctx.user_interfaces = ui_container; (game.new_game, _) = ctx - .user_interface + .user_interfaces.first() .find_by_name_from_root("NewGame") .unwrap(); (game.new_game_with_plot, _) = ctx - .user_interface + .user_interfaces.first() .find_by_name_from_root("NewGameWithPlot") .unwrap(); (game.next, _) = ctx - .user_interface + .user_interfaces.first() .find_by_name_from_root("NextPlotScreen") .unwrap(); (game.new_game_after_plot, _) = ctx - .user_interface + .user_interfaces.first() .find_by_name_from_root("NewGamePlotScreen") .unwrap(); - (game.exit, _) = ctx.user_interface.find_by_name_from_root("Exit").unwrap(); + (game.exit, _) = ctx.user_interfaces.first().find_by_name_from_root("Exit").unwrap(); } Err(e) => Log::err(format!("Unable to load main menu! Reason: {:?}", e)), - // let ui = ctx.user_interface.clone(); + // let ui = ctx.user_interfaces.clone(); // *ui = result.unwrap(); }, ); @@ -177,10 +179,10 @@ impl Plugin for Game { self.need_show_menu = false; self.show_menu_time = 0.0; context - .user_interface + .user_interfaces.first() .send_message(WidgetMessage::visibility( context - .user_interface + .user_interfaces.first() .find_handle_by_name_from_root("MenuScreen"), MessageDirection::ToWidget, true, @@ -189,10 +191,10 @@ impl Plugin for Game { if self.need_show_end { context - .user_interface + .user_interfaces.first() .send_message(WidgetMessage::visibility( context - .user_interface + .user_interfaces.first() .find_handle_by_name_from_root("EndScreen"), MessageDirection::ToWidget, true, @@ -206,10 +208,10 @@ impl Plugin for Game { if let PhysicalKey::Code(keycode) = event.physical_key { if keycode == KeyCode::Escape { context - .user_interface + .user_interfaces.first() .send_message(WidgetMessage::visibility( context - .user_interface + .user_interfaces.first() .find_handle_by_name_from_root("MenuScreen"), MessageDirection::ToWidget, true, @@ -248,42 +250,42 @@ impl Plugin for Game { fn on_ui_message(&mut self, ctx: &mut PluginContext, message: &UiMessage) { if let Some(ButtonMessage::Click) = message.data() { if message.destination() == self.new_game || message.destination() == self.new_game_after_plot { - ctx.user_interface.send_message(WidgetMessage::visibility( - ctx.user_interface + ctx.user_interfaces.first().send_message(WidgetMessage::visibility( + ctx.user_interfaces.first() .find_handle_by_name_from_root("Start2Screen"), MessageDirection::ToWidget, false, )); - ctx.user_interface.send_message(WidgetMessage::visibility( - ctx.user_interface - .find_handle_by_name_from_root("MenuScreen"), + ctx.user_interfaces.first().send_message(WidgetMessage::visibility( + ctx.user_interfaces + .first().find_handle_by_name_from_root("MenuScreen"), MessageDirection::ToWidget, false, )); ctx.async_scene_loader.request("data/scene.rgs"); } else if message.destination() == self.new_game_with_plot { - ctx.user_interface.send_message(WidgetMessage::visibility( - ctx.user_interface - .find_handle_by_name_from_root("MenuScreen"), + ctx.user_interfaces.first().send_message(WidgetMessage::visibility( + ctx.user_interfaces + .first().find_handle_by_name_from_root("MenuScreen"), MessageDirection::ToWidget, false, )); - ctx.user_interface.send_message(WidgetMessage::visibility( - ctx.user_interface - .find_handle_by_name_from_root("StartScreen"), + ctx.user_interfaces.first().send_message(WidgetMessage::visibility( + ctx.user_interfaces + .first().find_handle_by_name_from_root("StartScreen"), MessageDirection::ToWidget, true, )); } else if message.destination() == self.next { - ctx.user_interface.send_message(WidgetMessage::visibility( - ctx.user_interface - .find_handle_by_name_from_root("StartScreen"), + ctx.user_interfaces.first().send_message(WidgetMessage::visibility( + ctx.user_interfaces + .first().find_handle_by_name_from_root("StartScreen"), MessageDirection::ToWidget, false, )); - ctx.user_interface.send_message(WidgetMessage::visibility( - ctx.user_interface - .find_handle_by_name_from_root("Start2Screen"), + ctx.user_interfaces.first().send_message(WidgetMessage::visibility( + ctx.user_interfaces + .first().find_handle_by_name_from_root("Start2Screen"), MessageDirection::ToWidget, true, )); @@ -299,7 +301,7 @@ impl Plugin for Game { if self.scene.is_some() { ctx.scenes.remove(self.scene); } - ctx.user_interface.send_message(WidgetMessage::visibility( + ctx.user_interfaces.first().send_message(WidgetMessage::visibility( self.level_node, MessageDirection::ToWidget, false, @@ -314,10 +316,10 @@ impl Plugin for Game { context: &mut PluginContext, ) { context - .user_interface + .user_interfaces.first() .send_message(WidgetMessage::visibility( context - .user_interface + .user_interfaces.first() .find_handle_by_name_from_root("MenuScreen"), MessageDirection::ToWidget, false, @@ -335,7 +337,7 @@ impl Plugin for Game { if self.level == 2 { ArcherSpawn::new().spawn_enemy(graph, resource_manager, -25.0); } - let ui_ctx = &mut context.user_interface.build_ctx(); + let ui_ctx = &mut context.user_interfaces.first_mut().build_ctx(); let font_to_level = resource_manager.request::("data/cd2f1-36d91_sunday.ttf".to_owned()); self.level_node = GridBuilder::new(