Compare commits
3 commits
c06408a825
...
3182916832
| Author | SHA1 | Date | |
|---|---|---|---|
|
3182916832 | ||
|
|
02b40ef344 | ||
|
|
0c5fc38649 |
17 changed files with 497 additions and 282 deletions
5
.cargo/config.toml
Normal file
5
.cargo/config.toml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
[target.x86_64-unknown-linux-gnu]
|
||||
rustflags = [
|
||||
# (Nightly) Make the current crate share its generic instantiations
|
||||
"-Zshare-generics=y",
|
||||
]
|
||||
145
Cargo.lock
generated
145
Cargo.lock
generated
|
|
@ -1833,9 +1833,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.52"
|
||||
version = "1.2.53"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
|
||||
checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932"
|
||||
dependencies = [
|
||||
"find-msvc-tools",
|
||||
"jobserver",
|
||||
|
|
@ -1872,9 +1872,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
|||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.42"
|
||||
version = "0.4.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
|
||||
checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
|
||||
dependencies = [
|
||||
"iana-time-zone",
|
||||
"num-traits",
|
||||
|
|
@ -1928,9 +1928,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.7.6"
|
||||
version = "0.7.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
||||
checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
|
||||
|
||||
[[package]]
|
||||
name = "codespan-reporting"
|
||||
|
|
@ -2352,9 +2352,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
|
|||
|
||||
[[package]]
|
||||
name = "data-encoding"
|
||||
version = "2.9.0"
|
||||
version = "2.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
|
||||
checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
|
||||
|
||||
[[package]]
|
||||
name = "deltae"
|
||||
|
|
@ -2617,9 +2617,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "find-msvc-tools"
|
||||
version = "0.1.7"
|
||||
version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
|
||||
checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
|
||||
|
||||
[[package]]
|
||||
name = "finl_unicode"
|
||||
|
|
@ -2641,9 +2641,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
|
|||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.1.5"
|
||||
version = "1.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
|
||||
checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
|
|
@ -2760,6 +2760,25 @@ dependencies = [
|
|||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-task"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
|
||||
|
||||
[[package]]
|
||||
name = "futures-util"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-task",
|
||||
"pin-project-lite",
|
||||
"pin-utils",
|
||||
"slab",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "generic-array"
|
||||
version = "0.14.7"
|
||||
|
|
@ -2796,9 +2815,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gilrs"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbb2c998745a3c1ac90f64f4f7b3a54219fd3612d7705e7798212935641ed18f"
|
||||
checksum = "3fa85c2e35dc565c90511917897ea4eae16b77f2773d5223536f7b602536d462"
|
||||
dependencies = [
|
||||
"fnv",
|
||||
"gilrs-core",
|
||||
|
|
@ -2809,18 +2828,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gilrs-core"
|
||||
version = "0.6.6"
|
||||
version = "0.6.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be11a71ac3564f6965839e2ed275bf4fcf5ce16d80d396e1dfdb7b2d80bd587e"
|
||||
checksum = "d23f2cc5144060a7f8d9e02d3fce5d06705376568256a509cdbc3c24d47e4f04"
|
||||
dependencies = [
|
||||
"core-foundation 0.10.1",
|
||||
"inotify",
|
||||
"io-kit-sys",
|
||||
"js-sys",
|
||||
"libc",
|
||||
"libudev-sys",
|
||||
"log",
|
||||
"nix 0.30.1",
|
||||
"objc2-core-foundation",
|
||||
"objc2-io-kit",
|
||||
"uuid",
|
||||
"vec_map",
|
||||
"wasm-bindgen",
|
||||
|
|
@ -3194,16 +3213,6 @@ dependencies = [
|
|||
"rustversion",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "io-kit-sys"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b"
|
||||
dependencies = [
|
||||
"core-foundation-sys",
|
||||
"mach2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is_terminal_polyfill"
|
||||
version = "1.70.2"
|
||||
|
|
@ -3284,9 +3293,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.83"
|
||||
version = "0.3.85"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
|
||||
checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
|
|
@ -3924,6 +3933,7 @@ version = "0.3.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
|
||||
dependencies = [
|
||||
"bitflags 2.10.0",
|
||||
"libc",
|
||||
"objc2-core-foundation",
|
||||
]
|
||||
|
|
@ -4301,6 +4311,12 @@ version = "0.2.16"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "piper"
|
||||
version = "0.2.4"
|
||||
|
|
@ -4469,7 +4485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
|
||||
dependencies = [
|
||||
"rand_chacha",
|
||||
"rand_core 0.9.3",
|
||||
"rand_core 0.9.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4479,7 +4495,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core 0.9.3",
|
||||
"rand_core 0.9.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4490,9 +4506,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
|||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.9.3"
|
||||
version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
|
||||
checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
|
@ -4719,9 +4735,9 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
|
|||
|
||||
[[package]]
|
||||
name = "rustc-demangle"
|
||||
version = "0.1.26"
|
||||
version = "0.1.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
|
||||
checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
|
|
@ -5306,24 +5322,24 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.44"
|
||||
version = "0.3.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
|
||||
checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"libc",
|
||||
"num-conv",
|
||||
"num_threads",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
"serde_core",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
version = "0.1.6"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
|
||||
checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca"
|
||||
|
||||
[[package]]
|
||||
name = "tiny-skia"
|
||||
|
|
@ -5604,20 +5620,20 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
|
|||
|
||||
[[package]]
|
||||
name = "unicode-truncate"
|
||||
version = "2.0.0"
|
||||
version = "2.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fbf03860ff438702f3910ca5f28f8dac63c1c11e7efb5012b8b175493606330"
|
||||
checksum = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5"
|
||||
dependencies = [
|
||||
"itertools 0.13.0",
|
||||
"itertools 0.14.0",
|
||||
"unicode-segmentation",
|
||||
"unicode-width",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.2.0"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
|
||||
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
|
|
@ -5700,18 +5716,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
|
|||
|
||||
[[package]]
|
||||
name = "wasip2"
|
||||
version = "1.0.1+wasi-0.2.4"
|
||||
version = "1.0.2+wasi-0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
|
||||
checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
|
||||
dependencies = [
|
||||
"wit-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.106"
|
||||
version = "0.2.108"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
|
||||
checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
|
|
@ -5722,11 +5738,12 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-futures"
|
||||
version = "0.4.56"
|
||||
version = "0.4.58"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
|
||||
checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"futures-util",
|
||||
"js-sys",
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
|
|
@ -5735,9 +5752,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.106"
|
||||
version = "0.2.108"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
|
||||
checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
|
|
@ -5745,9 +5762,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.106"
|
||||
version = "0.2.108"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
|
||||
checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"proc-macro2",
|
||||
|
|
@ -5758,9 +5775,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.106"
|
||||
version = "0.2.108"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
|
||||
checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -5875,9 +5892,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.83"
|
||||
version = "0.3.85"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
|
||||
checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
|
|
@ -6656,9 +6673,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wit-bindgen"
|
||||
version = "0.46.0"
|
||||
version = "0.51.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
|
||||
checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
|
||||
|
||||
[[package]]
|
||||
name = "x11-dl"
|
||||
|
|
@ -6757,6 +6774,6 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "zmij"
|
||||
version = "1.0.12"
|
||||
version = "1.0.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8"
|
||||
checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea"
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@ tracing = "0.1.44"
|
|||
tracing-subscriber = "0.3.22"
|
||||
tui-logger = { version = "0.18.0", features = ["tracing-support", "crossterm"] }
|
||||
|
||||
[dev-dependencies]
|
||||
bevy = { version = "0.17.3", features = ["track_location"] }
|
||||
|
||||
[profile.dev]
|
||||
opt-level = 1
|
||||
|
||||
|
|
|
|||
12
flake.lock
generated
12
flake.lock
generated
|
|
@ -20,11 +20,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1767379071,
|
||||
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
|
||||
"lastModified": 1768564909,
|
||||
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fb7944c166a3b630f177938e478f0378e64ce108",
|
||||
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -62,11 +62,11 @@
|
|||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767667566,
|
||||
"narHash": "sha256-COy+yxZGuhQRVD1r4bWVgeFt1GB+IB1k5WRpDKbLfI8=",
|
||||
"lastModified": 1768617670,
|
||||
"narHash": "sha256-Z3+6dxoWZn+QFwjxAt5ZGXkiuCvCLgQP6pTS5eSWXqk=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "056ce5b125ab32ffe78c7d3e394d9da44733c95e",
|
||||
"rev": "56d0fbdd732f3686e8414b857cf885038fc17d57",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
buildInputs =
|
||||
[
|
||||
# Rust dependencies
|
||||
(rust-bin.stable.latest.default.override {extensions = ["rust-src"];})
|
||||
(rust-bin.nightly.latest.default.override {extensions = ["rust-src" "rust-docs" "rustc-codegen-cranelift" "rust-analyzer" "rustfmt"];})
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals (lib.strings.hasInfix "linux" system) [
|
||||
|
|
|
|||
13
justfile
Normal file
13
justfile
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
set shell := ["nu", "-c"]
|
||||
|
||||
alias rt := run-tui
|
||||
|
||||
default:
|
||||
just --list
|
||||
|
||||
run-tui:
|
||||
cargo run -- run-tui
|
||||
|
||||
update:
|
||||
cargo update
|
||||
nix flake update
|
||||
2
rust-toolchain.toml
Normal file
2
rust-toolchain.toml
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
[toolchain]
|
||||
channel = "nightly"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
use bevy::prelude::*;
|
||||
use bevy::{ecs::query::QueryData, prelude::*};
|
||||
|
||||
use crate::{
|
||||
game::{
|
||||
|
|
@ -24,6 +24,11 @@ pub enum GameState {
|
|||
Play,
|
||||
}
|
||||
|
||||
#[derive(Message)]
|
||||
pub enum GameMessage {
|
||||
Discarded(Entity),
|
||||
}
|
||||
|
||||
pub struct Riichi;
|
||||
impl Plugin for Riichi {
|
||||
fn build(&self, app: &mut App) {
|
||||
|
|
@ -33,29 +38,29 @@ impl Plugin for Riichi {
|
|||
.add_sub_state::<TurnState>()
|
||||
.init_resource::<round::MatchSettings>()
|
||||
.init_resource::<round::Compass>()
|
||||
.add_message::<GameMessage>()
|
||||
.add_systems(Startup, tile::init_tiles)
|
||||
.add_systems(OnEnter(GameState::Setup), setup)
|
||||
.add_systems(OnEnter(GameState::Deal), hand::shuffle_deal)
|
||||
.add_systems(Update, hand::sort_hands.run_if(in_state(GameState::Play)))
|
||||
// .add_systems(Update, turn_manager.run_if(in_state(GameState::Play)))
|
||||
.add_systems(OnEnter(TurnState::Tsumo), round::tsumo)
|
||||
.add_systems(OnEnter(TurnState::Menzen), round::menzen)
|
||||
.add_systems(Update, round::riichi_kan.run_if(in_state(TurnState::RiichiKan)))
|
||||
.add_systems(Update, round::discard.run_if(in_state(TurnState::Discard)))
|
||||
.add_systems(Update, round::ron_chi_pon_kan.run_if(in_state(TurnState::RonChiiPonKan)))
|
||||
.add_systems(OnEnter(TurnState::End), round::end)
|
||||
// .add_systems(Update, systems)
|
||||
// semicolon stopper
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
// struct TurnEvent {
|
||||
// pub next: Option<Entity>,
|
||||
// pub prev: Option<Entity>,
|
||||
// }
|
||||
|
||||
// fn turn_manager() {}
|
||||
|
||||
pub(crate) fn setup(
|
||||
mut commands: Commands,
|
||||
matchsettings: Res<round::MatchSettings>,
|
||||
// mut compass: ResMut<Compass>
|
||||
// tiles: Query<Entity, With<Tile>>,
|
||||
curr_gamestate: Res<State<GameState>>,
|
||||
mut next_gamestate: ResMut<NextState<GameState>>,
|
||||
) {
|
||||
for i in 1..=matchsettings.player_count {
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
use std::mem::discriminant;
|
||||
|
||||
use bevy::prelude::*;
|
||||
|
||||
use crate::{
|
||||
|
|
@ -8,9 +10,12 @@ use crate::{
|
|||
#[derive(Component)]
|
||||
pub struct Hand;
|
||||
|
||||
#[derive(Component)]
|
||||
#[derive(Component, Debug)]
|
||||
pub struct DrawnTile(pub Entity);
|
||||
|
||||
#[derive(Component)]
|
||||
pub struct DiscardedTile(pub Entity);
|
||||
|
||||
// #[derive(Component, Default)]
|
||||
// enum SortHand {
|
||||
// #[default]
|
||||
|
|
@ -36,7 +41,7 @@ pub(crate) fn shuffle_deal(
|
|||
players: Populated<Entity, With<Player>>,
|
||||
wall_ent: Single<Entity, With<Wall>>,
|
||||
mut next_gamestate: ResMut<NextState<GameState>>,
|
||||
) -> Result {
|
||||
) {
|
||||
use rand::seq::SliceRandom;
|
||||
|
||||
let mut rng = rand::rng();
|
||||
|
|
@ -53,14 +58,27 @@ pub(crate) fn shuffle_deal(
|
|||
let hand_ent = commands.spawn(Hand).add_children(&handtiles).id();
|
||||
debug!("hand_ent: {hand_ent:?}");
|
||||
|
||||
commands
|
||||
.get_entity(player_ent)?
|
||||
.replace_children(&[hand_ent]);
|
||||
|
||||
commands.entity(player_ent).replace_children(&[hand_ent]);
|
||||
}
|
||||
|
||||
commands.get_entity(*wall_ent)?.replace_children(&walltiles);
|
||||
commands.entity(*wall_ent).replace_children(&walltiles);
|
||||
|
||||
next_gamestate.set(GameState::Play);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// assumes hand is sorted
|
||||
pub(crate) fn check_wincon(hand: &[Tile; 14], melds: &[&[Tile]]) -> bool {
|
||||
// 4x3 + pair
|
||||
// assume sorted
|
||||
//
|
||||
// let melds = hand.iter().array_chunks::<3>().all(|tiles| {
|
||||
// let suit = discriminant(&tiles[0].suit);
|
||||
// let starting_rank = tiles[0].suit
|
||||
// // tiles.iter().all(|t| discriminant(&t.suit) == suit) && tiles.iter().zip(tiles[0].suit.rank())
|
||||
// }) && melds.iter().all(|meld| todo!());
|
||||
// let eyeball = todo!();
|
||||
|
||||
todo!();
|
||||
|
||||
// melds && eyeball
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,9 +3,23 @@ use strum::{EnumCount, FromRepr};
|
|||
|
||||
use crate::{
|
||||
EnumNextCycle,
|
||||
game::{GameState, hand::DrawnTile, wall::Wall},
|
||||
game::{
|
||||
GameMessage, GameState,
|
||||
hand::{DiscardedTile, DrawnTile, Hand},
|
||||
player::Player,
|
||||
wall::Wall,
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Resource)]
|
||||
pub struct CurrentPlayer(pub Entity);
|
||||
|
||||
#[derive(Resource)]
|
||||
pub(crate) struct MatchSettings {
|
||||
pub(crate) starting_points: isize,
|
||||
pub(crate) player_count: u8,
|
||||
}
|
||||
|
||||
#[derive(Component)]
|
||||
pub(crate) struct Dice(u8, u8);
|
||||
|
||||
|
|
@ -18,33 +32,6 @@ pub(crate) struct Compass {
|
|||
pub(crate) honba: usize,
|
||||
}
|
||||
|
||||
impl Default for Compass {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
prevalent_wind: Wind::Ton,
|
||||
round: 1,
|
||||
dealer_wind: Wind::Ton,
|
||||
riichi: 0,
|
||||
honba: 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Resource)]
|
||||
pub(crate) struct MatchSettings {
|
||||
pub(crate) starting_points: isize,
|
||||
pub(crate) player_count: u8,
|
||||
}
|
||||
|
||||
impl Default for MatchSettings {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
starting_points: 25000,
|
||||
player_count: 4,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Component, Clone, Copy, FromRepr, EnumCount, PartialEq)]
|
||||
pub enum Wind {
|
||||
Ton,
|
||||
|
|
@ -59,6 +46,42 @@ pub enum WindRelation {
|
|||
Kamicha,
|
||||
}
|
||||
|
||||
#[derive(SubStates, Default, Clone, Copy, PartialEq, Eq, Hash, Debug, FromRepr, EnumCount)]
|
||||
#[source(GameState = GameState::Play)]
|
||||
pub(crate) enum TurnState {
|
||||
#[default]
|
||||
Tsumo,
|
||||
Menzen,
|
||||
RiichiKan,
|
||||
Discard,
|
||||
RonChiiPonKan,
|
||||
End,
|
||||
}
|
||||
|
||||
#[derive(EntityEvent)]
|
||||
pub struct Discard(pub Entity);
|
||||
|
||||
impl Default for MatchSettings {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
starting_points: 25000,
|
||||
player_count: 4,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Compass {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
prevalent_wind: Wind::Ton,
|
||||
round: 1,
|
||||
dealer_wind: Wind::Ton,
|
||||
riichi: 0,
|
||||
honba: 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl EnumNextCycle for Wind {
|
||||
fn next(&self) -> Self {
|
||||
if (*self as usize + 1) >= Self::COUNT {
|
||||
|
|
@ -81,21 +104,6 @@ impl Wind {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Resource)]
|
||||
pub(crate) struct CurrentPlayer(pub Entity);
|
||||
|
||||
#[derive(SubStates, Default, Clone, Copy, PartialEq, Eq, Hash, Debug, FromRepr, EnumCount)]
|
||||
#[source(GameState = GameState::Play)]
|
||||
pub(crate) enum TurnState {
|
||||
#[default]
|
||||
Tsumo,
|
||||
Menzen,
|
||||
RiichiKan,
|
||||
Discard,
|
||||
RonChiiPonKan,
|
||||
End,
|
||||
}
|
||||
|
||||
impl EnumNextCycle for TurnState {
|
||||
fn next(&self) -> Self {
|
||||
if (*self as usize + 1) >= Self::COUNT {
|
||||
|
|
@ -119,9 +127,80 @@ pub(crate) fn tsumo(
|
|||
|
||||
let drawn = walltiles.last().unwrap();
|
||||
commands.entity(*wall_ent).remove_child(*drawn);
|
||||
commands.entity(curr_player.0).insert(DrawnTile(*drawn));
|
||||
let drawn_ent = commands.spawn(DrawnTile(*drawn)).id();
|
||||
commands.entity(curr_player.0).add_child(drawn_ent);
|
||||
|
||||
debug!("drew: {:?}", drawn);
|
||||
debug!("drew: ent: {drawn_ent:?} tile_ent: {:?}", drawn);
|
||||
|
||||
next_turnstate.set(curr_turnstate.next());
|
||||
}
|
||||
|
||||
pub(crate) fn menzen(
|
||||
curr_turnstate: Res<State<TurnState>>,
|
||||
mut next_turnstate: ResMut<NextState<TurnState>>,
|
||||
) {
|
||||
trace!("menzen check");
|
||||
next_turnstate.set(curr_turnstate.next());
|
||||
}
|
||||
|
||||
pub(crate) fn riichi_kan(
|
||||
curr_turnstate: Res<State<TurnState>>,
|
||||
mut next_turnstate: ResMut<NextState<TurnState>>,
|
||||
) {
|
||||
trace!("riichi_kan");
|
||||
next_turnstate.set(curr_turnstate.next());
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments, irrefutable_let_patterns)]
|
||||
pub(crate) fn discard(
|
||||
mut commands: Commands,
|
||||
mut reader: MessageReader<GameMessage>,
|
||||
|
||||
currplayer: Res<CurrentPlayer>,
|
||||
drawntile: Single<(&DrawnTile, Entity), With<DrawnTile>>,
|
||||
player_hands: Populated<(&Player, &Children), With<Hand>>,
|
||||
hands: Populated<&Children, (With<Hand>, Without<Player>)>,
|
||||
|
||||
curr_turnstate: Res<State<TurnState>>,
|
||||
mut next_turnstate: ResMut<NextState<TurnState>>,
|
||||
) {
|
||||
let curr = currplayer.0;
|
||||
let hand = player_hands.get(curr).unwrap().1.iter().next().unwrap();
|
||||
let handtiles = hands.get(hand).unwrap();
|
||||
let (drawntile, drawn_ent) = *drawntile;
|
||||
|
||||
// debug!("discard turn for: {curr:?}");
|
||||
|
||||
while let Some(message) = reader.read().next() {
|
||||
if let GameMessage::Discarded(entity) = message {
|
||||
debug!("{curr:?} discarded: {entity:?}");
|
||||
// commands.entity(drawn_ent).despawn();
|
||||
if *entity == drawntile.0 {
|
||||
} else if handtiles.contains(entity) {
|
||||
commands
|
||||
.entity(hand)
|
||||
.remove_child(*entity)
|
||||
.add_child(drawntile.0);
|
||||
} else {
|
||||
panic!("discarded illegal player tile?")
|
||||
}
|
||||
commands.spawn(DiscardedTile(*entity));
|
||||
next_turnstate.set(curr_turnstate.next());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn ron_chi_pon_kan(
|
||||
curr_turnstate: Res<State<TurnState>>,
|
||||
mut next_turnstate: ResMut<NextState<TurnState>>,
|
||||
) {
|
||||
next_turnstate.set(curr_turnstate.next());
|
||||
}
|
||||
|
||||
pub(crate) fn end(
|
||||
curr_turnstate: Res<State<TurnState>>,
|
||||
mut next_turnstate: ResMut<NextState<TurnState>>,
|
||||
) {
|
||||
next_turnstate.set(curr_turnstate.next());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
#![feature(stmt_expr_attributes, iter_array_chunks)]
|
||||
|
||||
pub mod game;
|
||||
pub mod tile;
|
||||
pub mod yakus;
|
||||
|
|
|
|||
14
src/tile.rs
14
src/tile.rs
|
|
@ -1,4 +1,4 @@
|
|||
use bevy::{ecs::entity::MapEntities, prelude::*};
|
||||
use bevy::prelude::*;
|
||||
use strum::FromRepr;
|
||||
|
||||
#[derive(Component, Debug, Clone, Copy)]
|
||||
|
|
@ -15,6 +15,18 @@ pub enum Suit {
|
|||
Dragon(Dragon),
|
||||
}
|
||||
|
||||
impl Suit {
|
||||
pub fn rank(&self) -> Option<Rank> {
|
||||
match self {
|
||||
Suit::Man(rank) => Some(*rank),
|
||||
Suit::Pin(rank) => Some(*rank),
|
||||
Suit::Sou(rank) => Some(*rank),
|
||||
// Suit::Wind(wind) | Suit::Dragon(dragon) => None,
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deref, DerefMut, Debug, PartialEq, PartialOrd, Eq, Ord, Clone, Copy)]
|
||||
pub struct Rank(pub u8);
|
||||
|
||||
|
|
|
|||
30
src/tui.rs
30
src/tui.rs
|
|
@ -2,10 +2,15 @@ use std::time::Duration;
|
|||
|
||||
use bevy::{app::ScheduleRunnerPlugin, prelude::*, state::app::StatesPlugin};
|
||||
use bevy_ratatui::RatatuiPlugins;
|
||||
use jong::game::GameState;
|
||||
use jong::game::{
|
||||
GameMessage, GameState,
|
||||
hand::{DrawnTile, Hand},
|
||||
player::{MainPlayer, Player},
|
||||
round::{CurrentPlayer, Discard},
|
||||
};
|
||||
use tui_logger::TuiWidgetState;
|
||||
|
||||
use crate::tui::states::ConsoleWidget;
|
||||
use crate::tui::{input::ConfirmSelect, states::ConsoleWidget};
|
||||
|
||||
mod input;
|
||||
mod layout;
|
||||
|
|
@ -45,11 +50,13 @@ impl Plugin for TuiPlugin {
|
|||
Update,
|
||||
(TuiSet::Input, TuiSet::Layout, TuiSet::Render).chain(),
|
||||
)
|
||||
.add_message::<ConfirmSelect>()
|
||||
.add_systems(
|
||||
Update,
|
||||
(input::keyboard, input::mouse).in_set(TuiSet::Input),
|
||||
)
|
||||
.add_systems(Update, layout::layout.in_set(TuiSet::Layout))
|
||||
.add_systems(Update, discard_tile.run_if(in_state(GameState::Play)))
|
||||
.add_systems(
|
||||
Update,
|
||||
(
|
||||
|
|
@ -62,6 +69,25 @@ impl Plugin for TuiPlugin {
|
|||
}
|
||||
}
|
||||
|
||||
fn discard_tile(
|
||||
mut writer: MessageWriter<GameMessage>,
|
||||
mut selected: MessageReader<ConfirmSelect>,
|
||||
drawntile: Single<Entity, With<DrawnTile>>,
|
||||
currplayer: Res<CurrentPlayer>,
|
||||
player_hands: Populated<(&Player, &Children), With<Hand>>,
|
||||
hands: Populated<&Children, (With<Hand>, Without<Player>)>,
|
||||
) {
|
||||
let curr = currplayer.0;
|
||||
let hand_ent = player_hands.get(curr).unwrap().1.iter().next().unwrap();
|
||||
let hand = hands.get(hand_ent).unwrap();
|
||||
|
||||
while let Some(message) = selected.read().next()
|
||||
&& (message.0 == *drawntile || hand.contains(&message.0))
|
||||
{
|
||||
writer.write(GameMessage::Discarded(message.0));
|
||||
}
|
||||
}
|
||||
|
||||
mod states {
|
||||
use bevy::prelude::*;
|
||||
use tui_logger::TuiWidgetState;
|
||||
|
|
|
|||
153
src/tui/input.rs
153
src/tui/input.rs
|
|
@ -1,149 +1,16 @@
|
|||
use bevy::prelude::*;
|
||||
|
||||
pub(crate) use keyboard::keyboard;
|
||||
pub(crate) use mouse::mouse;
|
||||
|
||||
pub(crate) mod keyboard {
|
||||
use bevy::prelude::*;
|
||||
use bevy_ratatui::event::KeyMessage;
|
||||
use ratatui::crossterm::event::KeyCode;
|
||||
use tui_logger::TuiWidgetEvent;
|
||||
pub(crate) mod keyboard;
|
||||
pub(crate) mod mouse;
|
||||
|
||||
use jong::game::GameState;
|
||||
#[derive(Component)]
|
||||
pub(crate) struct Hovered;
|
||||
|
||||
use crate::tui::layout::Overlays;
|
||||
use crate::tui::states::ConsoleWidget;
|
||||
use crate::tui::states::TuiState;
|
||||
#[derive(Component)]
|
||||
pub(crate) struct StartSelect;
|
||||
|
||||
pub(crate) fn keyboard(
|
||||
mut messages: MessageReader<KeyMessage>,
|
||||
mut overlays: ResMut<Overlays>,
|
||||
mut consolewidget: ResMut<ConsoleWidget>,
|
||||
mut exit: MessageWriter<AppExit>,
|
||||
|
||||
curr_gamestate: Res<State<GameState>>,
|
||||
curr_tuistate: Res<State<TuiState>>,
|
||||
|
||||
mut next_gamestate: ResMut<NextState<GameState>>,
|
||||
mut next_tuistate: ResMut<NextState<TuiState>>,
|
||||
) {
|
||||
'message: for message in messages.read() {
|
||||
let key = message.code;
|
||||
if consolewidget.handle_keyboard(key) {
|
||||
continue 'message;
|
||||
}
|
||||
for overlay in overlays.stack.iter().rev() {
|
||||
let consumed = match overlay {
|
||||
_ => false,
|
||||
};
|
||||
if consumed {
|
||||
continue 'message;
|
||||
}
|
||||
}
|
||||
|
||||
match curr_tuistate.get() {
|
||||
TuiState::MainMenu => match key {
|
||||
KeyCode::Char('p') => {
|
||||
next_tuistate.set(TuiState::InGame);
|
||||
next_gamestate.set(GameState::Setup);
|
||||
}
|
||||
KeyCode::Char('z') => {
|
||||
// if let Some(ref curr_zenstate) = curr_zenstate {
|
||||
// match curr_zenstate.get() {
|
||||
// ZenState::Menu => next_zenstate.set(ZenState::Zen),
|
||||
// ZenState::Zen => next_zenstate.set(ZenState::Menu),
|
||||
// }
|
||||
// }
|
||||
}
|
||||
KeyCode::Char('q') => {
|
||||
exit.write_default();
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
TuiState::InGame => todo!(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ConsoleWidget {
|
||||
pub(crate) fn handle_keyboard(&mut self, key: KeyCode) -> bool {
|
||||
if key == KeyCode::Char('`') {
|
||||
self.open = !self.open;
|
||||
return true;
|
||||
}
|
||||
if self.open {
|
||||
match key {
|
||||
KeyCode::Up => self.state.transition(TuiWidgetEvent::UpKey),
|
||||
KeyCode::Down => self.state.transition(TuiWidgetEvent::DownKey),
|
||||
// KeyCode::Home => self.state.transition(TuiWidgetEvent::),
|
||||
// KeyCode::End => self.state.transition(TuiWidgetEvent::),
|
||||
KeyCode::PageUp => self.state.transition(TuiWidgetEvent::PrevPageKey),
|
||||
KeyCode::PageDown => self.state.transition(TuiWidgetEvent::NextPageKey),
|
||||
KeyCode::Esc => {
|
||||
self.open = false;
|
||||
return true;
|
||||
}
|
||||
_ => return false,
|
||||
}
|
||||
}
|
||||
self.open
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) mod mouse {
|
||||
use bevy::prelude::*;
|
||||
use bevy_ratatui::event::MouseMessage;
|
||||
use ratatui::layout::Position;
|
||||
|
||||
use crate::tui::render::{Hovered, PickRegion};
|
||||
|
||||
pub(crate) fn mouse(
|
||||
mut commands: Commands,
|
||||
mut messages: MessageReader<MouseMessage>,
|
||||
entities: Query<(Entity, &PickRegion)>,
|
||||
hovered: Query<(Entity, &PickRegion), With<Hovered>>,
|
||||
) -> Result {
|
||||
for message in messages.read() {
|
||||
let event = message.0;
|
||||
// let term_size = context.size().unwrap();
|
||||
let position = Position::new(event.column, event.row);
|
||||
match event.kind {
|
||||
ratatui::crossterm::event::MouseEventKind::Down(mouse_button) => match mouse_button
|
||||
{
|
||||
ratatui::crossterm::event::MouseButton::Left => {
|
||||
for (_entity, _region) in &entities {}
|
||||
}
|
||||
// ratatui::crossterm::event::MouseButton::Right => todo!(),
|
||||
// ratatui::crossterm::event::MouseButton::Middle => todo!(),
|
||||
_ => {}
|
||||
},
|
||||
// ratatui::crossterm::event::MouseEventKind::Up(mouse_button) => todo!(),
|
||||
// ratatui::crossterm::event::MouseEventKind::Drag(mouse_button) => todo!(),
|
||||
ratatui::crossterm::event::MouseEventKind::Moved => {
|
||||
for (entity, region) in &hovered {
|
||||
if !region.area.contains(position) {
|
||||
commands.get_entity(entity)?.remove::<Hovered>();
|
||||
}
|
||||
}
|
||||
for (entity, region) in &entities {
|
||||
// debug!(
|
||||
// "{:?}, {position:?}",
|
||||
// // region.area.positions().collect::<Vec<_>>()
|
||||
// region.area
|
||||
// );
|
||||
if region.area.contains(position) {
|
||||
commands.get_entity(entity)?.insert(Hovered);
|
||||
// trace!("{entity:?} hovered!")
|
||||
}
|
||||
}
|
||||
}
|
||||
// ratatui::crossterm::event::MouseEventKind::ScrollDown => todo!(),
|
||||
// ratatui::crossterm::event::MouseEventKind::ScrollUp => todo!(),
|
||||
// ratatui::crossterm::event::MouseEventKind::ScrollLeft => todo!(),
|
||||
// ratatui::crossterm::event::MouseEventKind::ScrollRight => todo!(),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
#[derive(Message)]
|
||||
pub(crate) struct ConfirmSelect(pub(crate) Entity);
|
||||
|
|
|
|||
85
src/tui/input/keyboard.rs
Normal file
85
src/tui/input/keyboard.rs
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
use bevy::prelude::*;
|
||||
use bevy_ratatui::event::KeyMessage;
|
||||
use ratatui::crossterm::event::KeyCode;
|
||||
use tui_logger::TuiWidgetEvent;
|
||||
|
||||
use jong::game::GameState;
|
||||
|
||||
use crate::tui::layout::Overlays;
|
||||
use crate::tui::states::ConsoleWidget;
|
||||
use crate::tui::states::TuiState;
|
||||
|
||||
pub(crate) fn keyboard(
|
||||
mut messages: MessageReader<KeyMessage>,
|
||||
mut overlays: ResMut<Overlays>,
|
||||
mut consolewidget: ResMut<ConsoleWidget>,
|
||||
mut exit: MessageWriter<AppExit>,
|
||||
|
||||
curr_gamestate: Res<State<GameState>>,
|
||||
curr_tuistate: Res<State<TuiState>>,
|
||||
|
||||
mut next_gamestate: ResMut<NextState<GameState>>,
|
||||
mut next_tuistate: ResMut<NextState<TuiState>>,
|
||||
) {
|
||||
'message: for message in messages.read() {
|
||||
let key = message.code;
|
||||
if consolewidget.handle_keyboard(key) {
|
||||
continue 'message;
|
||||
}
|
||||
for overlay in overlays.stack.iter().rev() {
|
||||
let consumed = match overlay {
|
||||
_ => false,
|
||||
};
|
||||
if consumed {
|
||||
continue 'message;
|
||||
}
|
||||
}
|
||||
|
||||
match curr_tuistate.get() {
|
||||
TuiState::MainMenu => match key {
|
||||
KeyCode::Char('p') => {
|
||||
next_tuistate.set(TuiState::InGame);
|
||||
next_gamestate.set(GameState::Setup);
|
||||
}
|
||||
KeyCode::Char('z') => {
|
||||
// if let Some(ref curr_zenstate) = curr_zenstate {
|
||||
// match curr_zenstate.get() {
|
||||
// ZenState::Menu => next_zenstate.set(ZenState::Zen),
|
||||
// ZenState::Zen => next_zenstate.set(ZenState::Menu),
|
||||
// }
|
||||
// }
|
||||
}
|
||||
KeyCode::Char('q') => {
|
||||
exit.write_default();
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
TuiState::InGame => { /* debug!("unhandled keyboard event") */ }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ConsoleWidget {
|
||||
pub(crate) fn handle_keyboard(&mut self, key: KeyCode) -> bool {
|
||||
if key == KeyCode::Char('`') {
|
||||
self.open = !self.open;
|
||||
return true;
|
||||
}
|
||||
if self.open {
|
||||
match key {
|
||||
KeyCode::Up => self.state.transition(TuiWidgetEvent::UpKey),
|
||||
KeyCode::Down => self.state.transition(TuiWidgetEvent::DownKey),
|
||||
// KeyCode::Home => self.state.transition(TuiWidgetEvent::),
|
||||
// KeyCode::End => self.state.transition(TuiWidgetEvent::),
|
||||
KeyCode::PageUp => self.state.transition(TuiWidgetEvent::PrevPageKey),
|
||||
KeyCode::PageDown => self.state.transition(TuiWidgetEvent::NextPageKey),
|
||||
KeyCode::Esc => {
|
||||
self.open = false;
|
||||
return true;
|
||||
}
|
||||
_ => return false,
|
||||
}
|
||||
}
|
||||
self.open
|
||||
}
|
||||
}
|
||||
83
src/tui/input/mouse.rs
Normal file
83
src/tui/input/mouse.rs
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
use bevy::prelude::*;
|
||||
use bevy_ratatui::event::MouseMessage;
|
||||
use ratatui::layout::Position;
|
||||
|
||||
use crate::tui::{
|
||||
input::{ConfirmSelect, Hovered, StartSelect},
|
||||
render::PickRegion,
|
||||
};
|
||||
|
||||
pub(crate) fn mouse(
|
||||
mut commands: Commands,
|
||||
mut mouse_reader: MessageReader<MouseMessage>,
|
||||
mut event_writer: MessageWriter<ConfirmSelect>,
|
||||
entities: Query<(Entity, &PickRegion)>,
|
||||
hovered: Query<(Entity, &PickRegion), With<Hovered>>,
|
||||
startselected: Query<(Entity, &PickRegion), With<StartSelect>>,
|
||||
) {
|
||||
for message in mouse_reader.read() {
|
||||
let event = message.0;
|
||||
// let term_size = context.size().unwrap();
|
||||
let position = Position::new(event.column, event.row);
|
||||
match event.kind {
|
||||
#[allow(clippy::single_match)]
|
||||
ratatui::crossterm::event::MouseEventKind::Down(mouse_button) => match mouse_button {
|
||||
ratatui::crossterm::event::MouseButton::Left => {
|
||||
for (entity, region) in &entities {
|
||||
if region.area.contains(position) {
|
||||
commands.entity(entity).insert(StartSelect);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ratatui::crossterm::event::MouseButton::Right => debug!("unhandled mouse event"),
|
||||
// ratatui::crossterm::event::MouseButton::Middle => debug!("unhandled mouse event"),
|
||||
_ => {}
|
||||
},
|
||||
ratatui::crossterm::event::MouseEventKind::Moved => {
|
||||
for (entity, region) in &hovered {
|
||||
if !region.area.contains(position) {
|
||||
commands.entity(entity).remove::<Hovered>();
|
||||
}
|
||||
}
|
||||
for (entity, region) in &entities {
|
||||
if region.area.contains(position) {
|
||||
commands.entity(entity).insert(Hovered);
|
||||
}
|
||||
}
|
||||
}
|
||||
ratatui::crossterm::event::MouseEventKind::Up(mouse_button) => match mouse_button {
|
||||
ratatui::crossterm::event::MouseButton::Left => {
|
||||
for (entity, region) in &startselected {
|
||||
if region.area.contains(position) {
|
||||
commands.entity(entity).remove::<StartSelect>();
|
||||
event_writer.write(ConfirmSelect(entity));
|
||||
}
|
||||
}
|
||||
}
|
||||
ratatui::crossterm::event::MouseButton::Right => {
|
||||
for (entity, _) in &startselected {
|
||||
commands.entity(entity).remove::<StartSelect>();
|
||||
}
|
||||
}
|
||||
// ratatui::crossterm::event::MouseButton::Middle => debug!("unhandled mouse event"),
|
||||
_ => {}
|
||||
},
|
||||
ratatui::crossterm::event::MouseEventKind::Drag(mouse_button) => {
|
||||
// debug!("unhandled mouse event")
|
||||
}
|
||||
ratatui::crossterm::event::MouseEventKind::ScrollDown => {
|
||||
// debug!("unhandled mouse event")
|
||||
}
|
||||
ratatui::crossterm::event::MouseEventKind::ScrollUp => {
|
||||
// debug!("unhandled mouse event")
|
||||
}
|
||||
ratatui::crossterm::event::MouseEventKind::ScrollLeft => {
|
||||
// debug!("unhandled mouse event")
|
||||
}
|
||||
ratatui::crossterm::event::MouseEventKind::ScrollRight => {
|
||||
// debug!("unhandled mouse event")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -13,12 +13,10 @@ use jong::game::player::{MainPlayer, Player};
|
|||
use jong::game::round::Wind;
|
||||
use jong::tile::Tile;
|
||||
|
||||
use crate::tui::input::Hovered;
|
||||
use crate::tui::layout::*;
|
||||
use crate::tui::states::ConsoleWidget;
|
||||
|
||||
#[derive(Component)]
|
||||
pub(crate) struct Hovered;
|
||||
|
||||
#[derive(Component)]
|
||||
pub(crate) struct PickRegion {
|
||||
pub(crate) area: Rect,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue