Compare commits
6 Commits
0d2d6bf863
...
c96368da0e
| Author | SHA1 | Date |
|---|---|---|
 Simon Gellis
|
c96368da0e | |
|
Simon Gellis
|
48c9be0967 | |
|
Simon Gellis
|
3418664184 | |
|
Simon Gellis
|
e75bef634b | |
|
Simon Gellis
|
f7b37caccb | |
|
Simon Gellis
|
615b0ab9a1 |
|
|
@ -293,20 +293,19 @@ checksum = "f93ebbf82d06013f4c41fe71303feb980cddd78496d904d06be627972de51a24"
|
|||
|
||||
[[package]]
|
||||
name = "audioadapter"
|
||||
version = "2.0.1"
|
||||
version = "3.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "98e72b98fa467adcb7a88c5d1b8b686193185c81b9bf9c3fa3ac3524180cd55c"
|
||||
checksum = "91f87b70b051c5866680ad79f6743a42ccab264c009d1a71f4d33a3872ae60c8"
|
||||
dependencies = [
|
||||
"audio-core",
|
||||
"libm",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "audioadapter-buffers"
|
||||
version = "2.0.0"
|
||||
version = "3.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a6af89882334c4e501faa08992888593ada468f9e1ab211635c32f9ada7786e0"
|
||||
checksum = "9097d67933fb083d382ce980430afdb758aada60846010aee6be068c06cef0ca"
|
||||
dependencies = [
|
||||
"audioadapter",
|
||||
"audioadapter-sample",
|
||||
|
|
@ -315,9 +314,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "audioadapter-sample"
|
||||
version = "2.0.0"
|
||||
version = "3.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e9a3d502fec0b21aa420febe0b110875cf8a7057c49e83a0cace1df6a73e03e"
|
||||
checksum = "34ab94f2bc04a14e1f49ee5f222f66460e8a1b51627bdfedf34eed394d747938"
|
||||
dependencies = [
|
||||
"audio-core",
|
||||
"num-traits",
|
||||
|
|
@ -543,9 +542,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.58"
|
||||
version = "1.2.59"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1"
|
||||
checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283"
|
||||
dependencies = [
|
||||
"find-msvc-tools",
|
||||
"jobserver",
|
||||
|
|
@ -1010,6 +1009,7 @@ dependencies = [
|
|||
"log",
|
||||
"nohash-hasher",
|
||||
"profiling",
|
||||
"ron",
|
||||
"serde",
|
||||
"smallvec",
|
||||
"unicode-segmentation",
|
||||
|
|
@ -1290,9 +1290,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
|
|||
|
||||
[[package]]
|
||||
name = "font-types"
|
||||
version = "0.11.1"
|
||||
version = "0.11.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73829a7b5c91198af28a99159b7ae4afbb252fb906159ff7f189f3a2ceaa3df2"
|
||||
checksum = "2d9237c6d82152100c691fb77ea18037b402bcc7257d2c876a4ffac81bc22a1c"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"serde",
|
||||
|
|
@ -1705,9 +1705,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
|
|||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "1.8.1"
|
||||
version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
|
||||
checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
|
||||
dependencies = [
|
||||
"atomic-waker",
|
||||
"bytes",
|
||||
|
|
@ -1718,7 +1718,6 @@ dependencies = [
|
|||
"httparse",
|
||||
"itoa",
|
||||
"pin-project-lite",
|
||||
"pin-utils",
|
||||
"smallvec",
|
||||
"tokio",
|
||||
"want",
|
||||
|
|
@ -1766,12 +1765,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "icu_collections"
|
||||
version = "2.1.1"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
|
||||
checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
|
||||
dependencies = [
|
||||
"displaydoc",
|
||||
"potential_utf",
|
||||
"utf8_iter",
|
||||
"yoke",
|
||||
"zerofrom",
|
||||
"zerovec",
|
||||
|
|
@ -1779,9 +1779,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "icu_locale_core"
|
||||
version = "2.1.1"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
|
||||
checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
|
||||
dependencies = [
|
||||
"displaydoc",
|
||||
"litemap",
|
||||
|
|
@ -1792,9 +1792,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "icu_normalizer"
|
||||
version = "2.1.1"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
|
||||
checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
|
||||
dependencies = [
|
||||
"icu_collections",
|
||||
"icu_normalizer_data",
|
||||
|
|
@ -1806,15 +1806,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "icu_normalizer_data"
|
||||
version = "2.1.1"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
|
||||
checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
|
||||
|
||||
[[package]]
|
||||
name = "icu_properties"
|
||||
version = "2.1.2"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
|
||||
checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
|
||||
dependencies = [
|
||||
"icu_collections",
|
||||
"icu_locale_core",
|
||||
|
|
@ -1826,15 +1826,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "icu_properties_data"
|
||||
version = "2.1.2"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
|
||||
checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
|
||||
|
||||
[[package]]
|
||||
name = "icu_provider"
|
||||
version = "2.1.1"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
|
||||
checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
|
||||
dependencies = [
|
||||
"displaydoc",
|
||||
"icu_locale_core",
|
||||
|
|
@ -1888,9 +1888,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.13.0"
|
||||
version = "2.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
|
||||
checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown 0.16.1",
|
||||
|
|
@ -2059,9 +2059,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.92"
|
||||
version = "0.3.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc4c90f45aa2e6eacbe8645f77fdea542ac97a494bcd117a67df9ff4d611f995"
|
||||
checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"futures-util",
|
||||
|
|
@ -2131,7 +2131,7 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
|
|||
|
||||
[[package]]
|
||||
name = "lemur"
|
||||
version = "0.11.0"
|
||||
version = "0.12.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"atoi",
|
||||
|
|
@ -2181,9 +2181,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.183"
|
||||
version = "0.2.184"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
|
||||
checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
|
|
@ -2276,9 +2276,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
|
|||
|
||||
[[package]]
|
||||
name = "litemap"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
|
||||
checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
|
||||
|
||||
[[package]]
|
||||
name = "litrs"
|
||||
|
|
@ -3211,12 +3211,6 @@ version = "0.2.17"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.32"
|
||||
|
|
@ -3279,9 +3273,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "potential_utf"
|
||||
version = "0.1.4"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
|
||||
checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
|
||||
dependencies = [
|
||||
"zerovec",
|
||||
]
|
||||
|
|
@ -3766,6 +3760,20 @@ dependencies = [
|
|||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ron"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4147b952f3f819eca0e99527022f7d6a8d05f111aeb0a62960c74eb283bec8fc"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"once_cell",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"typeid",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rtrb"
|
||||
version = "0.3.3"
|
||||
|
|
@ -3774,9 +3782,9 @@ checksum = "7204ed6420f698836b76d4d5c2ec5dec7585fd5c3a788fd1cde855d1de598239"
|
|||
|
||||
[[package]]
|
||||
name = "rubato"
|
||||
version = "1.0.1"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "90173154a8a14e6adb109ea641743bc95ec81c093d94e70c6763565f7108ebeb"
|
||||
checksum = "ce96ead1a91f7895704a9f08ea5947dfc8bd7c1f2936a22295b655ec67e5c6ef"
|
||||
dependencies = [
|
||||
"audioadapter",
|
||||
"audioadapter-buffers",
|
||||
|
|
@ -4008,9 +4016,9 @@ checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
|
|||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "1.0.27"
|
||||
version = "1.0.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
|
||||
checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
|
|
@ -4057,9 +4065,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_spanned"
|
||||
version = "1.1.0"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "876ac351060d4f882bb1032b6369eb0aef79ad9df1ea8bc404874d8cc3d0cd98"
|
||||
checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
|
||||
dependencies = [
|
||||
"serde_core",
|
||||
]
|
||||
|
|
@ -4471,9 +4479,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "tinystr"
|
||||
version = "0.8.2"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
|
||||
checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
|
||||
dependencies = [
|
||||
"displaydoc",
|
||||
"zerovec",
|
||||
|
|
@ -4496,9 +4504,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
|||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.50.0"
|
||||
version = "1.51.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
|
||||
checksum = "2bd1c4c0fc4a7ab90fc15ef6daaa3ec3b893f004f915f2392557ed23237820cd"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"libc",
|
||||
|
|
@ -4511,9 +4519,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "tokio-macros"
|
||||
version = "2.6.1"
|
||||
version = "2.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
|
||||
checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -4545,9 +4553,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "1.1.0+spec-1.1.0"
|
||||
version = "1.1.2+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8195ca05e4eb728f4ba94f3e3291661320af739c4e43779cbdfae82ab239fcc"
|
||||
checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde_core",
|
||||
|
|
@ -4560,18 +4568,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "toml_datetime"
|
||||
version = "1.1.0+spec-1.1.0"
|
||||
version = "1.1.1+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97251a7c317e03ad83774a8752a7e81fb6067740609f75ea2b585b569a59198f"
|
||||
checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
|
||||
dependencies = [
|
||||
"serde_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.25.8+spec-1.1.0"
|
||||
version = "0.25.10+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c"
|
||||
checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"toml_datetime",
|
||||
|
|
@ -4581,18 +4589,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "toml_parser"
|
||||
version = "1.1.0+spec-1.1.0"
|
||||
version = "1.1.2+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011"
|
||||
checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
|
||||
dependencies = [
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_writer"
|
||||
version = "1.1.0+spec-1.1.0"
|
||||
version = "1.1.1+spec-1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d282ade6016312faf3e41e57ebbba0c073e4056dab1232ab1cb624199648f8ed"
|
||||
checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
|
||||
|
||||
[[package]]
|
||||
name = "tower"
|
||||
|
|
@ -4753,6 +4761,12 @@ dependencies = [
|
|||
"rustc-hash 2.1.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typeid"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
|
||||
|
||||
[[package]]
|
||||
name = "typenum"
|
||||
version = "1.19.0"
|
||||
|
|
@ -4930,9 +4944,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.115"
|
||||
version = "0.2.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6523d69017b7633e396a89c5efab138161ed5aafcbc8d3e5c5a42ae38f50495a"
|
||||
checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
|
|
@ -4943,9 +4957,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-futures"
|
||||
version = "0.4.65"
|
||||
version = "0.4.67"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2d1faf851e778dfa54db7cd438b70758eba9755cb47403f3496edd7c8fc212f0"
|
||||
checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
|
|
@ -4953,9 +4967,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.115"
|
||||
version = "0.2.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e3a6c758eb2f701ed3d052ff5737f5bfe6614326ea7f3bbac7156192dc32e67"
|
||||
checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
|
|
@ -4963,9 +4977,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.115"
|
||||
version = "0.2.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "921de2737904886b52bcbb237301552d05969a6f9c40d261eb0533c8b055fedf"
|
||||
checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"proc-macro2",
|
||||
|
|
@ -4976,9 +4990,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.115"
|
||||
version = "0.2.117"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a93e946af942b58934c604527337bad9ae33ba1d5c6900bbb41c2c07c2364a93"
|
||||
checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -5032,9 +5046,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wayland-backend"
|
||||
version = "0.3.14"
|
||||
version = "0.3.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa75f400b7f719bcd68b3f47cd939ba654cedeef690f486db71331eec4c6a406"
|
||||
checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"downcast-rs",
|
||||
|
|
@ -5046,9 +5060,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wayland-client"
|
||||
version = "0.31.13"
|
||||
version = "0.31.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab51d9f7c071abeee76007e2b742499e535148035bb835f97aaed1338cf516c3"
|
||||
checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"rustix 1.1.4",
|
||||
|
|
@ -5069,9 +5083,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wayland-cursor"
|
||||
version = "0.31.13"
|
||||
version = "0.31.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4b3298683470fbdc6ca40151dfc48c8f2fd4c41a26e13042f801f85002384091"
|
||||
checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d"
|
||||
dependencies = [
|
||||
"rustix 1.1.4",
|
||||
"wayland-client",
|
||||
|
|
@ -5080,9 +5094,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wayland-protocols"
|
||||
version = "0.32.11"
|
||||
version = "0.32.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b23b5df31ceff1328f06ac607591d5ba360cf58f90c8fad4ac8d3a55a3c4aec7"
|
||||
checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"wayland-backend",
|
||||
|
|
@ -5105,9 +5119,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wayland-protocols-misc"
|
||||
version = "0.3.11"
|
||||
version = "0.3.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "429b99200febaf95d4f4e46deff6fe4382bcff3280ee16a41cf887b3c3364984"
|
||||
checksum = "6e9567599ef23e09b8dad6e429e5738d4509dfc46b3b21f32841a304d16b29c8"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"wayland-backend",
|
||||
|
|
@ -5118,9 +5132,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wayland-protocols-plasma"
|
||||
version = "0.3.11"
|
||||
version = "0.3.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d392fc283a87774afc9beefcd6f931582bb97fe0e6ced0b306a62cb1d026527c"
|
||||
checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"wayland-backend",
|
||||
|
|
@ -5131,9 +5145,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wayland-protocols-wlr"
|
||||
version = "0.3.11"
|
||||
version = "0.3.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78248e4cc0eff8163370ba5c158630dcae1f3497a586b826eca2ef5f348d6235"
|
||||
checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
|
||||
dependencies = [
|
||||
"bitflags 2.11.0",
|
||||
"wayland-backend",
|
||||
|
|
@ -5144,9 +5158,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wayland-scanner"
|
||||
version = "0.31.9"
|
||||
version = "0.31.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c86287151a309799b821ca709b7345a048a2956af05957c89cb824ab919fa4e3"
|
||||
checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quick-xml",
|
||||
|
|
@ -5155,9 +5169,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wayland-sys"
|
||||
version = "0.31.10"
|
||||
version = "0.31.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "374f6b70e8e0d6bf9461a32988fd553b59ff630964924dad6e4a4eb6bd538d17"
|
||||
checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
|
||||
dependencies = [
|
||||
"dlib",
|
||||
"log",
|
||||
|
|
@ -5167,9 +5181,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.92"
|
||||
version = "0.3.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "84cde8507f4d7cfcb1185b8cb5890c494ffea65edbe1ba82cfd63661c805ed94"
|
||||
checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
|
|
@ -5977,9 +5991,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "1.0.0"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
|
||||
checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
|
@ -6084,9 +6098,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "writeable"
|
||||
version = "0.6.2"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
|
||||
checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
|
||||
|
||||
[[package]]
|
||||
name = "x11-dl"
|
||||
|
|
@ -6153,9 +6167,9 @@ checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
|
|||
|
||||
[[package]]
|
||||
name = "yoke"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
|
||||
checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
|
||||
dependencies = [
|
||||
"stable_deref_trait",
|
||||
"yoke-derive",
|
||||
|
|
@ -6164,9 +6178,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "yoke-derive"
|
||||
version = "0.8.1"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
|
||||
checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -6196,18 +6210,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "zerofrom"
|
||||
version = "0.1.6"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
|
||||
checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
|
||||
dependencies = [
|
||||
"zerofrom-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zerofrom-derive"
|
||||
version = "0.1.6"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
|
||||
checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -6223,9 +6237,9 @@ checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
|
|||
|
||||
[[package]]
|
||||
name = "zerotrie"
|
||||
version = "0.2.3"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
|
||||
checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
|
||||
dependencies = [
|
||||
"displaydoc",
|
||||
"yoke",
|
||||
|
|
@ -6234,9 +6248,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "zerovec"
|
||||
version = "0.11.5"
|
||||
version = "0.11.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
|
||||
checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
|
||||
dependencies = [
|
||||
"yoke",
|
||||
"zerofrom",
|
||||
|
|
@ -6245,9 +6259,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "zerovec-derive"
|
||||
version = "0.11.2"
|
||||
version = "0.11.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
|
||||
checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
|
|||
|
|
@ -4,20 +4,20 @@ description = "An emulator for the Virtual Boy."
|
|||
repository = "https://git.virtual-boy.com/PVB/lemur"
|
||||
publish = false
|
||||
license = "MIT"
|
||||
version = "0.11.0"
|
||||
version = "0.12.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1"
|
||||
atoi = "2"
|
||||
audioadapter-buffers = "2"
|
||||
audioadapter-buffers = "3"
|
||||
atomic = "0.6"
|
||||
bitflags = { version = "2", features = ["serde"] }
|
||||
bytemuck = { version = "1", features = ["derive"] }
|
||||
clap = { version = "4", features = ["derive"] }
|
||||
cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
|
||||
directories = "6"
|
||||
egui = { version = "0.34", features = ["serde"] }
|
||||
egui = { version = "0.34", features = ["persistence", "serde"] }
|
||||
egui_extras = { version = "0.34", features = ["image"] }
|
||||
egui-notify = "0.22"
|
||||
egui-winit = "0.34"
|
||||
|
|
@ -39,7 +39,7 @@ pollster = "0.4"
|
|||
rand = "0.10"
|
||||
rfd = "0.17"
|
||||
rtrb = "0.3"
|
||||
rubato = "1"
|
||||
rubato = "2"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
thread-priority = "3"
|
||||
|
|
|
|||
821
src/app.rs
821
src/app.rs
|
|
@ -1,18 +1,25 @@
|
|||
use std::{collections::HashSet, num::NonZero, sync::Arc, thread, time::Duration};
|
||||
use std::{
|
||||
collections::hash_map::Entry,
|
||||
num::NonZero,
|
||||
sync::Arc,
|
||||
thread,
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
use egui::{
|
||||
Context, FontData, FontDefinitions, FontFamily, IconData, TextWrapMode, ViewportBuilder,
|
||||
ViewportCommand, ViewportId, ViewportInfo,
|
||||
ahash::{HashMap, HashMapExt},
|
||||
style::ScrollStyle,
|
||||
Context, FontData, FontDefinitions, FontFamily, IconData, PlatformOutput, RawInput,
|
||||
TextWrapMode, ViewportBuilder, ViewportCommand, ViewportEvent, ViewportId, ViewportIdMap,
|
||||
ViewportIdSet, ViewportInfo, style::ScrollStyle,
|
||||
};
|
||||
use egui_wgpu::winit::Painter;
|
||||
use egui_winit::EventResponse;
|
||||
use gilrs::{EventType, Gilrs};
|
||||
use tracing::{error, warn};
|
||||
use winit::{
|
||||
application::ApplicationHandler,
|
||||
event::WindowEvent,
|
||||
event_loop::{ActiveEventLoop, EventLoopProxy},
|
||||
window::Window,
|
||||
event_loop::{ActiveEventLoop, ControlFlow, EventLoopProxy},
|
||||
window::{Window, WindowId},
|
||||
};
|
||||
|
||||
use crate::{
|
||||
|
|
@ -23,13 +30,11 @@ use crate::{
|
|||
input::{MappingProvider, ShortcutProvider},
|
||||
memory::MemoryClient,
|
||||
persistence::Persistence,
|
||||
window::{
|
||||
AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
|
||||
GdbServerWindow, HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow,
|
||||
RegisterWindow, TerminalWindow, WorldWindow,
|
||||
},
|
||||
window::{AppWindow, ChildWindow, GameScreen, GameWindow, InitArgs},
|
||||
};
|
||||
|
||||
const EGUI_FILENAME: &str = "egui";
|
||||
|
||||
fn load_icon() -> anyhow::Result<IconData> {
|
||||
let bytes = include_bytes!("../assets/lemur-256x256.png");
|
||||
let img = image::load_from_memory_with_format(bytes, image::ImageFormat::Png)?;
|
||||
|
|
@ -41,28 +46,24 @@ fn load_icon() -> anyhow::Result<IconData> {
|
|||
})
|
||||
}
|
||||
|
||||
struct SharedViewportState {
|
||||
viewport_info: ViewportIdMap<ViewportInfo>,
|
||||
painter: Painter,
|
||||
resized_viewport: Option<ViewportId>,
|
||||
}
|
||||
|
||||
pub struct Application {
|
||||
icon: Option<Arc<IconData>>,
|
||||
wgpu: WgpuState,
|
||||
client: EmulatorClient,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
mappings: MappingProvider,
|
||||
shortcuts: ShortcutProvider,
|
||||
controllers: ControllerManager,
|
||||
memory: Arc<MemoryClient>,
|
||||
images: Arc<ImageTextureLoader>,
|
||||
persistence: Persistence,
|
||||
viewports: HashMap<ViewportId, Viewport>,
|
||||
ctx: Context,
|
||||
shared: SharedViewportState,
|
||||
icon: Option<Arc<IconData>>,
|
||||
app: GameWindow,
|
||||
controllers: ControllerManager,
|
||||
viewports: ViewportIdMap<ViewportManager>,
|
||||
focused: Option<ViewportId>,
|
||||
init_debug_port: Option<u16>,
|
||||
init_profiling: bool,
|
||||
init_bgmap: bool,
|
||||
init_chardata: bool,
|
||||
init_objects: bool,
|
||||
init_worlds: bool,
|
||||
init_framebuffers: bool,
|
||||
init_registers: bool,
|
||||
init_terminal: bool,
|
||||
redraw_times: ViewportIdMap<Instant>,
|
||||
initial_windows: Vec<ChildWindow>,
|
||||
}
|
||||
|
||||
impl Application {
|
||||
|
|
@ -84,132 +85,323 @@ impl Application {
|
|||
let proxy = proxy.clone();
|
||||
thread::spawn(|| process_gamepad_input(mappings, proxy));
|
||||
}
|
||||
let app = Self {
|
||||
icon,
|
||||
wgpu,
|
||||
client,
|
||||
proxy,
|
||||
mappings,
|
||||
shortcuts,
|
||||
memory,
|
||||
images,
|
||||
controllers,
|
||||
persistence,
|
||||
viewports: HashMap::new(),
|
||||
focused: None,
|
||||
init_debug_port: args.debug_port,
|
||||
init_profiling: args.profile,
|
||||
init_bgmap: args.bgmap_data,
|
||||
init_chardata: args.character_data,
|
||||
init_objects: args.object_data,
|
||||
init_worlds: args.worlds,
|
||||
init_framebuffers: args.frame_buffers,
|
||||
init_registers: args.registers,
|
||||
init_terminal: args.terminal,
|
||||
};
|
||||
if args.player2 {
|
||||
app.client
|
||||
.send_command(EmulatorCommand::StartSecondSim(args.rom.clone()));
|
||||
let app = GameWindow::new(
|
||||
ViewportId::ROOT,
|
||||
client.clone(),
|
||||
proxy.clone(),
|
||||
persistence.clone(),
|
||||
shortcuts.clone(),
|
||||
&memory,
|
||||
&images,
|
||||
mappings.clone(),
|
||||
SimId::Player1,
|
||||
);
|
||||
|
||||
app.proxy
|
||||
.send_event(UserEvent::OpenPlayer2)
|
||||
.expect("Failed to open Player 2 window");
|
||||
let ctx = Context::default();
|
||||
let data = persistence.load_config(EGUI_FILENAME).unwrap_or_default();
|
||||
ctx.data_mut(|d| *d = data);
|
||||
let mut fonts = FontDefinitions::default();
|
||||
fonts.font_data.insert(
|
||||
"Selawik".into(),
|
||||
Arc::new(FontData::from_static(include_bytes!(
|
||||
"../assets/selawik.ttf"
|
||||
))),
|
||||
);
|
||||
fonts
|
||||
.families
|
||||
.get_mut(&FontFamily::Proportional)
|
||||
.unwrap()
|
||||
.insert(0, "Selawik".into());
|
||||
ctx.set_fonts(fonts);
|
||||
ctx.global_style_mut(|s| {
|
||||
s.wrap_mode = Some(TextWrapMode::Extend);
|
||||
s.visuals.menu_corner_radius = Default::default();
|
||||
s.spacing.scroll = ScrollStyle::thin();
|
||||
});
|
||||
egui_extras::install_image_loaders(&ctx);
|
||||
ctx.add_texture_loader(images.clone());
|
||||
ctx.set_embed_viewports(false);
|
||||
{
|
||||
let proxy = proxy.clone();
|
||||
ctx.set_request_repaint_callback(move |info| {
|
||||
let _ = proxy.send_event(UserEvent::RequestRedraw(
|
||||
info.viewport_id,
|
||||
Instant::now() + info.delay,
|
||||
));
|
||||
});
|
||||
}
|
||||
|
||||
let wgpu_config = egui_wgpu::WgpuConfiguration {
|
||||
present_mode: wgpu::PresentMode::AutoVsync,
|
||||
wgpu_setup: egui_wgpu::WgpuSetup::Existing(egui_wgpu::WgpuSetupExisting {
|
||||
instance: wgpu.instance.clone(),
|
||||
adapter: wgpu.adapter.clone(),
|
||||
device: wgpu.device.clone(),
|
||||
queue: wgpu.queue.clone(),
|
||||
}),
|
||||
..egui_wgpu::WgpuConfiguration::default()
|
||||
};
|
||||
|
||||
let options = egui_wgpu::RendererOptions::default();
|
||||
let painter = pollster::block_on(Painter::new(ctx.clone(), wgpu_config, false, options));
|
||||
|
||||
let mut initial_windows = vec![];
|
||||
if let Some(port) = args.debug_port {
|
||||
initial_windows.push(ChildWindow::Debugger { port: Some(port) });
|
||||
}
|
||||
if args.profile {
|
||||
initial_windows.push(ChildWindow::Profiler { launch: true });
|
||||
}
|
||||
if args.character_data {
|
||||
initial_windows.push(ChildWindow::CharacterData);
|
||||
}
|
||||
if args.bgmap_data {
|
||||
initial_windows.push(ChildWindow::BgMap);
|
||||
}
|
||||
if args.object_data {
|
||||
initial_windows.push(ChildWindow::Objects);
|
||||
}
|
||||
if args.worlds {
|
||||
initial_windows.push(ChildWindow::Worlds);
|
||||
}
|
||||
if args.frame_buffers {
|
||||
initial_windows.push(ChildWindow::FrameBuffers);
|
||||
}
|
||||
if args.registers {
|
||||
initial_windows.push(ChildWindow::Registers);
|
||||
}
|
||||
if args.terminal {
|
||||
initial_windows.push(ChildWindow::Terminal);
|
||||
}
|
||||
if args.player2 {
|
||||
client.send_command(EmulatorCommand::StartSecondSim(args.rom.clone()));
|
||||
initial_windows.push(ChildWindow::Player2);
|
||||
}
|
||||
|
||||
Self {
|
||||
client,
|
||||
persistence,
|
||||
ctx,
|
||||
shared: SharedViewportState {
|
||||
viewport_info: ViewportIdMap::default(),
|
||||
painter,
|
||||
resized_viewport: None,
|
||||
},
|
||||
icon,
|
||||
app,
|
||||
controllers,
|
||||
viewports: ViewportIdMap::default(),
|
||||
focused: None,
|
||||
redraw_times: ViewportIdMap::default(),
|
||||
initial_windows,
|
||||
}
|
||||
app
|
||||
}
|
||||
|
||||
fn open(&mut self, event_loop: &ActiveEventLoop, window: Box<dyn AppWindow>) {
|
||||
let viewport_id = window.viewport_id();
|
||||
if let Some(viewport) = self.viewports.get(&viewport_id) {
|
||||
viewport.window.focus_window();
|
||||
return;
|
||||
fn check_repaint(&mut self, event_loop: &ActiveEventLoop) {
|
||||
let now = Instant::now();
|
||||
self.redraw_times.retain(|viewport_id, time| {
|
||||
if *time > now {
|
||||
return true;
|
||||
}
|
||||
if let Some(viewport) = self.viewports.get(viewport_id) {
|
||||
viewport.window.request_redraw();
|
||||
}
|
||||
false
|
||||
});
|
||||
if let Some(next_repaint_time) = self.redraw_times.values().min().copied() {
|
||||
event_loop.set_control_flow(ControlFlow::WaitUntil(next_repaint_time));
|
||||
}
|
||||
self.viewports.insert(
|
||||
viewport_id,
|
||||
Viewport::new(
|
||||
&self.images,
|
||||
event_loop,
|
||||
&self.wgpu,
|
||||
self.icon.clone(),
|
||||
window,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
fn repaint_all(&mut self, event_loop: &ActiveEventLoop) {
|
||||
enum ViewportUpdate {
|
||||
Keep {
|
||||
recreate: bool,
|
||||
builder: ViewportBuilder,
|
||||
parent: ViewportId,
|
||||
commands: Vec<ViewportCommand>,
|
||||
},
|
||||
Remove,
|
||||
}
|
||||
let mut updates = ViewportIdMap::<ViewportUpdate>::default();
|
||||
for viewport in self.viewports.values() {
|
||||
updates.insert(
|
||||
viewport.id,
|
||||
ViewportUpdate::Keep {
|
||||
recreate: false,
|
||||
builder: viewport.builder.clone(),
|
||||
parent: self
|
||||
.shared
|
||||
.viewport_info
|
||||
.get(&viewport.id)
|
||||
.and_then(|vp| vp.parent)
|
||||
.unwrap_or(ViewportId::ROOT),
|
||||
commands: vec![],
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
for viewport in self.viewports.values_mut() {
|
||||
let mut input = viewport.take_egui_input();
|
||||
if !self.shared.viewport_info.contains_key(&viewport.id) {
|
||||
continue;
|
||||
}
|
||||
input.viewports = self.shared.viewport_info.clone();
|
||||
let output = self.ctx.run_ui(input, |ui| {
|
||||
if viewport.id == ViewportId::ROOT {
|
||||
self.app.show(ui);
|
||||
} else if let Some(cb) = ui.viewport(|v| v.viewport_ui_cb.clone()) {
|
||||
cb(ui);
|
||||
}
|
||||
});
|
||||
viewport.handle_platform_output(output.platform_output);
|
||||
for (id, update) in updates.iter_mut() {
|
||||
if !output.viewport_output.contains_key(id) {
|
||||
self.shared.viewport_info.remove(id);
|
||||
*update = ViewportUpdate::Remove;
|
||||
}
|
||||
}
|
||||
for (id, mut vp) in output.viewport_output {
|
||||
match updates.entry(id) {
|
||||
Entry::Vacant(e) => {
|
||||
e.insert(ViewportUpdate::Keep {
|
||||
recreate: true,
|
||||
builder: vp.builder,
|
||||
parent: vp.parent,
|
||||
commands: vp.commands,
|
||||
});
|
||||
}
|
||||
Entry::Occupied(e) => {
|
||||
let ViewportUpdate::Keep {
|
||||
recreate,
|
||||
builder,
|
||||
commands,
|
||||
..
|
||||
} = e.into_mut()
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
let (_, should_recreate) = builder.patch(vp.builder);
|
||||
*recreate |= should_recreate;
|
||||
commands.append(&mut vp.commands);
|
||||
}
|
||||
}
|
||||
}
|
||||
let clipped_primitives = self.ctx.tessellate(output.shapes, output.pixels_per_point);
|
||||
self.shared.painter.paint_and_update_textures(
|
||||
viewport.id,
|
||||
output.pixels_per_point,
|
||||
[0.0, 0.0, 0.0, 0.0],
|
||||
&clipped_primitives,
|
||||
&output.textures_delta,
|
||||
vec![],
|
||||
);
|
||||
viewport.window.pre_present_notify();
|
||||
}
|
||||
let mut active_viewports = ViewportIdSet::default();
|
||||
for (id, update) in updates {
|
||||
match update {
|
||||
ViewportUpdate::Keep {
|
||||
recreate,
|
||||
builder,
|
||||
parent,
|
||||
commands,
|
||||
} => {
|
||||
active_viewports.insert(id);
|
||||
let manager = self
|
||||
.viewports
|
||||
.remove(&id)
|
||||
.filter(|_| !recreate)
|
||||
.unwrap_or_else(|| {
|
||||
let manager = ViewportManager::new(
|
||||
&self.ctx,
|
||||
id,
|
||||
parent,
|
||||
event_loop,
|
||||
builder,
|
||||
&mut self.shared,
|
||||
);
|
||||
self.app.handle_init(
|
||||
id,
|
||||
InitArgs {
|
||||
window: &manager.window,
|
||||
render_state: &self.shared.painter.render_state().unwrap(),
|
||||
},
|
||||
);
|
||||
manager
|
||||
});
|
||||
manager.process_viewport_commands(commands, &mut self.shared);
|
||||
self.viewports.insert(id, manager);
|
||||
}
|
||||
ViewportUpdate::Remove => {
|
||||
self.viewports.remove(&id);
|
||||
}
|
||||
}
|
||||
}
|
||||
if !active_viewports.contains(&ViewportId::ROOT) {
|
||||
event_loop.exit();
|
||||
}
|
||||
self.shared.painter.gc_viewports(&active_viewports);
|
||||
}
|
||||
}
|
||||
|
||||
impl ApplicationHandler<UserEvent> for Application {
|
||||
fn resumed(&mut self, event_loop: &ActiveEventLoop) {
|
||||
if let Some(port) = self.init_debug_port {
|
||||
let mut server =
|
||||
GdbServerWindow::new(SimId::Player1, self.client.clone(), self.proxy.clone());
|
||||
server.launch(port);
|
||||
self.open(event_loop, Box::new(server));
|
||||
let mut viewport_builder = self.app.initial_viewport();
|
||||
if let Some(icon) = &self.icon {
|
||||
viewport_builder = viewport_builder.with_icon(icon.clone());
|
||||
}
|
||||
let app = GameWindow::new(
|
||||
self.client.clone(),
|
||||
self.proxy.clone(),
|
||||
self.persistence.clone(),
|
||||
self.shortcuts.clone(),
|
||||
SimId::Player1,
|
||||
let manager = ViewportManager::new(
|
||||
&self.ctx,
|
||||
ViewportId::ROOT,
|
||||
ViewportId::ROOT,
|
||||
event_loop,
|
||||
viewport_builder,
|
||||
&mut self.shared,
|
||||
);
|
||||
self.open(event_loop, Box::new(app));
|
||||
let sim_id = SimId::Player1;
|
||||
if self.init_profiling {
|
||||
let mut profiler = ProfileWindow::new(sim_id, self.client.clone());
|
||||
profiler.launch();
|
||||
self.open(event_loop, Box::new(profiler));
|
||||
let render_state = self.shared.painter.render_state().unwrap();
|
||||
GameScreen::init_pipeline(&render_state);
|
||||
self.app.handle_init(
|
||||
ViewportId::ROOT,
|
||||
InitArgs {
|
||||
window: &manager.window,
|
||||
render_state: &render_state,
|
||||
},
|
||||
);
|
||||
self.viewports.insert(ViewportId::ROOT, manager);
|
||||
for window in std::mem::take(&mut self.initial_windows) {
|
||||
self.app.open(window);
|
||||
}
|
||||
if self.init_chardata {
|
||||
let chardata = CharacterDataWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(chardata));
|
||||
}
|
||||
if self.init_bgmap {
|
||||
let bgmap = BgMapWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(bgmap));
|
||||
}
|
||||
if self.init_objects {
|
||||
let objects = ObjectWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(objects));
|
||||
}
|
||||
if self.init_worlds {
|
||||
let world = WorldWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(world));
|
||||
}
|
||||
if self.init_framebuffers {
|
||||
let fb = FrameBufferWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(fb));
|
||||
}
|
||||
if self.init_registers {
|
||||
let registers = RegisterWindow::new(sim_id, &self.memory);
|
||||
self.open(event_loop, Box::new(registers));
|
||||
}
|
||||
if self.init_terminal {
|
||||
let terminal = TerminalWindow::new(sim_id, &self.client);
|
||||
self.open(event_loop, Box::new(terminal));
|
||||
}
|
||||
|
||||
fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
|
||||
if let Some(viewport) = self.viewports.get(&ViewportId::ROOT) {
|
||||
viewport.window.request_redraw();
|
||||
}
|
||||
}
|
||||
|
||||
fn window_event(
|
||||
&mut self,
|
||||
event_loop: &ActiveEventLoop,
|
||||
window_id: winit::window::WindowId,
|
||||
window_id: WindowId,
|
||||
event: WindowEvent,
|
||||
) {
|
||||
let Some(viewport) = self
|
||||
.viewports
|
||||
.values_mut()
|
||||
.find(|v| v.window.id() == window_id)
|
||||
.find(|v| v.has_window_id(window_id))
|
||||
else {
|
||||
return;
|
||||
};
|
||||
let viewport_id = viewport.id();
|
||||
let mut queue_redraw = false;
|
||||
let mut inactive_viewports = HashSet::new();
|
||||
let (consumed, action) = viewport.on_window_event(&event);
|
||||
if !consumed {
|
||||
let viewport_id = viewport.id;
|
||||
let (response, close_requested) = viewport.on_window_event(&event, &mut self.shared);
|
||||
if close_requested && viewport_id == ViewportId::ROOT {
|
||||
event_loop.exit();
|
||||
}
|
||||
if !response.consumed {
|
||||
match event {
|
||||
WindowEvent::KeyboardInput { event, .. } => {
|
||||
if !viewport.app.handle_key_event(&event) {
|
||||
if !self.app.handle_key_event(viewport_id, &event) {
|
||||
self.controllers.handle_key_event(&event);
|
||||
}
|
||||
}
|
||||
|
|
@ -219,35 +411,10 @@ impl ApplicationHandler<UserEvent> for Application {
|
|||
_ => {}
|
||||
}
|
||||
}
|
||||
match action {
|
||||
Some(Action::Redraw) => {
|
||||
for viewport in self.viewports.values_mut() {
|
||||
match viewport.redraw(event_loop) {
|
||||
Some(Action::Redraw) => {
|
||||
queue_redraw = true;
|
||||
}
|
||||
Some(Action::Close) => {
|
||||
inactive_viewports.insert(viewport.id());
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
Some(Action::Close) => {
|
||||
inactive_viewports.insert(viewport_id);
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
self.viewports
|
||||
.retain(|k, _| !inactive_viewports.contains(k));
|
||||
match self.viewports.get(&ViewportId::ROOT) {
|
||||
Some(viewport) => {
|
||||
if queue_redraw {
|
||||
viewport.window.request_redraw();
|
||||
}
|
||||
}
|
||||
None => event_loop.exit(),
|
||||
if response.repaint {
|
||||
self.repaint_all(event_loop);
|
||||
}
|
||||
self.check_repaint(event_loop);
|
||||
}
|
||||
|
||||
fn device_event(
|
||||
|
|
@ -264,99 +431,41 @@ impl ApplicationHandler<UserEvent> for Application {
|
|||
else {
|
||||
return;
|
||||
};
|
||||
viewport.state.on_mouse_motion(delta);
|
||||
viewport.on_mouse_motion(delta);
|
||||
}
|
||||
}
|
||||
|
||||
fn user_event(&mut self, event_loop: &ActiveEventLoop, event: UserEvent) {
|
||||
match event {
|
||||
UserEvent::GamepadEvent(event) => {
|
||||
if let Some(viewport) = self
|
||||
if !self
|
||||
.focused
|
||||
.as_ref()
|
||||
.and_then(|id| self.viewports.get_mut(id))
|
||||
&& viewport.app.handle_gamepad_event(&event)
|
||||
.is_some_and(|id| self.app.handle_gamepad_event(id, &event))
|
||||
{
|
||||
return;
|
||||
self.controllers.handle_gamepad_event(&event);
|
||||
}
|
||||
self.controllers.handle_gamepad_event(&event);
|
||||
}
|
||||
UserEvent::OpenAbout => {
|
||||
let about = AboutWindow;
|
||||
self.open(event_loop, Box::new(about));
|
||||
}
|
||||
UserEvent::OpenCharacterData(sim_id) => {
|
||||
let chardata = CharacterDataWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(chardata));
|
||||
}
|
||||
UserEvent::OpenBgMap(sim_id) => {
|
||||
let bgmap = BgMapWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(bgmap));
|
||||
}
|
||||
UserEvent::OpenObjects(sim_id) => {
|
||||
let objects = ObjectWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(objects));
|
||||
}
|
||||
UserEvent::OpenWorlds(sim_id) => {
|
||||
let world = WorldWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(world));
|
||||
}
|
||||
UserEvent::OpenFrameBuffers(sim_id) => {
|
||||
let fb = FrameBufferWindow::new(sim_id, &self.memory, &self.images);
|
||||
self.open(event_loop, Box::new(fb));
|
||||
}
|
||||
UserEvent::OpenRegisters(sim_id) => {
|
||||
let registers = RegisterWindow::new(sim_id, &self.memory);
|
||||
self.open(event_loop, Box::new(registers));
|
||||
}
|
||||
UserEvent::OpenTerminal(sim_id) => {
|
||||
let terminal = TerminalWindow::new(sim_id, &self.client);
|
||||
self.open(event_loop, Box::new(terminal));
|
||||
}
|
||||
UserEvent::OpenProfiler(sim_id) => {
|
||||
let profile = ProfileWindow::new(sim_id, self.client.clone());
|
||||
self.open(event_loop, Box::new(profile));
|
||||
}
|
||||
UserEvent::OpenDebugger(sim_id) => {
|
||||
let debugger =
|
||||
GdbServerWindow::new(sim_id, self.client.clone(), self.proxy.clone());
|
||||
self.open(event_loop, Box::new(debugger));
|
||||
}
|
||||
UserEvent::OpenInput => {
|
||||
let input = InputWindow::new(self.mappings.clone());
|
||||
self.open(event_loop, Box::new(input));
|
||||
}
|
||||
UserEvent::OpenHotkeys => {
|
||||
let hotkeys = HotkeysWindow::new(self.shortcuts.clone());
|
||||
self.open(event_loop, Box::new(hotkeys));
|
||||
}
|
||||
UserEvent::OpenPlayer2 => {
|
||||
let p2 = GameWindow::new(
|
||||
self.client.clone(),
|
||||
self.proxy.clone(),
|
||||
self.persistence.clone(),
|
||||
self.shortcuts.clone(),
|
||||
SimId::Player2,
|
||||
);
|
||||
self.open(event_loop, Box::new(p2));
|
||||
}
|
||||
UserEvent::Quit(sim_id) => {
|
||||
self.viewports
|
||||
.retain(|_, viewport| viewport.app.sim_id() != sim_id);
|
||||
if !self.viewports.contains_key(&ViewportId::ROOT) {
|
||||
event_loop.exit();
|
||||
UserEvent::Quit(sim_id) => match sim_id {
|
||||
SimId::Player1 => event_loop.exit(),
|
||||
SimId::Player2 => self.app.close(ChildWindow::Player2),
|
||||
},
|
||||
UserEvent::RequestRedraw(viewport, when) => {
|
||||
let scheduled = self.redraw_times.entry(viewport).or_insert(when);
|
||||
if *scheduled > when {
|
||||
*scheduled = when;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
|
||||
if let Some(viewport) = self.viewports.get(&ViewportId::ROOT) {
|
||||
viewport.window.request_redraw();
|
||||
}
|
||||
self.check_repaint(event_loop);
|
||||
}
|
||||
|
||||
fn exiting(&mut self, _event_loop: &ActiveEventLoop) {
|
||||
if let Err(error) = self
|
||||
.ctx
|
||||
.data(|d| self.persistence.save_config(EGUI_FILENAME, d))
|
||||
{
|
||||
error!(%error, "could not save egui state.");
|
||||
}
|
||||
let (sender, receiver) = oneshot::channel();
|
||||
if self.client.send_command(EmulatorCommand::Exit(sender))
|
||||
&& let Err(error) = receiver.recv_timeout(Duration::from_secs(5))
|
||||
|
|
@ -416,219 +525,109 @@ impl WgpuState {
|
|||
}
|
||||
}
|
||||
|
||||
struct Viewport {
|
||||
painter: egui_wgpu::winit::Painter,
|
||||
ctx: Context,
|
||||
info: ViewportInfo,
|
||||
commands: Vec<ViewportCommand>,
|
||||
builder: ViewportBuilder,
|
||||
struct ViewportManager {
|
||||
id: ViewportId,
|
||||
window: Arc<Window>,
|
||||
state: egui_winit::State,
|
||||
app: Box<dyn AppWindow>,
|
||||
builder: ViewportBuilder,
|
||||
}
|
||||
impl Viewport {
|
||||
pub fn new(
|
||||
images: &Arc<ImageTextureLoader>,
|
||||
impl ViewportManager {
|
||||
fn new(
|
||||
ctx: &Context,
|
||||
viewport_id: ViewportId,
|
||||
parent_id: ViewportId,
|
||||
event_loop: &ActiveEventLoop,
|
||||
wgpu: &WgpuState,
|
||||
icon: Option<Arc<IconData>>,
|
||||
mut app: Box<dyn AppWindow>,
|
||||
builder: ViewportBuilder,
|
||||
shared: &mut SharedViewportState,
|
||||
) -> Self {
|
||||
let ctx = Context::default();
|
||||
let mut fonts = FontDefinitions::default();
|
||||
fonts.font_data.insert(
|
||||
"Selawik".into(),
|
||||
Arc::new(FontData::from_static(include_bytes!(
|
||||
"../assets/selawik.ttf"
|
||||
))),
|
||||
);
|
||||
fonts
|
||||
.families
|
||||
.get_mut(&FontFamily::Proportional)
|
||||
.unwrap()
|
||||
.insert(0, "Selawik".into());
|
||||
ctx.set_fonts(fonts);
|
||||
ctx.global_style_mut(|s| {
|
||||
s.wrap_mode = Some(TextWrapMode::Extend);
|
||||
s.visuals.menu_corner_radius = Default::default();
|
||||
s.spacing.scroll = ScrollStyle::thin();
|
||||
});
|
||||
egui_extras::install_image_loaders(&ctx);
|
||||
ctx.add_texture_loader(images.clone());
|
||||
|
||||
let wgpu_config = egui_wgpu::WgpuConfiguration {
|
||||
present_mode: wgpu::PresentMode::AutoVsync,
|
||||
wgpu_setup: egui_wgpu::WgpuSetup::Existing(egui_wgpu::WgpuSetupExisting {
|
||||
instance: wgpu.instance.clone(),
|
||||
adapter: wgpu.adapter.clone(),
|
||||
device: wgpu.device.clone(),
|
||||
queue: wgpu.queue.clone(),
|
||||
}),
|
||||
..egui_wgpu::WgpuConfiguration::default()
|
||||
};
|
||||
|
||||
let options = egui_wgpu::RendererOptions::default();
|
||||
let mut painter = pollster::block_on(egui_wgpu::winit::Painter::new(
|
||||
let window = Arc::new(egui_winit::create_window(ctx, event_loop, &builder).unwrap());
|
||||
pollster::block_on(shared.painter.set_window(viewport_id, Some(window.clone()))).unwrap();
|
||||
let state = egui_winit::State::new(
|
||||
ctx.clone(),
|
||||
wgpu_config,
|
||||
false,
|
||||
options,
|
||||
));
|
||||
viewport_id,
|
||||
event_loop,
|
||||
Some(window.scale_factor() as f32),
|
||||
event_loop.system_theme(),
|
||||
shared.painter.max_texture_side(),
|
||||
);
|
||||
|
||||
let mut info = ViewportInfo::default();
|
||||
let mut builder = app.initial_viewport();
|
||||
if let Some(icon) = icon {
|
||||
builder = builder.with_icon(icon);
|
||||
}
|
||||
let (window, state) = create_window_and_state(&ctx, event_loop, &builder, &mut painter);
|
||||
egui_winit::update_viewport_info(&mut info, &ctx, &window, true);
|
||||
|
||||
let render_state = painter.render_state();
|
||||
let args = InitArgs {
|
||||
window: &window,
|
||||
render_state: render_state.as_ref().unwrap(),
|
||||
let mut info = ViewportInfo {
|
||||
parent: Some(parent_id),
|
||||
..ViewportInfo::default()
|
||||
};
|
||||
app.on_init(args);
|
||||
egui_winit::update_viewport_info(&mut info, ctx, &window, true);
|
||||
shared.viewport_info.insert(viewport_id, info);
|
||||
|
||||
Self {
|
||||
painter,
|
||||
ctx,
|
||||
info,
|
||||
commands: vec![],
|
||||
builder,
|
||||
id: viewport_id,
|
||||
window,
|
||||
state,
|
||||
app,
|
||||
builder,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn id(&self) -> ViewportId {
|
||||
self.app.viewport_id()
|
||||
fn has_window_id(&self, window_id: WindowId) -> bool {
|
||||
self.window.id() == window_id
|
||||
}
|
||||
|
||||
pub fn on_window_event(&mut self, event: &WindowEvent) -> (bool, Option<Action>) {
|
||||
let response = self.state.on_window_event(&self.window, event);
|
||||
egui_winit::update_viewport_info(
|
||||
&mut self.info,
|
||||
self.state.egui_ctx(),
|
||||
&self.window,
|
||||
false,
|
||||
);
|
||||
fn on_mouse_motion(&mut self, delta: (f64, f64)) {
|
||||
self.state.on_mouse_motion(delta);
|
||||
}
|
||||
|
||||
let action = match event {
|
||||
WindowEvent::RedrawRequested => Some(Action::Redraw),
|
||||
WindowEvent::CloseRequested => Some(Action::Close),
|
||||
WindowEvent::Resized(size) => {
|
||||
if let (Some(width), Some(height)) =
|
||||
(NonZero::new(size.width), NonZero::new(size.height))
|
||||
{
|
||||
self.painter
|
||||
.on_window_resized(ViewportId::ROOT, width, height);
|
||||
}
|
||||
None
|
||||
fn on_window_event(
|
||||
&mut self,
|
||||
event: &WindowEvent,
|
||||
shared: &mut SharedViewportState,
|
||||
) -> (EventResponse, bool) {
|
||||
if let WindowEvent::Resized(size) = event
|
||||
&& let (Some(width), Some(height)) =
|
||||
(NonZero::new(size.width), NonZero::new(size.height))
|
||||
{
|
||||
if shared.resized_viewport != Some(self.id) {
|
||||
shared.resized_viewport = Some(self.id);
|
||||
shared.painter.on_window_resize_state_change(self.id, true);
|
||||
}
|
||||
_ if response.repaint => Some(Action::Redraw),
|
||||
_ => None,
|
||||
};
|
||||
(response.consumed, action)
|
||||
shared.painter.on_window_resized(self.id, width, height);
|
||||
}
|
||||
let response = self.state.on_window_event(&self.window, event);
|
||||
let info = shared.viewport_info.get_mut(&self.id).unwrap();
|
||||
if let WindowEvent::CloseRequested = event {
|
||||
info.events.push(ViewportEvent::Close);
|
||||
}
|
||||
egui_winit::update_viewport_info(info, self.state.egui_ctx(), &self.window, false);
|
||||
(response, info.close_requested())
|
||||
}
|
||||
|
||||
fn redraw(&mut self, event_loop: &ActiveEventLoop) -> Option<Action> {
|
||||
let mut input = self.state.take_egui_input(&self.window);
|
||||
input.viewports = std::iter::once((ViewportId::ROOT, self.info.clone())).collect();
|
||||
let mut output = self.ctx.run_ui(input, |ui| {
|
||||
self.app.show(ui);
|
||||
});
|
||||
let clipped_primitives = self.ctx.tessellate(output.shapes, output.pixels_per_point);
|
||||
self.painter.paint_and_update_textures(
|
||||
ViewportId::ROOT,
|
||||
output.pixels_per_point,
|
||||
[0.0, 0.0, 0.0, 0.0],
|
||||
&clipped_primitives,
|
||||
&output.textures_delta,
|
||||
vec![],
|
||||
);
|
||||
fn take_egui_input(&mut self) -> RawInput {
|
||||
self.state.take_egui_input(&self.window)
|
||||
}
|
||||
|
||||
fn handle_platform_output(&mut self, platform_output: PlatformOutput) {
|
||||
self.state
|
||||
.handle_platform_output(&self.window, output.platform_output);
|
||||
.handle_platform_output(&self.window, platform_output);
|
||||
}
|
||||
|
||||
let Some(mut viewport_output) = output.viewport_output.remove(&ViewportId::ROOT) else {
|
||||
return Some(Action::Close);
|
||||
};
|
||||
|
||||
let (mut deferred_commands, recreate) = self.builder.patch(viewport_output.builder);
|
||||
if recreate {
|
||||
let (window, state) =
|
||||
create_window_and_state(&self.ctx, event_loop, &self.builder, &mut self.painter);
|
||||
egui_winit::update_viewport_info(&mut self.info, &self.ctx, &window, true);
|
||||
self.window = window;
|
||||
self.state = state;
|
||||
}
|
||||
self.commands.append(&mut deferred_commands);
|
||||
self.commands.append(&mut viewport_output.commands);
|
||||
fn process_viewport_commands(
|
||||
&self,
|
||||
commands: Vec<ViewportCommand>,
|
||||
shared: &mut SharedViewportState,
|
||||
) {
|
||||
let info = shared.viewport_info.get_mut(&self.id).unwrap();
|
||||
egui_winit::process_viewport_commands(
|
||||
&self.ctx,
|
||||
&mut self.info,
|
||||
std::mem::take(&mut self.commands),
|
||||
self.state.egui_ctx(),
|
||||
info,
|
||||
commands,
|
||||
&self.window,
|
||||
&mut vec![],
|
||||
);
|
||||
|
||||
if self.info.close_requested() {
|
||||
Some(Action::Close)
|
||||
} else {
|
||||
Some(Action::Redraw)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Viewport {
|
||||
fn drop(&mut self) {
|
||||
self.app.on_destroy();
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum UserEvent {
|
||||
GamepadEvent(gilrs::Event),
|
||||
OpenAbout,
|
||||
OpenCharacterData(SimId),
|
||||
OpenBgMap(SimId),
|
||||
OpenObjects(SimId),
|
||||
OpenWorlds(SimId),
|
||||
OpenFrameBuffers(SimId),
|
||||
OpenRegisters(SimId),
|
||||
OpenTerminal(SimId),
|
||||
OpenProfiler(SimId),
|
||||
OpenDebugger(SimId),
|
||||
OpenInput,
|
||||
OpenHotkeys,
|
||||
OpenPlayer2,
|
||||
Quit(SimId),
|
||||
}
|
||||
|
||||
pub enum Action {
|
||||
Redraw,
|
||||
Close,
|
||||
}
|
||||
|
||||
fn create_window_and_state(
|
||||
ctx: &Context,
|
||||
event_loop: &ActiveEventLoop,
|
||||
builder: &ViewportBuilder,
|
||||
painter: &mut egui_wgpu::winit::Painter,
|
||||
) -> (Arc<Window>, egui_winit::State) {
|
||||
pollster::block_on(painter.set_window(ViewportId::ROOT, None)).unwrap();
|
||||
let window = Arc::new(egui_winit::create_window(ctx, event_loop, builder).unwrap());
|
||||
pollster::block_on(painter.set_window(ViewportId::ROOT, Some(window.clone()))).unwrap();
|
||||
let state = egui_winit::State::new(
|
||||
ctx.clone(),
|
||||
ViewportId::ROOT,
|
||||
event_loop,
|
||||
Some(window.scale_factor() as f32),
|
||||
event_loop.system_theme(),
|
||||
painter.max_texture_side(),
|
||||
);
|
||||
(window, state)
|
||||
RequestRedraw(ViewportId, Instant),
|
||||
}
|
||||
|
||||
fn process_gamepad_input(mappings: MappingProvider, proxy: EventLoopProxy<UserEvent>) {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
use std::sync::Arc;
|
||||
|
||||
pub use about::AboutWindow;
|
||||
use egui::{Ui, ViewportBuilder, ViewportId};
|
||||
pub use game::GameWindow;
|
||||
pub use game_screen::DisplayMode;
|
||||
use egui::{Ui, ViewportBuilder};
|
||||
pub use game::{ChildWindow, GameWindow};
|
||||
pub use game_screen::{DisplayMode, GameScreen};
|
||||
pub use gdb::GdbServerWindow;
|
||||
pub use hotkeys::HotkeysWindow;
|
||||
pub use input::InputWindow;
|
||||
|
|
@ -28,7 +28,6 @@ mod utils;
|
|||
mod vip;
|
||||
|
||||
pub trait AppWindow {
|
||||
fn viewport_id(&self) -> ViewportId;
|
||||
fn sim_id(&self) -> SimId {
|
||||
SimId::Player1
|
||||
}
|
||||
|
|
@ -40,7 +39,6 @@ pub trait AppWindow {
|
|||
fn on_init(&mut self, args: InitArgs) {
|
||||
let _ = args;
|
||||
}
|
||||
fn on_destroy(&mut self) {}
|
||||
fn handle_key_event(&mut self, event: &KeyEvent) -> bool {
|
||||
let _ = event;
|
||||
false
|
||||
|
|
|
|||
|
|
@ -1,14 +1,10 @@
|
|||
use egui::{CentralPanel, Image, Ui, ViewportBuilder, ViewportId};
|
||||
use egui::{CentralPanel, Image, Ui, ViewportBuilder};
|
||||
|
||||
use super::AppWindow;
|
||||
|
||||
pub struct AboutWindow;
|
||||
|
||||
impl AppWindow for AboutWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of("About")
|
||||
}
|
||||
|
||||
fn initial_viewport(&self) -> ViewportBuilder {
|
||||
ViewportBuilder::default()
|
||||
.with_title("About Lemur")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
use std::{
|
||||
sync::{Arc, mpsc},
|
||||
ops::{Deref, DerefMut},
|
||||
sync::{Arc, Mutex, atomic::AtomicBool, mpsc},
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
|
|
@ -7,17 +8,23 @@ use crate::{
|
|||
app::UserEvent,
|
||||
config::{COLOR_PRESETS, SimConfig},
|
||||
emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
|
||||
input::{Command, ShortcutProvider},
|
||||
images::ImageTextureLoader,
|
||||
input::{Command, MappingProvider, ShortcutProvider},
|
||||
memory::MemoryClient,
|
||||
persistence::Persistence,
|
||||
window::InitArgs,
|
||||
window::{
|
||||
AboutWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GdbServerWindow,
|
||||
HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow, RegisterWindow,
|
||||
TerminalWindow, WorldWindow, utils::UiData,
|
||||
},
|
||||
};
|
||||
use anyhow::Context as _;
|
||||
use egui::{
|
||||
Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, Panel, Ui, Vec2,
|
||||
ViewportBuilder, ViewportCommand, ViewportId, Window,
|
||||
ViewportBuilder, ViewportCommand, ViewportId, ViewportIdMap, Window,
|
||||
};
|
||||
use egui_notify::{Anchor, Toast, Toasts};
|
||||
use winit::event_loop::EventLoopProxy;
|
||||
use winit::{event::KeyEvent, event_loop::EventLoopProxy};
|
||||
|
||||
use super::{
|
||||
AppWindow,
|
||||
|
|
@ -26,6 +33,7 @@ use super::{
|
|||
};
|
||||
|
||||
pub struct GameWindow {
|
||||
viewport_id: ViewportId,
|
||||
client: EmulatorClient,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
persistence: Persistence,
|
||||
|
|
@ -34,17 +42,29 @@ pub struct GameWindow {
|
|||
config: SimConfig,
|
||||
toasts: Toasts,
|
||||
screen: Option<GameScreen>,
|
||||
messages: Option<mpsc::Receiver<Toast>>,
|
||||
messages: mpsc::Receiver<Toast>,
|
||||
message_sink: mpsc::Sender<Toast>,
|
||||
color_picker: Option<ColorPickerState>,
|
||||
window: Option<Arc<winit::window::Window>>,
|
||||
memory: Arc<MemoryClient>,
|
||||
images: Arc<ImageTextureLoader>,
|
||||
mappings: MappingProvider,
|
||||
children: ViewportIdMap<ChildWindowWrapper>,
|
||||
child_sizes: UiData<ViewportIdMap<Vec2>>,
|
||||
queued_children: Vec<ChildWindow>,
|
||||
}
|
||||
|
||||
impl GameWindow {
|
||||
#[expect(clippy::too_many_arguments)]
|
||||
pub fn new(
|
||||
viewport_id: ViewportId,
|
||||
client: EmulatorClient,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
persistence: Persistence,
|
||||
shortcuts: ShortcutProvider,
|
||||
memory: &Arc<MemoryClient>,
|
||||
images: &Arc<ImageTextureLoader>,
|
||||
mappings: MappingProvider,
|
||||
sim_id: SimId,
|
||||
) -> Self {
|
||||
let config = SimConfig::load(&persistence, sim_id);
|
||||
|
|
@ -52,7 +72,9 @@ impl GameWindow {
|
|||
.with_anchor(Anchor::BottomLeft)
|
||||
.with_margin((10.0, 10.0).into())
|
||||
.reverse(true);
|
||||
let (message_sink, messages) = mpsc::channel();
|
||||
Self {
|
||||
viewport_id,
|
||||
client,
|
||||
proxy,
|
||||
persistence,
|
||||
|
|
@ -61,9 +83,146 @@ impl GameWindow {
|
|||
config,
|
||||
toasts,
|
||||
screen: None,
|
||||
messages: None,
|
||||
messages,
|
||||
message_sink,
|
||||
color_picker: None,
|
||||
window: None,
|
||||
memory: memory.clone(),
|
||||
images: images.clone(),
|
||||
mappings: mappings.clone(),
|
||||
children: ViewportIdMap::default(),
|
||||
child_sizes: UiData::new(),
|
||||
queued_children: vec![],
|
||||
}
|
||||
}
|
||||
|
||||
pub fn open(&mut self, window: ChildWindow) {
|
||||
// queue opening this child until our next render call,
|
||||
// so that we get a chance to look up its size
|
||||
self.queued_children.push(window);
|
||||
}
|
||||
|
||||
pub fn close(&mut self, window: ChildWindow) {
|
||||
let id = window.viewport_id(self.sim_id);
|
||||
self.children.remove(&id);
|
||||
}
|
||||
|
||||
fn do_open(&mut self, window: ChildWindow) {
|
||||
let viewport_id = window.viewport_id(self.sim_id);
|
||||
if self.children.contains_key(&viewport_id) {
|
||||
return;
|
||||
}
|
||||
let child = match window {
|
||||
ChildWindow::About => AppWrapper::of_dyn(AboutWindow),
|
||||
ChildWindow::CharacterData => AppWrapper::of_dyn(CharacterDataWindow::new(
|
||||
self.sim_id,
|
||||
&self.memory,
|
||||
&self.images,
|
||||
)),
|
||||
ChildWindow::BgMap => {
|
||||
AppWrapper::of_dyn(BgMapWindow::new(self.sim_id, &self.memory, &self.images))
|
||||
}
|
||||
ChildWindow::Objects => {
|
||||
AppWrapper::of_dyn(ObjectWindow::new(self.sim_id, &self.memory, &self.images))
|
||||
}
|
||||
ChildWindow::Worlds => {
|
||||
AppWrapper::of_dyn(WorldWindow::new(self.sim_id, &self.memory, &self.images))
|
||||
}
|
||||
ChildWindow::FrameBuffers => AppWrapper::of_dyn(FrameBufferWindow::new(
|
||||
self.sim_id,
|
||||
&self.memory,
|
||||
&self.images,
|
||||
)),
|
||||
ChildWindow::Registers => {
|
||||
AppWrapper::of_dyn(RegisterWindow::new(self.sim_id, &self.memory))
|
||||
}
|
||||
ChildWindow::Terminal => {
|
||||
AppWrapper::of_dyn(TerminalWindow::new(self.sim_id, &self.client))
|
||||
}
|
||||
ChildWindow::Profiler { launch } => {
|
||||
let mut profile = ProfileWindow::new(self.sim_id, self.client.clone());
|
||||
if launch {
|
||||
profile.launch();
|
||||
}
|
||||
AppWrapper::of_dyn(profile)
|
||||
}
|
||||
ChildWindow::Debugger { port } => {
|
||||
let mut debugger =
|
||||
GdbServerWindow::new(self.sim_id, self.client.clone(), self.proxy.clone());
|
||||
if let Some(port) = port {
|
||||
debugger.launch(port);
|
||||
}
|
||||
AppWrapper::of_dyn(debugger)
|
||||
}
|
||||
ChildWindow::Input => AppWrapper::of_dyn(InputWindow::new(self.mappings.clone())),
|
||||
ChildWindow::Hotkeys => AppWrapper::of_dyn(HotkeysWindow::new(self.shortcuts.clone())),
|
||||
ChildWindow::Player2 => {
|
||||
if self.sim_id == SimId::Player2 {
|
||||
return;
|
||||
}
|
||||
AppWrapper::of_game(GameWindow::new(
|
||||
viewport_id,
|
||||
self.client.clone(),
|
||||
self.proxy.clone(),
|
||||
self.persistence.clone(),
|
||||
self.shortcuts.clone(),
|
||||
&self.memory,
|
||||
&self.images,
|
||||
self.mappings.clone(),
|
||||
SimId::Player2,
|
||||
))
|
||||
}
|
||||
};
|
||||
|
||||
let mut viewport = child.initial_viewport();
|
||||
if let Some(size) = self.child_sizes.get(&viewport_id) {
|
||||
viewport.inner_size = Some(*size);
|
||||
}
|
||||
self.children.insert(
|
||||
viewport_id,
|
||||
ChildWindowWrapper {
|
||||
app: Arc::new(Mutex::new(child)),
|
||||
updates: Some(viewport),
|
||||
close_requested: Arc::new(AtomicBool::new(false)),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
pub fn handle_init(&mut self, viewport_id: ViewportId, args: InitArgs) {
|
||||
self.handle_event(viewport_id, |window| window.on_init(args))
|
||||
}
|
||||
|
||||
pub fn handle_key_event(&mut self, viewport_id: ViewportId, event: &KeyEvent) -> bool {
|
||||
self.handle_event(viewport_id, |window| window.handle_key_event(event))
|
||||
}
|
||||
|
||||
pub fn handle_gamepad_event(&mut self, viewport_id: ViewportId, event: &gilrs::Event) -> bool {
|
||||
self.handle_event(viewport_id, |window| window.handle_gamepad_event(event))
|
||||
}
|
||||
|
||||
fn handle_event<F, R>(&mut self, viewport_id: ViewportId, cb: F) -> R
|
||||
where
|
||||
F: FnOnce(&mut dyn AppWindow) -> R,
|
||||
R: Default,
|
||||
{
|
||||
let p2_viewport_id = ChildWindow::Player2.viewport_id(SimId::Player1);
|
||||
|
||||
if self.viewport_id == viewport_id {
|
||||
cb(self)
|
||||
} else if let Some(child) = self.children.get_mut(&viewport_id) {
|
||||
cb(child.app.lock().unwrap().deref_mut().deref_mut())
|
||||
} else if let Some(mut p2) = self
|
||||
.children
|
||||
.get_mut(&p2_viewport_id)
|
||||
.map(|w| w.app.lock().unwrap())
|
||||
{
|
||||
if let AppWrapper::Game(g) = p2.deref_mut() {
|
||||
g.handle_event(viewport_id, cb)
|
||||
} else {
|
||||
R::default()
|
||||
}
|
||||
} else {
|
||||
R::default()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -217,7 +376,7 @@ impl GameWindow {
|
|||
{
|
||||
self.client
|
||||
.send_command(EmulatorCommand::StartSecondSim(None));
|
||||
self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
|
||||
self.open(ChildWindow::Player2);
|
||||
}
|
||||
if has_player_2 {
|
||||
let linked = self.client.are_sims_linked();
|
||||
|
|
@ -231,55 +390,37 @@ impl GameWindow {
|
|||
});
|
||||
ui.menu_button("Tools", |ui| {
|
||||
if ui.button("Terminal").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenTerminal(self.sim_id))
|
||||
.unwrap();
|
||||
self.open(ChildWindow::Terminal);
|
||||
}
|
||||
if ui.button("Profiler").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenProfiler(self.sim_id))
|
||||
.unwrap();
|
||||
self.open(ChildWindow::Profiler { launch: false });
|
||||
}
|
||||
if ui.button("GDB Server").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenDebugger(self.sim_id))
|
||||
.unwrap();
|
||||
self.open(ChildWindow::Debugger { port: None });
|
||||
}
|
||||
ui.separator();
|
||||
if ui.button("Character Data").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenCharacterData(self.sim_id))
|
||||
.unwrap();
|
||||
self.open(ChildWindow::CharacterData);
|
||||
}
|
||||
if ui.button("Background Maps").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenBgMap(self.sim_id))
|
||||
.unwrap();
|
||||
self.open(ChildWindow::BgMap);
|
||||
}
|
||||
if ui.button("Objects").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenObjects(self.sim_id))
|
||||
.unwrap();
|
||||
self.open(ChildWindow::Objects);
|
||||
}
|
||||
if ui.button("Worlds").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenWorlds(self.sim_id))
|
||||
.unwrap();
|
||||
self.open(ChildWindow::Worlds);
|
||||
}
|
||||
if ui.button("Frame Buffers").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenFrameBuffers(self.sim_id))
|
||||
.unwrap();
|
||||
self.open(ChildWindow::FrameBuffers);
|
||||
}
|
||||
if ui.button("Registers").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenRegisters(self.sim_id))
|
||||
.unwrap();
|
||||
self.open(ChildWindow::Registers);
|
||||
}
|
||||
});
|
||||
ui.menu_button("Help", |ui| {
|
||||
if ui.button("About").clicked() {
|
||||
self.proxy.send_event(UserEvent::OpenAbout).unwrap();
|
||||
self.open(ChildWindow::About);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -424,11 +565,11 @@ impl GameWindow {
|
|||
});
|
||||
ui.menu_button("Input", |ui| {
|
||||
if ui.button("Bind Inputs").clicked() {
|
||||
self.proxy.send_event(UserEvent::OpenInput).unwrap();
|
||||
self.open(ChildWindow::Input);
|
||||
}
|
||||
});
|
||||
if ui.button("Hotkeys").clicked() {
|
||||
self.proxy.send_event(UserEvent::OpenHotkeys).unwrap();
|
||||
self.open(ChildWindow::Hotkeys);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -480,13 +621,6 @@ impl GameWindow {
|
|||
}
|
||||
|
||||
impl AppWindow for GameWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
match self.sim_id {
|
||||
SimId::Player1 => ViewportId::ROOT,
|
||||
SimId::Player2 => ViewportId::from_hash_of("Player2"),
|
||||
}
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
@ -498,16 +632,15 @@ impl AppWindow for GameWindow {
|
|||
}
|
||||
|
||||
fn show(&mut self, ui: &mut Ui) {
|
||||
self.child_sizes.load(ui);
|
||||
let dimensions = {
|
||||
let bounds = ui.content_rect();
|
||||
bounds.max - bounds.min
|
||||
};
|
||||
self.update_config(|c| c.dimensions = dimensions);
|
||||
|
||||
if let Some(messages) = self.messages.as_mut() {
|
||||
while let Ok(toast) = messages.try_recv() {
|
||||
self.toasts.add(toast);
|
||||
}
|
||||
while let Ok(toast) = self.messages.try_recv() {
|
||||
self.toasts.add(toast);
|
||||
}
|
||||
Panel::top("menubar")
|
||||
.exact_size(22.0)
|
||||
|
|
@ -533,22 +666,49 @@ impl AppWindow for GameWindow {
|
|||
}
|
||||
});
|
||||
self.toasts.show(ui);
|
||||
for window in std::mem::take(&mut self.queued_children) {
|
||||
self.do_open(window);
|
||||
}
|
||||
self.children.retain(|id, child| {
|
||||
if child
|
||||
.close_requested
|
||||
.load(std::sync::atomic::Ordering::Relaxed)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
let app = child.app.clone();
|
||||
let viewport_builder = child.updates.take().unwrap_or_default();
|
||||
let close_requested = child.close_requested.clone();
|
||||
let size = ui.input_for(*id, |v| v.viewport_rect().size());
|
||||
self.child_sizes.insert(*id, size);
|
||||
ui.show_viewport_deferred(*id, viewport_builder, move |ui, _| {
|
||||
app.lock().unwrap().show(ui);
|
||||
if ui.input(|s| s.viewport().close_requested()) {
|
||||
close_requested.store(true, std::sync::atomic::Ordering::Relaxed);
|
||||
}
|
||||
});
|
||||
true
|
||||
});
|
||||
self.child_sizes.save(ui);
|
||||
ui.request_repaint_after(Duration::from_millis(10));
|
||||
}
|
||||
|
||||
fn on_init(&mut self, args: InitArgs) {
|
||||
let (screen, sink) = GameScreen::init(args.render_state);
|
||||
let (message_sink, message_source) = mpsc::channel();
|
||||
self.client.send_command(EmulatorCommand::ConnectToSim(
|
||||
self.sim_id,
|
||||
sink,
|
||||
message_sink,
|
||||
));
|
||||
self.screen = Some(screen);
|
||||
self.messages = Some(message_source);
|
||||
if self.screen.is_none() {
|
||||
let (screen, sink) = GameScreen::init(args.render_state);
|
||||
self.client.send_command(EmulatorCommand::ConnectToSim(
|
||||
self.sim_id,
|
||||
sink,
|
||||
self.message_sink.clone(),
|
||||
));
|
||||
self.screen = Some(screen);
|
||||
}
|
||||
self.window = Some(args.window.clone());
|
||||
}
|
||||
}
|
||||
|
||||
fn on_destroy(&mut self) {
|
||||
impl Drop for GameWindow {
|
||||
fn drop(&mut self) {
|
||||
if self.sim_id == SimId::Player2 {
|
||||
self.client.send_command(EmulatorCommand::StopSecondSim);
|
||||
}
|
||||
|
|
@ -561,3 +721,77 @@ struct ColorPickerState {
|
|||
just_opened: bool,
|
||||
unpause_on_close: bool,
|
||||
}
|
||||
|
||||
struct ChildWindowWrapper {
|
||||
app: Arc<Mutex<AppWrapper>>,
|
||||
updates: Option<ViewportBuilder>,
|
||||
close_requested: Arc<AtomicBool>,
|
||||
}
|
||||
enum AppWrapper {
|
||||
Game(Box<GameWindow>),
|
||||
Dyn(Box<dyn AppWindow + Send + 'static>),
|
||||
}
|
||||
impl AppWrapper {
|
||||
fn of_game(game: GameWindow) -> Self {
|
||||
Self::Game(Box::new(game))
|
||||
}
|
||||
fn of_dyn<T: AppWindow + Send + 'static>(inner: T) -> Self {
|
||||
Self::Dyn(Box::new(inner))
|
||||
}
|
||||
}
|
||||
impl Deref for AppWrapper {
|
||||
type Target = dyn AppWindow + Send + 'static;
|
||||
fn deref(&self) -> &Self::Target {
|
||||
match self {
|
||||
Self::Dyn(inner) => inner.as_ref(),
|
||||
Self::Game(inner) => inner.as_ref(),
|
||||
}
|
||||
}
|
||||
}
|
||||
impl DerefMut for AppWrapper {
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
match self {
|
||||
Self::Dyn(inner) => inner.as_mut(),
|
||||
Self::Game(inner) => inner.as_mut(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum ChildWindow {
|
||||
About,
|
||||
CharacterData,
|
||||
BgMap,
|
||||
Objects,
|
||||
Worlds,
|
||||
FrameBuffers,
|
||||
Registers,
|
||||
Terminal,
|
||||
Profiler { launch: bool },
|
||||
Debugger { port: Option<u16> },
|
||||
Input,
|
||||
Hotkeys,
|
||||
Player2,
|
||||
}
|
||||
impl ChildWindow {
|
||||
fn viewport_id(&self, sim_id: SimId) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("{sim_id:?}{}", self.name()))
|
||||
}
|
||||
fn name(&self) -> &'static str {
|
||||
match self {
|
||||
Self::About => "About",
|
||||
Self::CharacterData => "CharacterData",
|
||||
Self::BgMap => "BgMap",
|
||||
Self::Objects => "Objects",
|
||||
Self::Worlds => "Worlds",
|
||||
Self::FrameBuffers => "FrameBuffers",
|
||||
Self::Registers => "Registers",
|
||||
Self::Terminal => "Terminal",
|
||||
Self::Profiler { .. } => "Profiler",
|
||||
Self::Debugger { .. } => "Debugger",
|
||||
Self::Input => "Input",
|
||||
Self::Hotkeys => "Hotkeys",
|
||||
Self::Player2 => "Player2",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ pub struct GameScreen {
|
|||
}
|
||||
|
||||
impl GameScreen {
|
||||
fn init_pipeline(render_state: &egui_wgpu::RenderState) {
|
||||
pub fn init_pipeline(render_state: &egui_wgpu::RenderState) {
|
||||
let device = &render_state.device;
|
||||
|
||||
let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
|
||||
|
|
@ -117,8 +117,6 @@ impl GameScreen {
|
|||
}
|
||||
|
||||
pub fn init(render_state: &egui_wgpu::RenderState) -> (Self, TextureSink) {
|
||||
Self::init_pipeline(render_state);
|
||||
|
||||
let device = &render_state.device;
|
||||
let queue = &render_state.queue;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use egui::{Button, CentralPanel, TextEdit, ViewportBuilder, ViewportId};
|
||||
use egui::{Button, CentralPanel, TextEdit, ViewportBuilder};
|
||||
use winit::event_loop::EventLoopProxy;
|
||||
|
||||
use crate::{
|
||||
|
|
@ -42,10 +42,6 @@ impl GdbServerWindow {
|
|||
}
|
||||
|
||||
impl AppWindow for GdbServerWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("Debugger-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
use egui::{
|
||||
Button, CentralPanel, Event, KeyboardShortcut, Label, Layout, Slider, Ui, ViewportBuilder,
|
||||
ViewportId,
|
||||
};
|
||||
use egui_extras::{Column, TableBuilder};
|
||||
|
||||
|
|
@ -125,10 +124,6 @@ impl HotkeysWindow {
|
|||
}
|
||||
|
||||
impl AppWindow for HotkeysWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of("shortcuts")
|
||||
}
|
||||
|
||||
fn initial_viewport(&self) -> ViewportBuilder {
|
||||
ViewportBuilder::default()
|
||||
.with_title("Keyboard Shortcuts")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use egui::{Button, CentralPanel, Label, Layout, Panel, Ui, ViewportBuilder, ViewportId};
|
||||
use egui::{Button, CentralPanel, Label, Layout, Panel, Ui, ViewportBuilder};
|
||||
use egui_extras::{Column, TableBuilder};
|
||||
use gilrs::{EventType, GamepadId};
|
||||
use std::sync::RwLock;
|
||||
|
|
@ -160,10 +160,6 @@ impl InputWindow {
|
|||
}
|
||||
|
||||
impl AppWindow for InputWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of("input")
|
||||
}
|
||||
|
||||
fn initial_viewport(&self) -> ViewportBuilder {
|
||||
ViewportBuilder::default()
|
||||
.with_title("Bind Inputs")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
use std::{fs, sync::Arc, time::Duration};
|
||||
|
||||
use anyhow::Result;
|
||||
use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder, ViewportId};
|
||||
use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder};
|
||||
use egui_notify::{Anchor, Toast, Toasts};
|
||||
use winit::window::Window;
|
||||
|
||||
|
|
@ -82,10 +82,6 @@ impl ProfileWindow {
|
|||
}
|
||||
|
||||
impl AppWindow for ProfileWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("Profile-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
use std::{collections::VecDeque, sync::mpsc};
|
||||
|
||||
use egui::{
|
||||
Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder, ViewportId,
|
||||
};
|
||||
use egui::{Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder};
|
||||
|
||||
use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
|
||||
|
||||
|
|
@ -31,10 +29,6 @@ impl TerminalWindow {
|
|||
}
|
||||
|
||||
impl AppWindow for TerminalWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("terminal-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use std::{
|
||||
fmt::{Display, UpperHex},
|
||||
ops::{Bound, RangeBounds},
|
||||
ops::{Bound, Deref, DerefMut, RangeBounds},
|
||||
str::FromStr,
|
||||
};
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ use atoi::FromRadix16;
|
|||
use egui::{
|
||||
Align, Color32, CornerRadius, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response,
|
||||
RichText, Sense, Shape, Stroke, StrokeKind, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
|
||||
ecolor::HexColor,
|
||||
ecolor::HexColor, util::id_type_map::SerializableAny,
|
||||
};
|
||||
use num_traits::{CheckedAdd, CheckedSub, One};
|
||||
|
||||
|
|
@ -409,3 +409,51 @@ impl ResponseExt for Response {
|
|||
self.clicked() || self.dragged()
|
||||
}
|
||||
}
|
||||
|
||||
pub struct UiData<T> {
|
||||
current: T,
|
||||
prev: T,
|
||||
loaded: bool,
|
||||
}
|
||||
|
||||
impl<T> UiData<T>
|
||||
where
|
||||
T: Default + PartialEq + SerializableAny,
|
||||
{
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
current: T::default(),
|
||||
prev: T::default(),
|
||||
loaded: false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn load(&mut self, ui: &Ui) {
|
||||
if !self.loaded {
|
||||
self.current = ui
|
||||
.data_mut(|d| d.get_persisted(ui.id()))
|
||||
.unwrap_or_default();
|
||||
self.loaded = true;
|
||||
}
|
||||
}
|
||||
|
||||
pub fn save(&mut self, ui: &Ui) {
|
||||
if self.current != self.prev {
|
||||
ui.data_mut(|d| d.insert_persisted(ui.id(), self.current.clone()));
|
||||
self.prev = self.current.clone();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> Deref for UiData<T> {
|
||||
type Target = T;
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.current
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> DerefMut for UiData<T> {
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
&mut self.current
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@ use std::sync::Arc;
|
|||
|
||||
use egui::{
|
||||
Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
|
||||
TextureOptions, Ui, ViewportBuilder, ViewportId,
|
||||
TextureOptions, Ui, ViewportBuilder,
|
||||
};
|
||||
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{
|
||||
emulator::SimId,
|
||||
|
|
@ -12,36 +13,56 @@ use crate::{
|
|||
memory::{MemoryClient, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
utils::{NumberEdit, UiExt},
|
||||
utils::{NumberEdit, UiData, UiExt},
|
||||
},
|
||||
};
|
||||
|
||||
use super::utils::{self, CellData, CharacterGrid};
|
||||
|
||||
#[derive(Clone, PartialEq, Serialize, Deserialize)]
|
||||
struct State {
|
||||
cell_index: usize,
|
||||
generic_palette: bool,
|
||||
scale: f32,
|
||||
show_grid: bool,
|
||||
}
|
||||
impl Default for State {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
cell_index: 0,
|
||||
generic_palette: false,
|
||||
scale: 1.0,
|
||||
show_grid: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct BgMapWindow {
|
||||
sim_id: SimId,
|
||||
memory: Arc<MemoryClient>,
|
||||
bgmaps: MemoryView,
|
||||
cell_index: usize,
|
||||
generic_palette: bool,
|
||||
params: ImageParams<BgMapParams>,
|
||||
scale: f32,
|
||||
show_grid: bool,
|
||||
state: UiData<State>,
|
||||
}
|
||||
|
||||
impl BgMapWindow {
|
||||
pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
|
||||
let state: UiData<State> = UiData::new();
|
||||
let renderer = BgMapRenderer::new(sim_id, memory);
|
||||
let params = images.add(sim_id, renderer, BgMapParams::default());
|
||||
let params = images.add(
|
||||
sim_id,
|
||||
renderer,
|
||||
BgMapParams {
|
||||
cell_index: state.cell_index,
|
||||
generic_palette: state.generic_palette,
|
||||
},
|
||||
);
|
||||
Self {
|
||||
sim_id,
|
||||
memory: memory.clone(),
|
||||
bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
|
||||
cell_index: params.cell_index,
|
||||
generic_palette: params.generic_palette,
|
||||
params,
|
||||
scale: 1.0,
|
||||
show_grid: false,
|
||||
state,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -57,10 +78,11 @@ impl BgMapWindow {
|
|||
ui.label("Map");
|
||||
});
|
||||
row.col(|ui| {
|
||||
let mut bgmap_index = self.cell_index / 4096;
|
||||
let mut bgmap_index = self.state.cell_index / 4096;
|
||||
ui.add(NumberEdit::new(&mut bgmap_index).range(0..16));
|
||||
if bgmap_index != self.cell_index / 4096 {
|
||||
self.cell_index = (bgmap_index * 4096) + (self.cell_index % 4096);
|
||||
if bgmap_index != self.state.cell_index / 4096 {
|
||||
self.state.cell_index =
|
||||
(bgmap_index * 4096) + (self.state.cell_index % 4096);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -69,7 +91,7 @@ impl BgMapWindow {
|
|||
ui.label("Cell");
|
||||
});
|
||||
row.col(|ui| {
|
||||
ui.add(NumberEdit::new(&mut self.cell_index).range(0..16 * 4096));
|
||||
ui.add(NumberEdit::new(&mut self.state.cell_index).range(0..16 * 4096));
|
||||
});
|
||||
});
|
||||
body.row(row_height, |mut row| {
|
||||
|
|
@ -77,7 +99,7 @@ impl BgMapWindow {
|
|||
ui.label("Address");
|
||||
});
|
||||
row.col(|ui| {
|
||||
let address = 0x00020000 + (self.cell_index * 2);
|
||||
let address = 0x00020000 + (self.state.cell_index * 2);
|
||||
let mut address_str = format!("{address:08x}");
|
||||
ui.add_enabled(
|
||||
false,
|
||||
|
|
@ -91,7 +113,7 @@ impl BgMapWindow {
|
|||
.texture_options(TextureOptions::NEAREST);
|
||||
ui.add(image);
|
||||
ui.section("Cell", |ui| {
|
||||
let mut data = self.bgmaps.borrow().read::<u16>(self.cell_index);
|
||||
let mut data = self.bgmaps.borrow().read::<u16>(self.state.cell_index);
|
||||
let mut cell = CellData::parse(data);
|
||||
TableBuilder::new(ui)
|
||||
.column(Column::remainder())
|
||||
|
|
@ -134,7 +156,7 @@ impl BgMapWindow {
|
|||
});
|
||||
});
|
||||
if cell.update(&mut data) {
|
||||
let address = 0x00020000 + (self.cell_index * 2);
|
||||
let address = 0x00020000 + (self.state.cell_index * 2);
|
||||
self.memory.write(self.sim_id, address as u32, &data);
|
||||
}
|
||||
});
|
||||
|
|
@ -142,37 +164,33 @@ impl BgMapWindow {
|
|||
ui.horizontal(|ui| {
|
||||
ui.label("Scale");
|
||||
ui.spacing_mut().slider_width = ui.available_width();
|
||||
let slider = Slider::new(&mut self.scale, 1.0..=10.0)
|
||||
let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
|
||||
.step_by(1.0)
|
||||
.show_value(false);
|
||||
ui.add(slider);
|
||||
});
|
||||
ui.checkbox(&mut self.show_grid, "Show grid");
|
||||
ui.checkbox(&mut self.generic_palette, "Generic palette");
|
||||
ui.checkbox(&mut self.state.show_grid, "Show grid");
|
||||
ui.checkbox(&mut self.state.generic_palette, "Generic palette");
|
||||
});
|
||||
});
|
||||
self.params.write(BgMapParams {
|
||||
cell_index: self.cell_index,
|
||||
generic_palette: self.generic_palette,
|
||||
cell_index: self.state.cell_index,
|
||||
generic_palette: self.state.generic_palette,
|
||||
});
|
||||
}
|
||||
|
||||
fn show_bgmap(&mut self, ui: &mut Ui) {
|
||||
let grid = CharacterGrid::new(self.image_url("bgmap"))
|
||||
.with_scale(self.scale)
|
||||
.with_grid(self.show_grid)
|
||||
.with_selected(self.cell_index % 4096);
|
||||
.with_scale(self.state.scale)
|
||||
.with_grid(self.state.show_grid)
|
||||
.with_selected(self.state.cell_index % 4096);
|
||||
if let Some(selected) = grid.show(ui) {
|
||||
self.cell_index = (self.cell_index / 4096 * 4096) + selected;
|
||||
self.state.cell_index = (self.state.cell_index / 4096 * 4096) + selected;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AppWindow for BgMapWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("bgmap-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
@ -184,6 +202,7 @@ impl AppWindow for BgMapWindow {
|
|||
}
|
||||
|
||||
fn show(&mut self, ui: &mut Ui) {
|
||||
self.state.load(ui);
|
||||
CentralPanel::default().show_inside(ui, |ui| {
|
||||
ui.horizontal_top(|ui| {
|
||||
StripBuilder::new(ui)
|
||||
|
|
@ -199,6 +218,7 @@ impl AppWindow for BgMapWindow {
|
|||
})
|
||||
});
|
||||
});
|
||||
self.state.save(ui);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use std::fmt::Display;
|
|||
|
||||
use egui::{
|
||||
Align, CentralPanel, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
|
||||
Ui, Vec2, ViewportBuilder, ViewportId,
|
||||
Ui, Vec2, ViewportBuilder,
|
||||
};
|
||||
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
@ -13,7 +13,7 @@ use crate::{
|
|||
memory::{MemoryClient, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
utils::{NumberEdit, UiExt as _},
|
||||
utils::{NumberEdit, UiData, UiExt as _},
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -79,30 +79,50 @@ impl Display for Palette {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, PartialEq, Serialize, Deserialize)]
|
||||
struct State {
|
||||
palette: Palette,
|
||||
index: usize,
|
||||
scale: f32,
|
||||
show_grid: bool,
|
||||
}
|
||||
impl Default for State {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
palette: Palette::default(),
|
||||
index: 0,
|
||||
scale: 4.0,
|
||||
show_grid: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct CharacterDataWindow {
|
||||
sim_id: SimId,
|
||||
brightness: MemoryView,
|
||||
palettes: MemoryView,
|
||||
palette: Palette,
|
||||
index: usize,
|
||||
params: ImageParams<CharDataParams>,
|
||||
scale: f32,
|
||||
show_grid: bool,
|
||||
state: UiData<State>,
|
||||
}
|
||||
|
||||
impl CharacterDataWindow {
|
||||
pub fn new(sim_id: SimId, memory: &MemoryClient, images: &ImageTextureLoader) -> Self {
|
||||
let state: UiData<State> = UiData::new();
|
||||
let renderer = CharDataRenderer::new(sim_id, memory);
|
||||
let params = images.add(sim_id, renderer, CharDataParams::default());
|
||||
let params = images.add(
|
||||
sim_id,
|
||||
renderer,
|
||||
CharDataParams {
|
||||
palette: state.palette,
|
||||
index: state.index,
|
||||
},
|
||||
);
|
||||
Self {
|
||||
sim_id,
|
||||
brightness: memory.watch(sim_id, 0x0005f824, 8),
|
||||
palettes: memory.watch(sim_id, 0x0005f860, 16),
|
||||
palette: params.palette,
|
||||
index: params.index,
|
||||
params,
|
||||
scale: 4.0,
|
||||
show_grid: true,
|
||||
state,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -118,7 +138,7 @@ impl CharacterDataWindow {
|
|||
ui.label("Index");
|
||||
});
|
||||
row.col(|ui| {
|
||||
ui.add(NumberEdit::new(&mut self.index).range(0..2048));
|
||||
ui.add(NumberEdit::new(&mut self.state.index).range(0..2048));
|
||||
});
|
||||
});
|
||||
body.row(row_height, |mut row| {
|
||||
|
|
@ -126,11 +146,11 @@ impl CharacterDataWindow {
|
|||
ui.label("Address");
|
||||
});
|
||||
row.col(|ui| {
|
||||
let address = match self.index {
|
||||
0x000..0x200 => 0x00060000 + self.index * 16,
|
||||
0x200..0x400 => 0x000e0000 + (self.index - 0x200) * 16,
|
||||
0x400..0x600 => 0x00160000 + (self.index - 0x400) * 16,
|
||||
0x600..0x800 => 0x001e0000 + (self.index - 0x600) * 16,
|
||||
let address = match self.state.index {
|
||||
0x000..0x200 => 0x00060000 + self.state.index * 16,
|
||||
0x200..0x400 => 0x000e0000 + (self.state.index - 0x200) * 16,
|
||||
0x400..0x600 => 0x00160000 + (self.state.index - 0x400) * 16,
|
||||
0x600..0x800 => 0x001e0000 + (self.state.index - 0x600) * 16,
|
||||
_ => unreachable!("can't happen"),
|
||||
};
|
||||
let mut address_str = format!("{address:08x}");
|
||||
|
|
@ -145,7 +165,7 @@ impl CharacterDataWindow {
|
|||
ui.label("Mirror");
|
||||
});
|
||||
row.col(|ui| {
|
||||
let mirror = 0x00078000 + (self.index * 16);
|
||||
let mirror = 0x00078000 + (self.state.index * 16);
|
||||
let mut mirror_str = format!("{mirror:08x}");
|
||||
ui.add_enabled(
|
||||
false,
|
||||
|
|
@ -162,12 +182,12 @@ impl CharacterDataWindow {
|
|||
ui.horizontal(|ui| {
|
||||
ui.label("Palette");
|
||||
ComboBox::from_id_salt("palette")
|
||||
.selected_text(self.palette.to_string())
|
||||
.selected_text(self.state.palette.to_string())
|
||||
.width(ui.available_width())
|
||||
.show_ui(ui, |ui| {
|
||||
for palette in Palette::values() {
|
||||
ui.selectable_value(
|
||||
&mut self.palette,
|
||||
&mut self.state.palette,
|
||||
palette,
|
||||
palette.to_string(),
|
||||
);
|
||||
|
|
@ -194,23 +214,23 @@ impl CharacterDataWindow {
|
|||
ui.horizontal(|ui| {
|
||||
ui.label("Scale");
|
||||
ui.spacing_mut().slider_width = ui.available_width();
|
||||
let slider = Slider::new(&mut self.scale, 1.0..=10.0)
|
||||
let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
|
||||
.step_by(1.0)
|
||||
.show_value(false);
|
||||
ui.add(slider);
|
||||
});
|
||||
ui.checkbox(&mut self.show_grid, "Show grid");
|
||||
ui.checkbox(&mut self.state.show_grid, "Show grid");
|
||||
});
|
||||
});
|
||||
|
||||
self.params.write(CharDataParams {
|
||||
palette: self.palette,
|
||||
index: self.index,
|
||||
palette: self.state.palette,
|
||||
index: self.state.index,
|
||||
});
|
||||
}
|
||||
|
||||
fn load_palette_colors(&self) -> [Color32; 4] {
|
||||
let Some(offset) = self.palette.offset() else {
|
||||
let Some(offset) = self.state.palette.offset() else {
|
||||
return utils::generic_palette(Color32::RED);
|
||||
};
|
||||
let palette = self.palettes.borrow().read(offset);
|
||||
|
|
@ -221,20 +241,16 @@ impl CharacterDataWindow {
|
|||
|
||||
fn show_chardata(&mut self, ui: &mut Ui) {
|
||||
let grid = CharacterGrid::new(self.image_url("chardata"))
|
||||
.with_scale(self.scale)
|
||||
.with_grid(self.show_grid)
|
||||
.with_selected(self.index);
|
||||
.with_scale(self.state.scale)
|
||||
.with_grid(self.state.show_grid)
|
||||
.with_selected(self.state.index);
|
||||
if let Some(selected) = grid.show(ui) {
|
||||
self.index = selected;
|
||||
self.state.index = selected;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl AppWindow for CharacterDataWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("chardata-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
@ -246,6 +262,7 @@ impl AppWindow for CharacterDataWindow {
|
|||
}
|
||||
|
||||
fn show(&mut self, ui: &mut Ui) {
|
||||
self.state.load(ui);
|
||||
CentralPanel::default().show_inside(ui, |ui| {
|
||||
ui.horizontal_top(|ui| {
|
||||
StripBuilder::new(ui)
|
||||
|
|
@ -261,10 +278,11 @@ impl AppWindow for CharacterDataWindow {
|
|||
});
|
||||
});
|
||||
});
|
||||
self.state.save(ui);
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Default, PartialEq, Eq)]
|
||||
#[derive(Clone, PartialEq, Eq)]
|
||||
struct CharDataParams {
|
||||
palette: Palette,
|
||||
index: usize,
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
use egui::{
|
||||
Align, CentralPanel, Color32, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
|
||||
ViewportBuilder, ViewportId,
|
||||
ViewportBuilder,
|
||||
};
|
||||
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{
|
||||
emulator::SimId,
|
||||
|
|
@ -10,42 +11,58 @@ use crate::{
|
|||
memory::{MemoryClient, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
utils::{NumberEdit, UiExt as _},
|
||||
utils::{NumberEdit, UiData, UiExt as _},
|
||||
},
|
||||
};
|
||||
|
||||
use super::utils;
|
||||
|
||||
pub struct FrameBufferWindow {
|
||||
sim_id: SimId,
|
||||
#[derive(Clone, PartialEq, Serialize, Deserialize)]
|
||||
struct State {
|
||||
index: usize,
|
||||
left: bool,
|
||||
right: bool,
|
||||
generic_palette: bool,
|
||||
params: ImageParams<FrameBufferParams>,
|
||||
scale: f32,
|
||||
}
|
||||
|
||||
impl FrameBufferWindow {
|
||||
pub fn new(sim_id: SimId, memory: &MemoryClient, images: &ImageTextureLoader) -> Self {
|
||||
let initial_params = FrameBufferParams {
|
||||
impl Default for State {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
index: 0,
|
||||
left: true,
|
||||
right: true,
|
||||
generic_palette: false,
|
||||
left_color: Color32::from_rgb(0xff, 0x00, 0x00),
|
||||
right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
|
||||
};
|
||||
scale: 2.0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct FrameBufferWindow {
|
||||
sim_id: SimId,
|
||||
params: ImageParams<FrameBufferParams>,
|
||||
state: UiData<State>,
|
||||
}
|
||||
|
||||
impl FrameBufferWindow {
|
||||
pub fn new(sim_id: SimId, memory: &MemoryClient, images: &ImageTextureLoader) -> Self {
|
||||
let state: UiData<State> = UiData::new();
|
||||
let renderer = FrameBufferRenderer::new(sim_id, memory);
|
||||
let params = images.add(sim_id, renderer, initial_params);
|
||||
let params = images.add(
|
||||
sim_id,
|
||||
renderer,
|
||||
FrameBufferParams {
|
||||
index: state.index,
|
||||
left: state.left,
|
||||
right: state.right,
|
||||
generic_palette: state.generic_palette,
|
||||
left_color: Color32::from_rgb(0xff, 0x00, 0x00),
|
||||
right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
|
||||
},
|
||||
);
|
||||
Self {
|
||||
sim_id,
|
||||
index: params.index,
|
||||
left: params.left,
|
||||
right: params.right,
|
||||
generic_palette: params.generic_palette,
|
||||
params,
|
||||
scale: 2.0,
|
||||
state,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -61,7 +78,7 @@ impl FrameBufferWindow {
|
|||
ui.label("Index");
|
||||
});
|
||||
row.col(|ui| {
|
||||
ui.add(NumberEdit::new(&mut self.index).range(0..2));
|
||||
ui.add(NumberEdit::new(&mut self.state.index).range(0..2));
|
||||
});
|
||||
});
|
||||
body.row(row_height, |mut row| {
|
||||
|
|
@ -69,7 +86,7 @@ impl FrameBufferWindow {
|
|||
ui.label("Left");
|
||||
});
|
||||
row.col(|ui| {
|
||||
let address = self.index * 0x00008000;
|
||||
let address = self.state.index * 0x00008000;
|
||||
let mut address_str = format!("{address:08x}");
|
||||
ui.add_enabled(
|
||||
false,
|
||||
|
|
@ -82,7 +99,7 @@ impl FrameBufferWindow {
|
|||
ui.label("Right");
|
||||
});
|
||||
row.col(|ui| {
|
||||
let address = self.index * 0x00008000 + 0x00010000;
|
||||
let address = self.state.index * 0x00008000 + 0x00010000;
|
||||
let mut address_str = format!("{address:08x}");
|
||||
ui.add_enabled(
|
||||
false,
|
||||
|
|
@ -95,7 +112,7 @@ impl FrameBufferWindow {
|
|||
ui.horizontal(|ui| {
|
||||
ui.label("Scale");
|
||||
ui.spacing_mut().slider_width = ui.available_width();
|
||||
let slider = Slider::new(&mut self.scale, 1.0..=10.0)
|
||||
let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
|
||||
.step_by(1.0)
|
||||
.show_value(false);
|
||||
ui.add(slider);
|
||||
|
|
@ -105,39 +122,35 @@ impl FrameBufferWindow {
|
|||
.body(|mut body| {
|
||||
body.row(row_height, |mut row| {
|
||||
row.col(|ui| {
|
||||
ui.checkbox(&mut self.left, "Left");
|
||||
ui.checkbox(&mut self.state.left, "Left");
|
||||
});
|
||||
row.col(|ui| {
|
||||
ui.checkbox(&mut self.right, "Right");
|
||||
ui.checkbox(&mut self.state.right, "Right");
|
||||
});
|
||||
});
|
||||
});
|
||||
ui.checkbox(&mut self.generic_palette, "Generic colors");
|
||||
ui.checkbox(&mut self.state.generic_palette, "Generic colors");
|
||||
});
|
||||
});
|
||||
|
||||
self.params.write(FrameBufferParams {
|
||||
index: self.index,
|
||||
left: self.left,
|
||||
right: self.right,
|
||||
generic_palette: self.generic_palette,
|
||||
index: self.state.index,
|
||||
left: self.state.left,
|
||||
right: self.state.right,
|
||||
generic_palette: self.state.generic_palette,
|
||||
..*self.params
|
||||
});
|
||||
}
|
||||
|
||||
fn show_buffers(&mut self, ui: &mut Ui) {
|
||||
let image = Image::new(self.image_url("buffer"))
|
||||
.fit_to_original_size(self.scale)
|
||||
.fit_to_original_size(self.state.scale)
|
||||
.texture_options(TextureOptions::NEAREST);
|
||||
ui.add(image);
|
||||
}
|
||||
}
|
||||
|
||||
impl AppWindow for FrameBufferWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("framebuffer-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
@ -149,6 +162,7 @@ impl AppWindow for FrameBufferWindow {
|
|||
}
|
||||
|
||||
fn show(&mut self, ui: &mut Ui) {
|
||||
self.state.load(ui);
|
||||
CentralPanel::default().show_inside(ui, |ui| {
|
||||
ui.horizontal_top(|ui| {
|
||||
StripBuilder::new(ui)
|
||||
|
|
@ -164,6 +178,7 @@ impl AppWindow for FrameBufferWindow {
|
|||
});
|
||||
});
|
||||
});
|
||||
self.state.save(ui);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@ use std::sync::Arc;
|
|||
|
||||
use egui::{
|
||||
Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
|
||||
TextureOptions, Ui, ViewportBuilder, ViewportId,
|
||||
TextureOptions, Ui, ViewportBuilder,
|
||||
};
|
||||
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{
|
||||
emulator::SimId,
|
||||
|
|
@ -12,40 +13,56 @@ use crate::{
|
|||
memory::{MemoryClient, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
utils::{NumberEdit, UiExt as _},
|
||||
utils::{NumberEdit, UiData, UiExt as _},
|
||||
},
|
||||
};
|
||||
|
||||
use super::utils::{self, Object};
|
||||
|
||||
#[derive(Clone, PartialEq, Serialize, Deserialize)]
|
||||
struct State {
|
||||
index: usize,
|
||||
generic_palette: bool,
|
||||
scale: f32,
|
||||
}
|
||||
impl Default for State {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
index: 0,
|
||||
generic_palette: false,
|
||||
scale: 1.0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct ObjectWindow {
|
||||
sim_id: SimId,
|
||||
memory: Arc<MemoryClient>,
|
||||
objects: MemoryView,
|
||||
index: usize,
|
||||
generic_palette: bool,
|
||||
params: ImageParams<ObjectParams>,
|
||||
scale: f32,
|
||||
state: UiData<State>,
|
||||
}
|
||||
|
||||
impl ObjectWindow {
|
||||
pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
|
||||
let initial_params = ObjectParams {
|
||||
index: 0,
|
||||
generic_palette: false,
|
||||
left_color: Color32::from_rgb(0xff, 0x00, 0x00),
|
||||
right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
|
||||
};
|
||||
let state: UiData<State> = UiData::new();
|
||||
let renderer = ObjectRenderer::new(sim_id, memory);
|
||||
let params = images.add(sim_id, renderer, initial_params);
|
||||
let params = images.add(
|
||||
sim_id,
|
||||
renderer,
|
||||
ObjectParams {
|
||||
index: state.index,
|
||||
generic_palette: state.generic_palette,
|
||||
left_color: Color32::from_rgb(0xff, 0x00, 0x00),
|
||||
right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
|
||||
},
|
||||
);
|
||||
Self {
|
||||
sim_id,
|
||||
memory: memory.clone(),
|
||||
objects: memory.watch(sim_id, 0x0003e000, 0x2000),
|
||||
index: params.index,
|
||||
generic_palette: params.generic_palette,
|
||||
params,
|
||||
scale: 1.0,
|
||||
state,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -61,7 +78,7 @@ impl ObjectWindow {
|
|||
ui.label("Index");
|
||||
});
|
||||
row.col(|ui| {
|
||||
ui.add(NumberEdit::new(&mut self.index).range(0..1024));
|
||||
ui.add(NumberEdit::new(&mut self.state.index).range(0..1024));
|
||||
});
|
||||
});
|
||||
body.row(row_height, |mut row| {
|
||||
|
|
@ -69,7 +86,7 @@ impl ObjectWindow {
|
|||
ui.label("Address");
|
||||
});
|
||||
row.col(|ui| {
|
||||
let address = 0x3e000 + self.index * 8;
|
||||
let address = 0x3e000 + self.state.index * 8;
|
||||
let mut address_str = format!("{address:08x}");
|
||||
ui.add_enabled(
|
||||
false,
|
||||
|
|
@ -83,7 +100,7 @@ impl ObjectWindow {
|
|||
.texture_options(TextureOptions::NEAREST);
|
||||
ui.add(image);
|
||||
ui.section("Properties", |ui| {
|
||||
let mut object = self.objects.borrow().read::<[u16; 4]>(self.index);
|
||||
let mut object = self.objects.borrow().read::<[u16; 4]>(self.state.index);
|
||||
let mut obj = Object::parse(object);
|
||||
TableBuilder::new(ui)
|
||||
.column(Column::remainder())
|
||||
|
|
@ -158,7 +175,7 @@ impl ObjectWindow {
|
|||
});
|
||||
});
|
||||
if obj.update(&mut object) {
|
||||
let address = 0x3e000 + self.index * 8;
|
||||
let address = 0x3e000 + self.state.index * 8;
|
||||
self.memory.write(self.sim_id, address as u32, &object);
|
||||
}
|
||||
});
|
||||
|
|
@ -166,34 +183,30 @@ impl ObjectWindow {
|
|||
ui.horizontal(|ui| {
|
||||
ui.label("Scale");
|
||||
ui.spacing_mut().slider_width = ui.available_width();
|
||||
let slider = Slider::new(&mut self.scale, 1.0..=10.0)
|
||||
let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
|
||||
.step_by(1.0)
|
||||
.show_value(false);
|
||||
ui.add(slider);
|
||||
});
|
||||
ui.checkbox(&mut self.generic_palette, "Generic palette");
|
||||
ui.checkbox(&mut self.state.generic_palette, "Generic palette");
|
||||
});
|
||||
});
|
||||
self.params.write(ObjectParams {
|
||||
index: self.index,
|
||||
generic_palette: self.generic_palette,
|
||||
index: self.state.index,
|
||||
generic_palette: self.state.generic_palette,
|
||||
..*self.params
|
||||
});
|
||||
}
|
||||
|
||||
fn show_object(&mut self, ui: &mut Ui) {
|
||||
let image = Image::new(self.image_url("object-full"))
|
||||
.fit_to_original_size(self.scale)
|
||||
.fit_to_original_size(self.state.scale)
|
||||
.texture_options(TextureOptions::NEAREST);
|
||||
ui.add(image);
|
||||
}
|
||||
}
|
||||
|
||||
impl AppWindow for ObjectWindow {
|
||||
fn viewport_id(&self) -> egui::ViewportId {
|
||||
ViewportId::from_hash_of(format!("object-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
@ -205,6 +218,7 @@ impl AppWindow for ObjectWindow {
|
|||
}
|
||||
|
||||
fn show(&mut self, ui: &mut Ui) {
|
||||
self.state.load(ui);
|
||||
CentralPanel::default().show_inside(ui, |ui| {
|
||||
ui.horizontal_top(|ui| {
|
||||
StripBuilder::new(ui)
|
||||
|
|
@ -220,6 +234,7 @@ impl AppWindow for ObjectWindow {
|
|||
});
|
||||
});
|
||||
});
|
||||
self.state.save(ui);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use std::sync::Arc;
|
|||
|
||||
use egui::{
|
||||
Align, Button, CentralPanel, Checkbox, Color32, Direction, Label, Layout, ScrollArea, TextEdit,
|
||||
Ui, ViewportBuilder, ViewportId,
|
||||
Ui, ViewportBuilder,
|
||||
};
|
||||
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
|
||||
|
||||
|
|
@ -630,10 +630,6 @@ fn read_address<T: MemoryValue>(registers: &MemoryRef, address: usize) -> T {
|
|||
}
|
||||
|
||||
impl AppWindow for RegisterWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("registers-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use std::{fmt::Display, sync::Arc};
|
|||
|
||||
use egui::{
|
||||
Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
|
||||
TextureOptions, Ui, ViewportBuilder, ViewportId,
|
||||
TextureOptions, Ui, ViewportBuilder,
|
||||
};
|
||||
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
|
||||
use fixed::{
|
||||
|
|
@ -11,6 +11,7 @@ use fixed::{
|
|||
};
|
||||
use num_derive::{FromPrimitive, ToPrimitive};
|
||||
use num_traits::{FromPrimitive, ToPrimitive};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{
|
||||
emulator::SimId,
|
||||
|
|
@ -18,46 +19,62 @@ use crate::{
|
|||
memory::{MemoryClient, MemoryRef, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
utils::{NumberEdit, UiExt as _},
|
||||
utils::{NumberEdit, UiData, UiExt as _},
|
||||
},
|
||||
};
|
||||
|
||||
use super::utils::{self, CellData, Object, shade};
|
||||
|
||||
#[derive(Clone, PartialEq, Serialize, Deserialize)]
|
||||
struct State {
|
||||
index: usize,
|
||||
param_index: usize,
|
||||
generic_palette: bool,
|
||||
show_extents: bool,
|
||||
scale: f32,
|
||||
}
|
||||
impl Default for State {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
index: 31,
|
||||
param_index: 0,
|
||||
generic_palette: false,
|
||||
show_extents: false,
|
||||
scale: 1.0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct WorldWindow {
|
||||
sim_id: SimId,
|
||||
memory: Arc<MemoryClient>,
|
||||
worlds: MemoryView,
|
||||
bgmaps: MemoryView,
|
||||
index: usize,
|
||||
param_index: usize,
|
||||
generic_palette: bool,
|
||||
show_extents: bool,
|
||||
params: ImageParams<WorldParams>,
|
||||
scale: f32,
|
||||
state: UiData<State>,
|
||||
}
|
||||
|
||||
impl WorldWindow {
|
||||
pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
|
||||
let initial_params = WorldParams {
|
||||
index: 31,
|
||||
generic_palette: false,
|
||||
left_color: Color32::from_rgb(0xff, 0x00, 0x00),
|
||||
right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
|
||||
};
|
||||
let state: UiData<State> = UiData::new();
|
||||
let renderer = WorldRenderer::new(sim_id, memory);
|
||||
let params = images.add(sim_id, renderer, initial_params);
|
||||
let params = images.add(
|
||||
sim_id,
|
||||
renderer,
|
||||
WorldParams {
|
||||
index: state.index,
|
||||
generic_palette: state.generic_palette,
|
||||
left_color: Color32::from_rgb(0xff, 0x00, 0x00),
|
||||
right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
|
||||
},
|
||||
);
|
||||
Self {
|
||||
sim_id,
|
||||
memory: memory.clone(),
|
||||
worlds: memory.watch(sim_id, 0x0003d800, 0x400),
|
||||
bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
|
||||
index: params.index,
|
||||
param_index: 0,
|
||||
generic_palette: params.generic_palette,
|
||||
show_extents: false,
|
||||
params,
|
||||
scale: 1.0,
|
||||
state,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -73,7 +90,7 @@ impl WorldWindow {
|
|||
ui.label("Index");
|
||||
});
|
||||
row.col(|ui| {
|
||||
ui.add(NumberEdit::new(&mut self.index).range(0..32));
|
||||
ui.add(NumberEdit::new(&mut self.state.index).range(0..32));
|
||||
});
|
||||
});
|
||||
body.row(row_height, |mut row| {
|
||||
|
|
@ -81,7 +98,7 @@ impl WorldWindow {
|
|||
ui.label("Address");
|
||||
});
|
||||
row.col(|ui| {
|
||||
let address = 0x0003d800 + self.index * 32;
|
||||
let address = 0x0003d800 + self.state.index * 32;
|
||||
let mut address_str = format!("{address:08x}");
|
||||
ui.add_enabled(
|
||||
false,
|
||||
|
|
@ -92,7 +109,7 @@ impl WorldWindow {
|
|||
});
|
||||
let mut data = {
|
||||
let worlds = self.worlds.borrow();
|
||||
worlds.read(self.index)
|
||||
worlds.read(self.state.index)
|
||||
};
|
||||
let mut world = World::parse(&data);
|
||||
ui.section("Properties", |ui| {
|
||||
|
|
@ -272,7 +289,7 @@ impl WorldWindow {
|
|||
});
|
||||
});
|
||||
if world.update(&mut data) {
|
||||
let address = 0x0003d800 + self.index * 32;
|
||||
let address = 0x0003d800 + self.state.index * 32;
|
||||
self.memory.write(self.sim_id, address as u32, &data);
|
||||
}
|
||||
if world.header.mode == WorldMode::HBias {
|
||||
|
|
@ -287,10 +304,12 @@ impl WorldWindow {
|
|||
});
|
||||
row.col(|ui| {
|
||||
let max = world.height.max(8) as usize;
|
||||
ui.add(NumberEdit::new(&mut self.param_index).range(0..max));
|
||||
ui.add(
|
||||
NumberEdit::new(&mut self.state.param_index).range(0..max),
|
||||
);
|
||||
});
|
||||
});
|
||||
let base = (world.param_base + self.param_index * 2) & 0x1ffff;
|
||||
let base = (world.param_base + self.state.param_index * 2) & 0x1ffff;
|
||||
let mut param = HBiasParam::load(&self.bgmaps.borrow(), base);
|
||||
body.row(row_height, |mut row| {
|
||||
row.col(|ui| {
|
||||
|
|
@ -337,10 +356,12 @@ impl WorldWindow {
|
|||
});
|
||||
row.col(|ui| {
|
||||
let max = world.height.max(1) as usize;
|
||||
ui.add(NumberEdit::new(&mut self.param_index).range(0..max));
|
||||
ui.add(
|
||||
NumberEdit::new(&mut self.state.param_index).range(0..max),
|
||||
);
|
||||
});
|
||||
});
|
||||
let base = (world.param_base + self.param_index * 8) & 0x1ffff;
|
||||
let base = (world.param_base + self.state.param_index * 8) & 0x1ffff;
|
||||
let mut param = AffineParam::load(&self.bgmaps.borrow(), base);
|
||||
body.row(row_height, |mut row| {
|
||||
row.col(|ui| {
|
||||
|
|
@ -400,49 +421,49 @@ impl WorldWindow {
|
|||
});
|
||||
});
|
||||
} else {
|
||||
self.param_index = 0;
|
||||
self.state.param_index = 0;
|
||||
}
|
||||
ui.section("Display", |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.label("Scale");
|
||||
ui.spacing_mut().slider_width = ui.available_width();
|
||||
let slider = Slider::new(&mut self.scale, 1.0..=10.0)
|
||||
let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
|
||||
.step_by(1.0)
|
||||
.show_value(false);
|
||||
ui.add(slider);
|
||||
});
|
||||
ui.checkbox(&mut self.generic_palette, "Generic palette");
|
||||
ui.checkbox(&mut self.show_extents, "Show extents");
|
||||
ui.checkbox(&mut self.state.generic_palette, "Generic palette");
|
||||
ui.checkbox(&mut self.state.show_extents, "Show extents");
|
||||
});
|
||||
});
|
||||
self.params.write(WorldParams {
|
||||
index: self.index,
|
||||
generic_palette: self.generic_palette,
|
||||
index: self.state.index,
|
||||
generic_palette: self.state.generic_palette,
|
||||
..*self.params
|
||||
});
|
||||
}
|
||||
|
||||
fn show_world(&mut self, ui: &mut Ui) {
|
||||
let image = Image::new(self.image_url("world"))
|
||||
.fit_to_original_size(self.scale)
|
||||
.fit_to_original_size(self.state.scale)
|
||||
.texture_options(TextureOptions::NEAREST);
|
||||
let res = ui.add(image);
|
||||
if self.show_extents {
|
||||
if self.state.show_extents {
|
||||
let world = {
|
||||
let worlds = self.worlds.borrow();
|
||||
let data = worlds.read(self.index);
|
||||
let data = worlds.read(self.state.index);
|
||||
World::parse(&data)
|
||||
};
|
||||
if world.header.mode == WorldMode::Object {
|
||||
return;
|
||||
}
|
||||
|
||||
let lx1 = (world.dst_x - world.dst_parallax) as f32 * self.scale;
|
||||
let lx2 = lx1 + world.width as f32 * self.scale;
|
||||
let rx1 = (world.dst_x + world.dst_parallax) as f32 * self.scale;
|
||||
let rx2 = rx1 + world.width as f32 * self.scale;
|
||||
let y1 = world.dst_y as f32 * self.scale;
|
||||
let y2 = y1 + world.height as f32 * self.scale;
|
||||
let lx1 = (world.dst_x - world.dst_parallax) as f32 * self.state.scale;
|
||||
let lx2 = lx1 + world.width as f32 * self.state.scale;
|
||||
let rx1 = (world.dst_x + world.dst_parallax) as f32 * self.state.scale;
|
||||
let rx2 = rx1 + world.width as f32 * self.state.scale;
|
||||
let y1 = world.dst_y as f32 * self.state.scale;
|
||||
let y2 = y1 + world.height as f32 * self.state.scale;
|
||||
|
||||
let left_color = self.params.left_color;
|
||||
let right_color = self.params.right_color;
|
||||
|
|
@ -506,10 +527,6 @@ impl WorldWindow {
|
|||
}
|
||||
|
||||
impl AppWindow for WorldWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("world-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
|
@ -521,6 +538,7 @@ impl AppWindow for WorldWindow {
|
|||
}
|
||||
|
||||
fn show(&mut self, ui: &mut Ui) {
|
||||
self.state.load(ui);
|
||||
CentralPanel::default().show_inside(ui, |ui| {
|
||||
ui.horizontal_top(|ui| {
|
||||
StripBuilder::new(ui)
|
||||
|
|
@ -536,6 +554,7 @@ impl AppWindow for WorldWindow {
|
|||
});
|
||||
});
|
||||
});
|
||||
self.state.save(ui);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue