update engine
Gitea Actions Demo / build_and_push (push) Failing after 13s Details

This commit is contained in:
artem 2024-04-07 19:09:16 +03:00
parent acb27779ac
commit b3fe69a4f4
7 changed files with 557 additions and 531 deletions

142
Cargo.lock generated
View File

@ -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",
]

View File

@ -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

View File

@ -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;
}

File diff suppressed because it is too large Load Diff

View File

@ -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;

View File

@ -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::<Font>("data/cd2f1-36d91_sunday.ttf".to_owned());
self.level_node = GridBuilder::new(