Compare commits
16
Commits
b025f72604
..
riir
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99d6970323 | ||
|
|
e8b706df20 | ||
|
|
6dc3697baf | ||
|
|
5cb36d0bcc | ||
|
|
a69247dd33 | ||
|
|
62b34ea760 | ||
|
|
a6200732ee | ||
|
|
498e6fbdcc | ||
|
|
5c5d56cb12 | ||
|
|
75fa3be25c | ||
|
|
593475960d | ||
|
|
756835f90e | ||
|
|
7c9e9c7fa4 | ||
|
|
70373647fb | ||
|
|
8bba7b9e1b | ||
|
|
a0e39796bf |
Generated
+585
-10
@@ -31,12 +31,43 @@ dependencies = [
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "1.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "allocator-api2"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
|
||||
|
||||
[[package]]
|
||||
name = "alsa"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
|
||||
dependencies = [
|
||||
"alsa-sys",
|
||||
"bitflags 2.6.0",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "alsa-sys"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "android-activity"
|
||||
version = "0.6.0"
|
||||
@@ -51,7 +82,7 @@ dependencies = [
|
||||
"jni-sys",
|
||||
"libc",
|
||||
"log",
|
||||
"ndk",
|
||||
"ndk 0.9.0",
|
||||
"ndk-context",
|
||||
"ndk-sys 0.6.0+11769913",
|
||||
"num_enum",
|
||||
@@ -146,6 +177,12 @@ version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
|
||||
|
||||
[[package]]
|
||||
name = "ascii"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
|
||||
|
||||
[[package]]
|
||||
name = "ash"
|
||||
version = "0.38.0+1.3.281"
|
||||
@@ -167,6 +204,24 @@ version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
|
||||
|
||||
[[package]]
|
||||
name = "bindgen"
|
||||
version = "0.70.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"cexpr",
|
||||
"clang-sys",
|
||||
"itertools 0.13.0",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
"syn 2.0.87",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bit-set"
|
||||
version = "0.6.0"
|
||||
@@ -220,6 +275,20 @@ name = "bytemuck"
|
||||
version = "1.19.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
|
||||
dependencies = [
|
||||
"bytemuck_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck_derive"
|
||||
version = "1.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.87",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
@@ -270,6 +339,15 @@ version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
|
||||
|
||||
[[package]]
|
||||
name = "cexpr"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
|
||||
dependencies = [
|
||||
"nom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
@@ -294,6 +372,17 @@ version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e10e7569f6ca78ef7664d7d651115172d4875c4410c050306bccde856a99a49"
|
||||
|
||||
[[package]]
|
||||
name = "clang-sys"
|
||||
version = "1.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"libc",
|
||||
"libloading",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.20"
|
||||
@@ -334,6 +423,36 @@ version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
|
||||
|
||||
[[package]]
|
||||
name = "cocoa"
|
||||
version = "0.25.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"block",
|
||||
"cocoa-foundation",
|
||||
"core-foundation",
|
||||
"core-graphics",
|
||||
"foreign-types",
|
||||
"libc",
|
||||
"objc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cocoa-foundation"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"block",
|
||||
"core-foundation",
|
||||
"core-graphics-types",
|
||||
"libc",
|
||||
"objc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "codespan-reporting"
|
||||
version = "0.11.1"
|
||||
@@ -440,6 +559,49 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "coreaudio-rs"
|
||||
version = "0.11.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"core-foundation-sys",
|
||||
"coreaudio-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "coreaudio-sys"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cpal"
|
||||
version = "0.15.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
|
||||
dependencies = [
|
||||
"alsa",
|
||||
"core-foundation-sys",
|
||||
"coreaudio-rs",
|
||||
"dasp_sample",
|
||||
"jni",
|
||||
"js-sys",
|
||||
"libc",
|
||||
"mach2",
|
||||
"ndk 0.8.0",
|
||||
"ndk-context",
|
||||
"oboe",
|
||||
"wasm-bindgen",
|
||||
"wasm-bindgen-futures",
|
||||
"web-sys",
|
||||
"windows 0.54.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.20"
|
||||
@@ -463,6 +625,33 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dasp_sample"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
|
||||
|
||||
[[package]]
|
||||
name = "dirs-next"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"dirs-sys-next",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys-next"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dispatch"
|
||||
version = "0.2.0"
|
||||
@@ -499,6 +688,12 @@ version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.1"
|
||||
@@ -574,6 +769,12 @@ dependencies = [
|
||||
"xml-rs",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
||||
|
||||
[[package]]
|
||||
name = "glow"
|
||||
version = "0.13.1"
|
||||
@@ -624,7 +825,7 @@ dependencies = [
|
||||
"presser",
|
||||
"thiserror",
|
||||
"winapi",
|
||||
"windows",
|
||||
"windows 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -696,6 +897,15 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
|
||||
|
||||
[[package]]
|
||||
name = "home"
|
||||
version = "0.5.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
|
||||
dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "imgui"
|
||||
version = "0.12.0"
|
||||
@@ -759,6 +969,24 @@ version = "1.70.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
|
||||
dependencies = [
|
||||
"either",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
|
||||
dependencies = [
|
||||
"either",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "jni"
|
||||
version = "0.21.1"
|
||||
@@ -871,6 +1099,15 @@ version = "0.4.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
|
||||
|
||||
[[package]]
|
||||
name = "mach2"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "malloc_buf"
|
||||
version = "0.0.6"
|
||||
@@ -910,6 +1147,12 @@ dependencies = [
|
||||
"paste",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "minimal-lexical"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||
|
||||
[[package]]
|
||||
name = "mint"
|
||||
version = "0.5.9"
|
||||
@@ -937,6 +1180,43 @@ dependencies = [
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "native-dialog"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "84e7038885d2aeab236bd60da9e159a5967b47cde3292da3b15ff1bec27c039f"
|
||||
dependencies = [
|
||||
"ascii",
|
||||
"block",
|
||||
"cocoa",
|
||||
"core-foundation",
|
||||
"dirs-next",
|
||||
"objc",
|
||||
"objc-foundation",
|
||||
"objc_id",
|
||||
"once_cell",
|
||||
"raw-window-handle 0.5.2",
|
||||
"thiserror",
|
||||
"versions",
|
||||
"wfd",
|
||||
"which",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ndk"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"jni-sys",
|
||||
"log",
|
||||
"ndk-sys 0.5.0+25.2.9519653",
|
||||
"num_enum",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ndk"
|
||||
version = "0.9.0"
|
||||
@@ -948,7 +1228,7 @@ dependencies = [
|
||||
"log",
|
||||
"ndk-sys 0.6.0+11769913",
|
||||
"num_enum",
|
||||
"raw-window-handle",
|
||||
"raw-window-handle 0.6.2",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
@@ -976,6 +1256,54 @@ dependencies = [
|
||||
"jni-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
version = "7.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"minimal-lexical",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-complex"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-derive"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.87",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_enum"
|
||||
version = "0.7.3"
|
||||
@@ -1006,6 +1334,17 @@ dependencies = [
|
||||
"malloc_buf",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc-foundation"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
|
||||
dependencies = [
|
||||
"block",
|
||||
"objc",
|
||||
"objc_id",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc-sys"
|
||||
version = "0.3.5"
|
||||
@@ -1209,6 +1548,38 @@ dependencies = [
|
||||
"objc2-foundation",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc_id"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
|
||||
dependencies = [
|
||||
"objc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "oboe"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
|
||||
dependencies = [
|
||||
"jni",
|
||||
"ndk 0.8.0",
|
||||
"ndk-context",
|
||||
"num-derive",
|
||||
"num-traits",
|
||||
"oboe-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "oboe-sys"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.20.2"
|
||||
@@ -1327,6 +1698,15 @@ version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
|
||||
|
||||
[[package]]
|
||||
name = "primal-check"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08"
|
||||
dependencies = [
|
||||
"num-integer",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-crate"
|
||||
version = "3.2.0"
|
||||
@@ -1375,12 +1755,27 @@ version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
|
||||
|
||||
[[package]]
|
||||
name = "raw-window-handle"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
|
||||
|
||||
[[package]]
|
||||
name = "raw-window-handle"
|
||||
version = "0.6.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
|
||||
|
||||
[[package]]
|
||||
name = "realfft"
|
||||
version = "3.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "390252372b7f2aac8360fc5e72eba10136b166d6faeed97e6d0c8324eb99b2b1"
|
||||
dependencies = [
|
||||
"rustfft",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.4.1"
|
||||
@@ -1399,18 +1794,91 @@ dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"libredox",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-automata",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
||||
|
||||
[[package]]
|
||||
name = "renderdoc-sys"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
|
||||
|
||||
[[package]]
|
||||
name = "rtrb"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f3f94e84c073f3b85d4012b44722fa8842b9986d741590d4f2636ad0a5b14143"
|
||||
|
||||
[[package]]
|
||||
name = "rubato"
|
||||
version = "0.16.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cdd96992d7e24b3d7f35fdfe02af037a356ac90d41b466945cf3333525a86eea"
|
||||
dependencies = [
|
||||
"num-complex",
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
"realfft",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustfft"
|
||||
version = "6.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86"
|
||||
dependencies = [
|
||||
"num-complex",
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
"primal-check",
|
||||
"strength_reduce",
|
||||
"transpose",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.38"
|
||||
@@ -1424,6 +1892,12 @@ dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
version = "1.0.6"
|
||||
@@ -1485,16 +1959,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||
|
||||
[[package]]
|
||||
name = "shrooms-vb-native"
|
||||
name = "shrooms-vb"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bitflags 2.6.0",
|
||||
"bytemuck",
|
||||
"cc",
|
||||
"clap",
|
||||
"cpal",
|
||||
"imgui",
|
||||
"imgui-wgpu",
|
||||
"imgui-winit-support",
|
||||
"itertools 0.13.0",
|
||||
"native-dialog",
|
||||
"num-derive",
|
||||
"num-traits",
|
||||
"pollster",
|
||||
"rtrb",
|
||||
"rubato",
|
||||
"thread-priority",
|
||||
"wgpu",
|
||||
"winit",
|
||||
]
|
||||
@@ -1572,6 +2056,12 @@ version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||
|
||||
[[package]]
|
||||
name = "strength_reduce"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
|
||||
|
||||
[[package]]
|
||||
name = "strict-num"
|
||||
version = "0.1.1"
|
||||
@@ -1635,6 +2125,20 @@ dependencies = [
|
||||
"syn 2.0.87",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thread-priority"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cfe075d7053dae61ac5413a34ea7d4913b6e6207844fd726bdd858b37ff72bf5"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"log",
|
||||
"rustversion",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tiny-skia"
|
||||
version = "0.11.4"
|
||||
@@ -1693,6 +2197,16 @@ version = "0.1.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
|
||||
|
||||
[[package]]
|
||||
name = "transpose"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e"
|
||||
dependencies = [
|
||||
"num-integer",
|
||||
"strength_reduce",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ttf-parser"
|
||||
version = "0.25.0"
|
||||
@@ -1735,6 +2249,16 @@ version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
|
||||
|
||||
[[package]]
|
||||
name = "versions"
|
||||
version = "5.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c73a36bc44e3039f51fbee93e39f41225f6b17b380eb70cc2aab942df06b34dd"
|
||||
dependencies = [
|
||||
"itertools 0.11.0",
|
||||
"nom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "walkdir"
|
||||
version = "2.5.0"
|
||||
@@ -1947,6 +2471,16 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wfd"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wgpu"
|
||||
version = "22.1.0"
|
||||
@@ -1961,7 +2495,7 @@ dependencies = [
|
||||
"naga",
|
||||
"parking_lot",
|
||||
"profiling",
|
||||
"raw-window-handle",
|
||||
"raw-window-handle 0.6.2",
|
||||
"smallvec",
|
||||
"static_assertions",
|
||||
"wasm-bindgen",
|
||||
@@ -1989,7 +2523,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"parking_lot",
|
||||
"profiling",
|
||||
"raw-window-handle",
|
||||
"raw-window-handle 0.6.2",
|
||||
"rustc-hash",
|
||||
"smallvec",
|
||||
"thiserror",
|
||||
@@ -2031,7 +2565,7 @@ dependencies = [
|
||||
"parking_lot",
|
||||
"profiling",
|
||||
"range-alloc",
|
||||
"raw-window-handle",
|
||||
"raw-window-handle 0.6.2",
|
||||
"renderdoc-sys",
|
||||
"rustc-hash",
|
||||
"smallvec",
|
||||
@@ -2053,6 +2587,18 @@ dependencies = [
|
||||
"web-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "which"
|
||||
version = "4.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
|
||||
dependencies = [
|
||||
"either",
|
||||
"home",
|
||||
"once_cell",
|
||||
"rustix",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "widestring"
|
||||
version = "1.1.0"
|
||||
@@ -2096,7 +2642,17 @@ version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
|
||||
dependencies = [
|
||||
"windows-core",
|
||||
"windows-core 0.52.0",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows"
|
||||
version = "0.54.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
|
||||
dependencies = [
|
||||
"windows-core 0.54.0",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
@@ -2109,6 +2665,25 @@ dependencies = [
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-core"
|
||||
version = "0.54.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
|
||||
dependencies = [
|
||||
"windows-result",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-result"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
|
||||
dependencies = [
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.45.0"
|
||||
@@ -2336,7 +2911,7 @@ dependencies = [
|
||||
"js-sys",
|
||||
"libc",
|
||||
"memmap2",
|
||||
"ndk",
|
||||
"ndk 0.9.0",
|
||||
"objc2",
|
||||
"objc2-app-kit",
|
||||
"objc2-foundation",
|
||||
@@ -2344,7 +2919,7 @@ dependencies = [
|
||||
"orbclient",
|
||||
"percent-encoding",
|
||||
"pin-project",
|
||||
"raw-window-handle",
|
||||
"raw-window-handle 0.6.2",
|
||||
"redox_syscall 0.4.1",
|
||||
"rustix",
|
||||
"sctk-adwaita",
|
||||
|
||||
+13
-3
@@ -1,15 +1,25 @@
|
||||
[package]
|
||||
name = "shrooms-vb-native"
|
||||
name = "shrooms-vb"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1"
|
||||
bitflags = "2"
|
||||
bytemuck = { version = "1", features = ["derive"] }
|
||||
clap = { version = "4", features = ["derive"] }
|
||||
imgui = "0.12"
|
||||
cpal = "0.15"
|
||||
imgui = { version = "0.12", features = ["tables-api"] }
|
||||
imgui-wgpu = { git = "https://github.com/Yatekii/imgui-wgpu-rs", rev = "2edd348" }
|
||||
imgui-winit-support = "0.13"
|
||||
itertools = "0.13"
|
||||
native-dialog = "0.7"
|
||||
num-derive = "0.4"
|
||||
num-traits = "0.2"
|
||||
pollster = "0.4"
|
||||
rtrb = "0.3"
|
||||
rubato = "0.16"
|
||||
thread-priority = "1"
|
||||
wgpu = "22.1"
|
||||
winit = "0.30"
|
||||
|
||||
@@ -17,4 +27,4 @@ winit = "0.30"
|
||||
cc = "1"
|
||||
|
||||
[profile.release]
|
||||
lto = "thin"
|
||||
lto = true
|
||||
@@ -1,15 +1,15 @@
|
||||
# Shrooms VB (native)
|
||||
|
||||
An SDL-based implementation of shrooms-vb.
|
||||
A native implementation of shrooms-vb. Written in Rust, using winit, wgpu, and Dear ImGui. Should run on any major OS.
|
||||
|
||||
## Setup
|
||||
|
||||
Install the following dependencies:
|
||||
- `gcc` (or MinGW on Windows) (or whatever, just set `CC`)
|
||||
- `pkg-config`
|
||||
- sdl2
|
||||
- `cargo`
|
||||
|
||||
Run
|
||||
```sh
|
||||
make build
|
||||
```
|
||||
cargo build --release
|
||||
```
|
||||
|
||||
The executable will be in `target/release/shrooms-vb[.exe]`
|
||||
@@ -1,12 +0,0 @@
|
||||
#ifndef SHROOMS_VB_NATIVE_ASSETS_
|
||||
#define SHROOMS_VB_NATIVE_ASSETS_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
extern const uint8_t _binary_assets_lefteye_bin_start;
|
||||
const uint8_t *LEFT_EYE_DEFAULT = &_binary_assets_lefteye_bin_start;
|
||||
|
||||
extern const uint8_t _binary_assets_righteye_bin_start;
|
||||
const uint8_t *RIGHT_EYE_DEFAULT = &_binary_assets_righteye_bin_start;
|
||||
|
||||
#endif
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,65 +0,0 @@
|
||||
#include <audio.h>
|
||||
#include <stdio.h>
|
||||
|
||||
void audioCallback(void *userdata, uint8_t *stream, int len) {
|
||||
AudioContext *aud;
|
||||
SDL_assert(len == 834 * 4);
|
||||
|
||||
aud = userdata;
|
||||
if (!aud->filled) {
|
||||
/* too little data, play silence */
|
||||
SDL_memset4(stream, 0, 834);
|
||||
return;
|
||||
}
|
||||
SDL_memcpy4(stream, aud->buffers[aud->current], 834);
|
||||
++aud->current;
|
||||
aud->current %= 2;
|
||||
aud->filled -= 1;
|
||||
}
|
||||
|
||||
int audioInit(AudioContext *aud) {
|
||||
SDL_AudioSpec spec;
|
||||
spec.freq = 41700;
|
||||
spec.format = AUDIO_S16;
|
||||
spec.channels = 2;
|
||||
spec.samples = 834;
|
||||
spec.callback = &audioCallback;
|
||||
spec.userdata = aud;
|
||||
|
||||
aud->id = SDL_OpenAudioDevice(NULL, 0, &spec, NULL, 0);
|
||||
aud->paused = true;
|
||||
if (!aud->id) {
|
||||
fprintf(stderr, "could not open audio device: %s\n", SDL_GetError());
|
||||
return -1;
|
||||
}
|
||||
aud->current = 0;
|
||||
aud->filled = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int audioUpdate(AudioContext *aud, void *data, uint32_t bytes) {
|
||||
int filled;
|
||||
if (!aud->id) return -1;
|
||||
SDL_assert(bytes == 834 * 4);
|
||||
|
||||
SDL_LockAudioDevice(aud->id);
|
||||
if (aud->filled < 2) {
|
||||
int next = (aud->current + aud->filled) % 2;
|
||||
SDL_memcpy4(aud->buffers[next], data, bytes / 4);
|
||||
aud->filled += 1;
|
||||
}
|
||||
filled = aud->filled;
|
||||
SDL_UnlockAudioDevice(aud->id);
|
||||
|
||||
if (aud->paused) {
|
||||
SDL_PauseAudioDevice(aud->id, false);
|
||||
aud->paused = false;
|
||||
}
|
||||
|
||||
while (filled > 1) {
|
||||
SDL_Delay(0);
|
||||
filled = aud->filled;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
#ifndef SHROOMS_VB_NATIVE_AUDIO_
|
||||
#define SHROOMS_VB_NATIVE_AUDIO_
|
||||
|
||||
#include <SDL2/SDL.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
typedef struct {
|
||||
SDL_AudioDeviceID id;
|
||||
bool paused;
|
||||
uint32_t buffers[2][834];
|
||||
int current;
|
||||
int filled;
|
||||
} AudioContext;
|
||||
|
||||
int audioInit(AudioContext *aud);
|
||||
int audioUpdate(AudioContext *aud, void *data, uint32_t bytes);
|
||||
|
||||
#endif
|
||||
@@ -1,11 +0,0 @@
|
||||
#include <cli.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int parseCLIArgs(int argc, char **argv, CLIArgs *args) {
|
||||
if (argc != 2) {
|
||||
fprintf(stderr, "usage: %s /path/to/rom.vb\n", argv[0]);
|
||||
return 1;
|
||||
}
|
||||
args->filename = argv[1];
|
||||
return 0;
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
#ifndef SHROOMS_VB_NATIVE_CLI_
|
||||
#define SHROOMS_VB_NATIVE_CLI_
|
||||
|
||||
typedef struct {
|
||||
char *filename;
|
||||
} CLIArgs;
|
||||
|
||||
int parseCLIArgs(int argc, char **argv, CLIArgs *args);
|
||||
|
||||
#endif
|
||||
@@ -1,65 +0,0 @@
|
||||
#include <controller.h>
|
||||
|
||||
#define VB_PWR 0x0001
|
||||
#define VB_SGN 0x0002
|
||||
#define VB_A 0x0004
|
||||
#define VB_B 0x0008
|
||||
#define VB_RT 0x0010
|
||||
#define VB_LT 0x0020
|
||||
#define VB_RU 0x0040
|
||||
#define VB_RR 0x0080
|
||||
#define VB_LR 0x0100
|
||||
#define VB_LL 0x0200
|
||||
#define VB_LD 0x0400
|
||||
#define VB_LU 0x0800
|
||||
#define VB_STA 0x1000
|
||||
#define VB_SEL 0x2000
|
||||
#define VB_RL 0x4000
|
||||
#define VB_RD 0x8000
|
||||
|
||||
static uint16_t symToMask(SDL_KeyCode sym) {
|
||||
switch (sym) {
|
||||
default: return 0;
|
||||
case SDLK_a:
|
||||
return VB_SEL;
|
||||
case SDLK_s:
|
||||
return VB_STA;
|
||||
case SDLK_d:
|
||||
return VB_B;
|
||||
case SDLK_f:
|
||||
return VB_A;
|
||||
case SDLK_e:
|
||||
return VB_LT;
|
||||
case SDLK_r:
|
||||
return VB_RT;
|
||||
case SDLK_i:
|
||||
return VB_RU;
|
||||
case SDLK_j:
|
||||
return VB_RL;
|
||||
case SDLK_k:
|
||||
return VB_RD;
|
||||
case SDLK_l:
|
||||
return VB_RR;
|
||||
case SDLK_UP:
|
||||
return VB_LU;
|
||||
case SDLK_LEFT:
|
||||
return VB_LL;
|
||||
case SDLK_DOWN:
|
||||
return VB_LD;
|
||||
case SDLK_RIGHT:
|
||||
return VB_LR;
|
||||
}
|
||||
}
|
||||
|
||||
void ctrlInit(ControllerState *ctrl) {
|
||||
ctrl->keys = VB_SGN;
|
||||
}
|
||||
void ctrlKeyDown(ControllerState *ctrl, SDL_Keycode sym) {
|
||||
ctrl->keys |= symToMask(sym);
|
||||
}
|
||||
void ctrlKeyUp(ControllerState *ctrl, SDL_Keycode sym) {
|
||||
ctrl->keys &= ~symToMask(sym);
|
||||
}
|
||||
uint16_t ctrlKeys(ControllerState *ctrl) {
|
||||
return ctrl->keys;
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
#ifndef SHROOMS_VB_NATIVE_CONTROLLER_
|
||||
#define SHROOMS_VB_NATIVE_CONTROLLER_
|
||||
|
||||
#include <SDL2/SDL.h>
|
||||
#include <stdint.h>
|
||||
|
||||
typedef struct {
|
||||
uint16_t keys;
|
||||
} ControllerState;
|
||||
|
||||
void ctrlInit(ControllerState *ctrl);
|
||||
void ctrlKeyDown(ControllerState *ctrl, SDL_Keycode sym);
|
||||
void ctrlKeyUp(ControllerState *ctrl, SDL_Keycode sym);
|
||||
uint16_t ctrlKeys(ControllerState *ctrl);
|
||||
|
||||
#endif
|
||||
@@ -1,71 +0,0 @@
|
||||
#include <audio.h>
|
||||
#include <assets.h>
|
||||
#include <controller.h>
|
||||
#include <game.h>
|
||||
#include <SDL2/SDL.h>
|
||||
#include <stdbool.h>
|
||||
#include <time.h>
|
||||
|
||||
typedef struct {
|
||||
GraphicsContext *gfx;
|
||||
AudioContext aud;
|
||||
int16_t audioBuffer[834 * 2];
|
||||
} GameState;
|
||||
|
||||
int onFrame(VB *sim) {
|
||||
static uint8_t leftEye[384*224];
|
||||
static uint8_t rightEye[384*224];
|
||||
GameState *state;
|
||||
void *samples;
|
||||
uint32_t samplePairs;
|
||||
|
||||
state = vbGetUserData(sim);
|
||||
|
||||
vbGetPixels(sim, leftEye, 1, 384, rightEye, 1, 384);
|
||||
gfxUpdateLeftEye(state->gfx, leftEye);
|
||||
gfxUpdateRightEye(state->gfx, rightEye);
|
||||
|
||||
samples = vbGetSamples(sim, NULL, NULL, &samplePairs);
|
||||
audioUpdate(&state->aud, samples, samplePairs * 4);
|
||||
vbSetSamples(sim, samples, VB_S16, 834);
|
||||
gfxRender(state->gfx);
|
||||
return 1;
|
||||
}
|
||||
|
||||
#define MAX_STEP_CLOCKS 20000000
|
||||
|
||||
int runGame(VB *sim, GraphicsContext *gfx) {
|
||||
uint32_t clocks;
|
||||
SDL_Event event;
|
||||
GameState state;
|
||||
ControllerState ctrl;
|
||||
|
||||
state.gfx = gfx;
|
||||
audioInit(&state.aud);
|
||||
vbSetSamples(sim, &state.audioBuffer, VB_S16, 834);
|
||||
vbSetUserData(sim, &state);
|
||||
vbSetFrameCallback(sim, &onFrame);
|
||||
|
||||
ctrlInit(&ctrl);
|
||||
|
||||
gfxUpdateLeftEye(gfx, LEFT_EYE_DEFAULT);
|
||||
gfxUpdateRightEye(gfx, RIGHT_EYE_DEFAULT);
|
||||
|
||||
while (1) {
|
||||
clocks = MAX_STEP_CLOCKS;
|
||||
vbEmulate(sim, &clocks);
|
||||
|
||||
while (SDL_PollEvent(&event)) {
|
||||
if (event.type == SDL_QUIT) {
|
||||
return 0;
|
||||
}
|
||||
if (event.type == SDL_KEYDOWN) {
|
||||
ctrlKeyDown(&ctrl, event.key.keysym.sym);
|
||||
}
|
||||
if (event.type == SDL_KEYUP) {
|
||||
ctrlKeyUp(&ctrl, event.key.keysym.sym);
|
||||
}
|
||||
}
|
||||
vbSetKeys(sim, ctrlKeys(&ctrl));
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
#ifndef SHROOMS_VB_NATIVE_GAME_
|
||||
#define SHROOMS_VB_NATIVE_GAME_
|
||||
|
||||
#include "graphics.h"
|
||||
#include "shrooms-vb-core/core/vb.h"
|
||||
|
||||
int runGame(VB *sim, GraphicsContext *gfx);
|
||||
|
||||
#endif
|
||||
-92
@@ -1,92 +0,0 @@
|
||||
#include <graphics.h>
|
||||
|
||||
static void copyScreenTexture(uint8_t *dst, const uint8_t *src, int pitch) {
|
||||
int x, y, i;
|
||||
uint8_t color;
|
||||
int delta = pitch / 384;
|
||||
for (y = 0; y < 224; ++y) {
|
||||
for (x = 0; x < 384; x += 1) {
|
||||
color = src[(y * 384) + x];
|
||||
for (i = 0; i < delta; ++i) {
|
||||
dst[(y * pitch) + (x * delta) + i] = color;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int gfxInit(GraphicsContext *gfx) {
|
||||
gfx->window = SDL_CreateWindow("Shrooms VB",
|
||||
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
|
||||
1536, 896, SDL_WINDOW_SHOWN | SDL_WINDOW_ALLOW_HIGHDPI);
|
||||
if (!gfx->window) {
|
||||
fprintf(stderr, "Error creating window: %s\n", SDL_GetError());
|
||||
return 1;
|
||||
}
|
||||
|
||||
gfx->renderer = SDL_CreateRenderer(gfx->window, -1, 0);
|
||||
if (!gfx->renderer) {
|
||||
fprintf(stderr, "Error creating renderer: %s\n", SDL_GetError());
|
||||
goto cleanup_window;
|
||||
}
|
||||
|
||||
gfx->winSurface = SDL_GetWindowSurface(gfx->window);
|
||||
if (!gfx->winSurface) {
|
||||
fprintf(stderr, "Error getting surface: %s\n", SDL_GetError());
|
||||
goto cleanup_window;
|
||||
}
|
||||
|
||||
gfx->leftEye = SDL_CreateTexture(gfx->renderer, SDL_PIXELFORMAT_RGB24, SDL_TEXTUREACCESS_STREAMING, 384, 224);
|
||||
if (!gfx->leftEye) {
|
||||
fprintf(stderr, "Error creating left eye texture: %s\n", SDL_GetError());
|
||||
goto cleanup_window;
|
||||
}
|
||||
SDL_SetTextureColorMod(gfx->leftEye, 0xff, 0, 0);
|
||||
|
||||
gfx->rightEye = SDL_CreateTexture(gfx->renderer, SDL_PIXELFORMAT_RGB24, SDL_TEXTUREACCESS_STREAMING, 384, 224);
|
||||
if (!gfx->rightEye) {
|
||||
fprintf(stderr, "Error creating left eye texture: %s\n", SDL_GetError());
|
||||
goto cleanup_left_eye;
|
||||
}
|
||||
SDL_SetTextureColorMod(gfx->rightEye, 0, 0xc6, 0xf0);
|
||||
SDL_SetTextureBlendMode(gfx->rightEye, SDL_BLENDMODE_ADD);
|
||||
|
||||
return 0;
|
||||
|
||||
cleanup_left_eye:
|
||||
SDL_DestroyTexture(gfx->leftEye);
|
||||
cleanup_window:
|
||||
SDL_DestroyWindow(gfx->window);
|
||||
return 1;
|
||||
}
|
||||
|
||||
void gfxDestroy(GraphicsContext *gfx) {
|
||||
SDL_DestroyTexture(gfx->rightEye);
|
||||
SDL_DestroyTexture(gfx->leftEye);
|
||||
SDL_DestroyWindow(gfx->window);
|
||||
}
|
||||
|
||||
static void gfxUpdateEye(SDL_Texture *eye, const uint8_t *bytes) {
|
||||
void *target;
|
||||
int pitch;
|
||||
if (SDL_LockTexture(eye, NULL, &target, &pitch)) {
|
||||
fprintf(stderr, "Error locking buffer for eye: %s\n", SDL_GetError());
|
||||
return;
|
||||
}
|
||||
copyScreenTexture(target, bytes, pitch);
|
||||
SDL_UnlockTexture(eye);
|
||||
}
|
||||
|
||||
void gfxUpdateLeftEye(GraphicsContext *gfx, const uint8_t *bytes) {
|
||||
gfxUpdateEye(gfx->leftEye, bytes);
|
||||
}
|
||||
void gfxUpdateRightEye(GraphicsContext *gfx, const uint8_t *bytes) {
|
||||
gfxUpdateEye(gfx->rightEye, bytes);
|
||||
}
|
||||
|
||||
void gfxRender(GraphicsContext *gfx) {
|
||||
SDL_RenderClear(gfx->renderer);
|
||||
SDL_RenderCopy(gfx->renderer, gfx->leftEye, NULL, NULL);
|
||||
SDL_RenderCopy(gfx->renderer, gfx->rightEye, NULL, NULL);
|
||||
SDL_RenderPresent(gfx->renderer);
|
||||
}
|
||||
|
||||
-22
@@ -1,22 +0,0 @@
|
||||
#ifndef SHROOMS_VB_NATIVE_GRAPHICS_
|
||||
#define SHROOMS_VB_NATIVE_GRAPHICS_
|
||||
|
||||
#include <SDL2/SDL.h>
|
||||
|
||||
typedef struct {
|
||||
SDL_Window *window;
|
||||
SDL_Surface *winSurface;
|
||||
SDL_Renderer *renderer;
|
||||
SDL_Texture *leftEye;
|
||||
SDL_Texture *rightEye;
|
||||
} GraphicsContext;
|
||||
|
||||
int gfxInit(GraphicsContext *gfx);
|
||||
void gfxDestroy(GraphicsContext *gfx);
|
||||
|
||||
void gfxUpdateLeftEye(GraphicsContext *gfx, const uint8_t *bytes);
|
||||
void gfxUpdateRightEye(GraphicsContext *gfx, const uint8_t *bytes);
|
||||
|
||||
void gfxRender(GraphicsContext *gfx);
|
||||
|
||||
#endif
|
||||
@@ -1,85 +0,0 @@
|
||||
#include <cli.h>
|
||||
#include <game.h>
|
||||
#include <graphics.h>
|
||||
#include <SDL2/SDL.h>
|
||||
#include "shrooms-vb-core/core/vb.h"
|
||||
#include <stdio.h>
|
||||
|
||||
uint8_t *readROM(char *filename, uint32_t *size) {
|
||||
FILE *file = fopen(filename, "rb");
|
||||
uint8_t *rom;
|
||||
long filesize;
|
||||
|
||||
if (!file) {
|
||||
perror("could not open file");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (fseek(file, 0, SEEK_END)) {
|
||||
perror("could not seek file end");
|
||||
return NULL;
|
||||
}
|
||||
filesize = ftell(file);
|
||||
if (filesize == -1) {
|
||||
perror("could not read file size");
|
||||
return NULL;
|
||||
}
|
||||
if (fseek(file, 0, SEEK_SET)) {
|
||||
perror("could not seek file start");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
*size = (uint32_t) filesize;
|
||||
rom = malloc(*size);
|
||||
if (!rom) {
|
||||
perror("could not allocate ROM");
|
||||
return NULL;
|
||||
}
|
||||
fread(rom, 1, *size, file);
|
||||
if (ferror(file)) {
|
||||
perror("could not read file");
|
||||
return NULL;
|
||||
}
|
||||
if (fclose(file)) {
|
||||
perror("could not close file");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return rom;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
VB *sim;
|
||||
uint8_t *rom;
|
||||
uint32_t romSize;
|
||||
GraphicsContext gfx;
|
||||
CLIArgs args;
|
||||
int status;
|
||||
|
||||
if (parseCLIArgs(argc, argv, &args)) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
rom = readROM(args.filename, &romSize);
|
||||
if (!rom) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
sim = malloc(vbSizeOf());
|
||||
vbInit(sim);
|
||||
vbSetCartROM(sim, rom, romSize);
|
||||
|
||||
if (SDL_Init(SDL_INIT_EVERYTHING)) {
|
||||
fprintf(stderr, "Error initializing SDL: %s\n", SDL_GetError());
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (gfxInit(&gfx)) {
|
||||
SDL_Quit();
|
||||
return 1;
|
||||
}
|
||||
|
||||
status = runGame(sim, &gfx);
|
||||
SDL_Quit();
|
||||
return status;
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
CC?=gcc
|
||||
LD?=ld
|
||||
SHROOMSFLAGS=shrooms-vb-core/core/vb.c -I shrooms-vb-core/core
|
||||
msys_version := $(if $(findstring Msys, $(shell uname -o)),$(word 1, $(subst ., ,$(shell uname -r))),0)
|
||||
|
||||
ifeq ($(msys_version), 0)
|
||||
SDL2FLAGS=$(shell pkg-config sdl2 --cflags --libs)
|
||||
BINLINKFLAGS=-z noexecstack
|
||||
else
|
||||
SDL2FLAGS=$(shell pkg-config sdl2 --cflags --libs) -mwindows -mconsole
|
||||
BINLINKFLAGS=
|
||||
endif
|
||||
|
||||
.PHONY: clean build
|
||||
clean:
|
||||
@rm -rf shrooms-vb output
|
||||
|
||||
CFILES := $(foreach dir,./,$(notdir $(wildcard $(dir)/*.c)))
|
||||
BINFILES := $(foreach dir,assets/,$(notdir $(wildcard $(dir)/*.bin)))
|
||||
|
||||
COBJS := $(CFILES:%.c=output/%.o)
|
||||
SHROOMSOBJS := output/vb.o
|
||||
BINOBJS := $(BINFILES:%.bin=output/%.o)
|
||||
|
||||
OFILES := $(COBJS) $(SHROOMSOBJS) $(BINOBJS)
|
||||
|
||||
output/%.o: %.c
|
||||
@mkdir -p output
|
||||
@$(CC) -c -o $@ $< -I . \
|
||||
-I shrooms-vb-core/core $(SDL2FLAGS) \
|
||||
-O3 -flto -fno-strict-aliasing \
|
||||
-Werror -std=c90 -Wall -Wextra -Wpedantic
|
||||
|
||||
output/vb.o: shrooms-vb-core/core/vb.c
|
||||
@mkdir -p output
|
||||
@$(CC) -c -o $@ $< -I . \
|
||||
-I shrooms-vb-core/core $(SDL2FLAGS) \
|
||||
-O3 -flto -fno-strict-aliasing \
|
||||
-Werror -std=c90 -Wall -Wextra -Wpedantic
|
||||
|
||||
output/%.o: assets/%.bin
|
||||
@mkdir -p output
|
||||
@$(LD) -r -b binary $(BINLINKFLAGS) -o $@ $<
|
||||
|
||||
shrooms-vb: $(OFILES)
|
||||
@$(CC) -o $@ $(OFILES) $(SDL2FLAGS) -flto
|
||||
|
||||
build: shrooms-vb
|
||||
+8
-2
@@ -41,9 +41,15 @@ var u_texture: texture_2d<f32>;
|
||||
@group(0) @binding(1)
|
||||
var u_sampler: sampler;
|
||||
|
||||
struct Colors {
|
||||
left: vec4<f32>,
|
||||
right: vec4<f32>,
|
||||
};
|
||||
@group(0) @binding(2)
|
||||
var<uniform> colors: Colors;
|
||||
|
||||
@fragment
|
||||
fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
|
||||
return textureSample(u_texture, u_sampler, in.tex_coords);
|
||||
// return vec4<f32>(0.3, 0.2, 0.1, 1.0);
|
||||
let brt = textureSample(u_texture, u_sampler, in.tex_coords);
|
||||
return colors.left * brt[0] + colors.right * brt[1];
|
||||
}
|
||||
|
||||
+88
-397
@@ -1,440 +1,131 @@
|
||||
use imgui::*;
|
||||
use imgui_wgpu::{Renderer, RendererConfig};
|
||||
use imgui_winit_support::WinitPlatform;
|
||||
use pollster::block_on;
|
||||
use std::{sync::Arc, time::Instant};
|
||||
#[cfg(target_os = "windows")]
|
||||
use winit::platform::windows::{CornerPreference, WindowAttributesExtWindows as _};
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
fmt::Debug,
|
||||
sync::{Arc, RwLock},
|
||||
};
|
||||
|
||||
use game::GameWindow;
|
||||
use winit::{
|
||||
application::ApplicationHandler,
|
||||
dpi::LogicalSize,
|
||||
event::{ElementState, Event, WindowEvent},
|
||||
event_loop::ActiveEventLoop,
|
||||
keyboard::Key,
|
||||
window::Window,
|
||||
event::{Event, WindowEvent},
|
||||
event_loop::{ActiveEventLoop, EventLoopProxy},
|
||||
window::WindowId,
|
||||
};
|
||||
|
||||
use crate::{
|
||||
controller::ControllerState,
|
||||
emulator::{EmulatorClient, EmulatorCommand},
|
||||
renderer::GameRenderer,
|
||||
input::InputMapper,
|
||||
};
|
||||
|
||||
struct ImguiState {
|
||||
context: imgui::Context,
|
||||
platform: WinitPlatform,
|
||||
renderer: Renderer,
|
||||
clear_color: wgpu::Color,
|
||||
last_frame: Instant,
|
||||
last_cursor: Option<MouseCursor>,
|
||||
}
|
||||
|
||||
struct AppWindow {
|
||||
device: wgpu::Device,
|
||||
queue: Arc<wgpu::Queue>,
|
||||
window: Arc<Window>,
|
||||
surface_desc: wgpu::SurfaceConfiguration,
|
||||
surface: wgpu::Surface<'static>,
|
||||
hidpi_factor: f64,
|
||||
pipeline: wgpu::RenderPipeline,
|
||||
bind_group: wgpu::BindGroup,
|
||||
imgui: Option<ImguiState>,
|
||||
}
|
||||
|
||||
impl AppWindow {
|
||||
fn setup_gpu(event_loop: &ActiveEventLoop, client: &EmulatorClient) -> Self {
|
||||
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
|
||||
backends: wgpu::Backends::PRIMARY,
|
||||
..Default::default()
|
||||
});
|
||||
|
||||
let window = {
|
||||
let size = LogicalSize::new(384, 244);
|
||||
|
||||
let attributes = Window::default_attributes()
|
||||
.with_inner_size(size)
|
||||
.with_title("Shrooms VB");
|
||||
#[cfg(target_os = "windows")]
|
||||
let attributes = attributes.with_corner_preference(CornerPreference::DoNotRound);
|
||||
Arc::new(event_loop.create_window(attributes).unwrap())
|
||||
};
|
||||
|
||||
let size = window.inner_size();
|
||||
let hidpi_factor = window.scale_factor();
|
||||
let surface = instance.create_surface(window.clone()).unwrap();
|
||||
|
||||
let adapter = block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
|
||||
power_preference: wgpu::PowerPreference::HighPerformance,
|
||||
compatible_surface: Some(&surface),
|
||||
force_fallback_adapter: false,
|
||||
}))
|
||||
.unwrap();
|
||||
|
||||
let (device, queue) =
|
||||
block_on(adapter.request_device(&wgpu::DeviceDescriptor::default(), None)).unwrap();
|
||||
let queue = Arc::new(queue);
|
||||
let eyes = Arc::new(GameRenderer::create_texture(&device, "eye"));
|
||||
client.send_command(EmulatorCommand::SetRenderer(GameRenderer {
|
||||
queue: queue.clone(),
|
||||
eyes: eyes.clone(),
|
||||
}));
|
||||
let eyes = eyes.create_view(&wgpu::TextureViewDescriptor::default());
|
||||
let sampler = device.create_sampler(&wgpu::SamplerDescriptor::default());
|
||||
let texture_bind_group_layout =
|
||||
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
|
||||
label: Some("texture bind group layout"),
|
||||
entries: &[
|
||||
wgpu::BindGroupLayoutEntry {
|
||||
binding: 0,
|
||||
visibility: wgpu::ShaderStages::FRAGMENT,
|
||||
ty: wgpu::BindingType::Texture {
|
||||
sample_type: wgpu::TextureSampleType::Float { filterable: true },
|
||||
view_dimension: wgpu::TextureViewDimension::D2,
|
||||
multisampled: false,
|
||||
},
|
||||
count: None,
|
||||
},
|
||||
wgpu::BindGroupLayoutEntry {
|
||||
binding: 1,
|
||||
visibility: wgpu::ShaderStages::FRAGMENT,
|
||||
ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
|
||||
count: None,
|
||||
},
|
||||
],
|
||||
});
|
||||
let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
|
||||
label: Some("bind group"),
|
||||
layout: &texture_bind_group_layout,
|
||||
entries: &[
|
||||
wgpu::BindGroupEntry {
|
||||
binding: 0,
|
||||
resource: wgpu::BindingResource::TextureView(&eyes),
|
||||
},
|
||||
wgpu::BindGroupEntry {
|
||||
binding: 1,
|
||||
resource: wgpu::BindingResource::Sampler(&sampler),
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
// Set up swap chain
|
||||
let surface_desc = wgpu::SurfaceConfiguration {
|
||||
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
|
||||
format: wgpu::TextureFormat::Bgra8UnormSrgb,
|
||||
width: size.width,
|
||||
height: size.height,
|
||||
present_mode: wgpu::PresentMode::Fifo,
|
||||
desired_maximum_frame_latency: 2,
|
||||
alpha_mode: wgpu::CompositeAlphaMode::Auto,
|
||||
view_formats: vec![wgpu::TextureFormat::Bgra8Unorm],
|
||||
};
|
||||
|
||||
surface.configure(&device, &surface_desc);
|
||||
|
||||
let shader = device.create_shader_module(wgpu::include_wgsl!("anaglyph.wgsl"));
|
||||
let render_pipeline_layout =
|
||||
device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
|
||||
label: Some("render pipeline layout"),
|
||||
bind_group_layouts: &[&texture_bind_group_layout],
|
||||
push_constant_ranges: &[],
|
||||
});
|
||||
let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
|
||||
label: Some("render pipeline"),
|
||||
layout: Some(&render_pipeline_layout),
|
||||
vertex: wgpu::VertexState {
|
||||
module: &shader,
|
||||
entry_point: "vs_main",
|
||||
buffers: &[],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
},
|
||||
fragment: Some(wgpu::FragmentState {
|
||||
module: &shader,
|
||||
entry_point: "fs_main",
|
||||
targets: &[Some(wgpu::ColorTargetState {
|
||||
format: wgpu::TextureFormat::Bgra8UnormSrgb,
|
||||
blend: Some(wgpu::BlendState::REPLACE),
|
||||
write_mask: wgpu::ColorWrites::ALL,
|
||||
})],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
}),
|
||||
primitive: wgpu::PrimitiveState {
|
||||
topology: wgpu::PrimitiveTopology::TriangleList,
|
||||
strip_index_format: None,
|
||||
front_face: wgpu::FrontFace::Ccw,
|
||||
cull_mode: Some(wgpu::Face::Back),
|
||||
polygon_mode: wgpu::PolygonMode::Fill,
|
||||
unclipped_depth: false,
|
||||
conservative: false,
|
||||
},
|
||||
depth_stencil: None,
|
||||
multisample: wgpu::MultisampleState {
|
||||
count: 1,
|
||||
mask: !0,
|
||||
alpha_to_coverage_enabled: false,
|
||||
},
|
||||
multiview: None,
|
||||
cache: None,
|
||||
});
|
||||
|
||||
let imgui = None;
|
||||
Self {
|
||||
device,
|
||||
queue,
|
||||
window,
|
||||
surface_desc,
|
||||
surface,
|
||||
hidpi_factor,
|
||||
pipeline: render_pipeline,
|
||||
bind_group,
|
||||
imgui,
|
||||
}
|
||||
}
|
||||
|
||||
fn setup_imgui(&mut self) {
|
||||
let mut context = imgui::Context::create();
|
||||
let mut platform = imgui_winit_support::WinitPlatform::new(&mut context);
|
||||
platform.attach_window(
|
||||
context.io_mut(),
|
||||
&self.window,
|
||||
imgui_winit_support::HiDpiMode::Default,
|
||||
);
|
||||
context.set_ini_filename(None);
|
||||
|
||||
let font_size = (13.0 * self.hidpi_factor) as f32;
|
||||
context.io_mut().font_global_scale = (1.0 / self.hidpi_factor) as f32;
|
||||
|
||||
context.fonts().add_font(&[FontSource::DefaultFontData {
|
||||
config: Some(imgui::FontConfig {
|
||||
oversample_h: 1,
|
||||
pixel_snap_h: true,
|
||||
size_pixels: font_size,
|
||||
..Default::default()
|
||||
}),
|
||||
}]);
|
||||
|
||||
//
|
||||
// Set up dear imgui wgpu renderer
|
||||
//
|
||||
let clear_color = wgpu::Color::BLACK;
|
||||
|
||||
let renderer_config = RendererConfig {
|
||||
texture_format: self.surface_desc.format,
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let renderer = Renderer::new(&mut context, &self.device, &self.queue, renderer_config);
|
||||
|
||||
let last_frame = Instant::now();
|
||||
let last_cursor = None;
|
||||
|
||||
self.imgui = Some(ImguiState {
|
||||
context,
|
||||
platform,
|
||||
renderer,
|
||||
clear_color,
|
||||
last_frame,
|
||||
last_cursor,
|
||||
})
|
||||
}
|
||||
|
||||
fn new(event_loop: &ActiveEventLoop, client: &EmulatorClient) -> Self {
|
||||
let mut window = Self::setup_gpu(event_loop, client);
|
||||
window.setup_imgui();
|
||||
window
|
||||
}
|
||||
}
|
||||
mod common;
|
||||
mod game;
|
||||
mod input;
|
||||
|
||||
pub struct App {
|
||||
window: Option<AppWindow>,
|
||||
windows: HashMap<WindowId, Box<dyn AppWindow>>,
|
||||
client: EmulatorClient,
|
||||
input_mapper: Arc<RwLock<InputMapper>>,
|
||||
controller: ControllerState,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
}
|
||||
|
||||
impl App {
|
||||
pub fn new(client: EmulatorClient) -> Self {
|
||||
pub fn new(client: EmulatorClient, proxy: EventLoopProxy<UserEvent>) -> Self {
|
||||
let input_mapper = Arc::new(RwLock::new(InputMapper::new()));
|
||||
let controller = ControllerState::new(input_mapper.clone());
|
||||
Self {
|
||||
window: None,
|
||||
windows: HashMap::new(),
|
||||
client,
|
||||
input_mapper,
|
||||
controller,
|
||||
proxy,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ApplicationHandler for App {
|
||||
impl ApplicationHandler<UserEvent> for App {
|
||||
fn resumed(&mut self, event_loop: &ActiveEventLoop) {
|
||||
self.window = Some(AppWindow::new(event_loop, &self.client));
|
||||
let mut window = GameWindow::new(
|
||||
event_loop,
|
||||
self.client.clone(),
|
||||
self.input_mapper.clone(),
|
||||
self.proxy.clone(),
|
||||
);
|
||||
window.init();
|
||||
self.windows.insert(window.id(), Box::new(window));
|
||||
}
|
||||
|
||||
fn window_event(
|
||||
&mut self,
|
||||
event_loop: &ActiveEventLoop,
|
||||
window_id: winit::window::WindowId,
|
||||
window_id: WindowId,
|
||||
event: WindowEvent,
|
||||
) {
|
||||
let window = self.window.as_mut().unwrap();
|
||||
let imgui = window.imgui.as_mut().unwrap();
|
||||
|
||||
match &event {
|
||||
WindowEvent::Resized(size) => {
|
||||
window.surface_desc = wgpu::SurfaceConfiguration {
|
||||
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
|
||||
format: wgpu::TextureFormat::Bgra8UnormSrgb,
|
||||
width: size.width,
|
||||
height: size.height,
|
||||
present_mode: wgpu::PresentMode::Fifo,
|
||||
desired_maximum_frame_latency: 2,
|
||||
alpha_mode: wgpu::CompositeAlphaMode::Auto,
|
||||
view_formats: vec![wgpu::TextureFormat::Bgra8Unorm],
|
||||
};
|
||||
|
||||
window
|
||||
.surface
|
||||
.configure(&window.device, &window.surface_desc);
|
||||
if let WindowEvent::KeyboardInput { event, .. } = &event {
|
||||
if self.controller.key_event(event) {
|
||||
self.client
|
||||
.send_command(EmulatorCommand::SetKeys(self.controller.pressed()));
|
||||
}
|
||||
WindowEvent::CloseRequested => event_loop.exit(),
|
||||
WindowEvent::KeyboardInput { event, .. } => {
|
||||
if let Key::Character("s") = event.logical_key.as_ref() {
|
||||
match event.state {
|
||||
ElementState::Pressed => {
|
||||
self.client.send_command(EmulatorCommand::PressStart)
|
||||
}
|
||||
ElementState::Released => {
|
||||
self.client.send_command(EmulatorCommand::ReleaseStart)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
WindowEvent::RedrawRequested => {
|
||||
let now = Instant::now();
|
||||
imgui
|
||||
.context
|
||||
.io_mut()
|
||||
.update_delta_time(now - imgui.last_frame);
|
||||
imgui.last_frame = now;
|
||||
|
||||
let frame = match window.surface.get_current_texture() {
|
||||
Ok(frame) => frame,
|
||||
Err(e) => {
|
||||
eprintln!("dropped frame: {e:?}");
|
||||
return;
|
||||
}
|
||||
};
|
||||
imgui
|
||||
.platform
|
||||
.prepare_frame(imgui.context.io_mut(), &window.window)
|
||||
.expect("Failed to prepare frame");
|
||||
let ui = imgui.context.frame();
|
||||
let mut height = 0.0;
|
||||
ui.main_menu_bar(|| {
|
||||
height = ui.window_size()[1];
|
||||
ui.menu("ROM", || {
|
||||
if ui.menu_item("Open ROM") {
|
||||
println!("clicked");
|
||||
}
|
||||
if ui.menu_item("Quit") {
|
||||
event_loop.exit();
|
||||
}
|
||||
});
|
||||
ui.menu("Emulation", || {
|
||||
if ui.menu_item("Pause") {
|
||||
println!("clicked");
|
||||
}
|
||||
if ui.menu_item("Reset") {
|
||||
println!("clicked");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
let mut encoder: wgpu::CommandEncoder = window
|
||||
.device
|
||||
.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: None });
|
||||
|
||||
if imgui.last_cursor != ui.mouse_cursor() {
|
||||
imgui.last_cursor = ui.mouse_cursor();
|
||||
imgui.platform.prepare_render(ui, &window.window);
|
||||
}
|
||||
|
||||
let view = frame
|
||||
.texture
|
||||
.create_view(&wgpu::TextureViewDescriptor::default());
|
||||
let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
|
||||
label: None,
|
||||
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
|
||||
view: &view,
|
||||
resolve_target: None,
|
||||
ops: wgpu::Operations {
|
||||
load: wgpu::LoadOp::Clear(imgui.clear_color),
|
||||
store: wgpu::StoreOp::Store,
|
||||
},
|
||||
})],
|
||||
depth_stencil_attachment: None,
|
||||
timestamp_writes: None,
|
||||
occlusion_query_set: None,
|
||||
});
|
||||
|
||||
rpass.set_pipeline(&window.pipeline);
|
||||
let hidpi = window.hidpi_factor as f32;
|
||||
rpass.set_viewport(0.0, height * hidpi, 384.0 * hidpi, 224.0 * hidpi, 0.0, 1.0);
|
||||
rpass.set_bind_group(0, &window.bind_group, &[]);
|
||||
rpass.draw(0..6, 0..1);
|
||||
|
||||
rpass.set_viewport(0.0, 0.0, 384.0 * hidpi, 224.0 * hidpi, 0.0, 1.0);
|
||||
imgui
|
||||
.renderer
|
||||
.render(
|
||||
imgui.context.render(),
|
||||
&window.queue,
|
||||
&window.device,
|
||||
&mut rpass,
|
||||
)
|
||||
.expect("Rendering failed");
|
||||
|
||||
drop(rpass);
|
||||
|
||||
window.queue.submit(Some(encoder.finish()));
|
||||
|
||||
frame.present();
|
||||
}
|
||||
_ => (),
|
||||
}
|
||||
|
||||
imgui.platform.handle_event::<()>(
|
||||
imgui.context.io_mut(),
|
||||
&window.window,
|
||||
&Event::WindowEvent { window_id, event },
|
||||
);
|
||||
let Some(window) = self.windows.get_mut(&window_id) else {
|
||||
return;
|
||||
};
|
||||
window.handle_event(event_loop, &Event::WindowEvent { window_id, event });
|
||||
}
|
||||
|
||||
fn user_event(&mut self, _event_loop: &ActiveEventLoop, event: ()) {
|
||||
let window = self.window.as_mut().unwrap();
|
||||
let imgui = window.imgui.as_mut().unwrap();
|
||||
imgui.platform.handle_event::<()>(
|
||||
imgui.context.io_mut(),
|
||||
&window.window,
|
||||
&Event::UserEvent(event),
|
||||
);
|
||||
fn user_event(&mut self, _event_loop: &ActiveEventLoop, event: UserEvent) {
|
||||
match event {
|
||||
UserEvent::OpenWindow(mut window) => {
|
||||
window.init();
|
||||
self.windows.insert(window.id(), window);
|
||||
}
|
||||
UserEvent::CloseWindow(window_id) => {
|
||||
self.windows.remove(&window_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn device_event(
|
||||
&mut self,
|
||||
_event_loop: &ActiveEventLoop,
|
||||
event_loop: &ActiveEventLoop,
|
||||
device_id: winit::event::DeviceId,
|
||||
event: winit::event::DeviceEvent,
|
||||
) {
|
||||
let window = self.window.as_mut().unwrap();
|
||||
let imgui = window.imgui.as_mut().unwrap();
|
||||
imgui.platform.handle_event::<()>(
|
||||
imgui.context.io_mut(),
|
||||
&window.window,
|
||||
&Event::DeviceEvent { device_id, event },
|
||||
);
|
||||
for window in self.windows.values_mut() {
|
||||
window.handle_event(
|
||||
event_loop,
|
||||
&Event::DeviceEvent {
|
||||
device_id,
|
||||
event: event.clone(),
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
|
||||
let window = self.window.as_mut().unwrap();
|
||||
let imgui = window.imgui.as_mut().unwrap();
|
||||
window.window.request_redraw();
|
||||
imgui.platform.handle_event::<()>(
|
||||
imgui.context.io_mut(),
|
||||
&window.window,
|
||||
&Event::AboutToWait,
|
||||
);
|
||||
fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
|
||||
for window in self.windows.values_mut() {
|
||||
window.handle_event(event_loop, &Event::AboutToWait);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub trait AppWindow {
|
||||
fn id(&self) -> WindowId;
|
||||
fn init(&mut self);
|
||||
fn handle_event(&mut self, event_loop: &ActiveEventLoop, event: &Event<UserEvent>);
|
||||
}
|
||||
|
||||
pub enum UserEvent {
|
||||
OpenWindow(Box<dyn AppWindow>),
|
||||
CloseWindow(WindowId),
|
||||
}
|
||||
|
||||
impl Debug for UserEvent {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::OpenWindow(window) => f.debug_tuple("OpenWindow").field(&window.id()).finish(),
|
||||
Self::CloseWindow(window_id) => f.debug_tuple("CloseWindow").field(window_id).finish(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,264 @@
|
||||
use std::{
|
||||
ops::{Deref, DerefMut},
|
||||
sync::Arc,
|
||||
time::Instant,
|
||||
};
|
||||
|
||||
use imgui::{FontSource, MouseCursor, SuspendedContext, WindowToken};
|
||||
use imgui_wgpu::{Renderer, RendererConfig};
|
||||
use imgui_winit_support::WinitPlatform;
|
||||
use pollster::block_on;
|
||||
#[cfg(target_os = "windows")]
|
||||
use winit::platform::windows::{CornerPreference, WindowAttributesExtWindows as _};
|
||||
use winit::{
|
||||
dpi::{LogicalSize, PhysicalSize, Size},
|
||||
event_loop::ActiveEventLoop,
|
||||
window::{Window, WindowAttributes},
|
||||
};
|
||||
|
||||
pub struct WindowStateBuilder<'a> {
|
||||
event_loop: &'a ActiveEventLoop,
|
||||
attributes: WindowAttributes,
|
||||
}
|
||||
impl<'a> WindowStateBuilder<'a> {
|
||||
pub fn new(event_loop: &'a ActiveEventLoop) -> Self {
|
||||
let attributes = Window::default_attributes();
|
||||
#[cfg(target_os = "windows")]
|
||||
let attributes = attributes.with_corner_preference(CornerPreference::DoNotRound);
|
||||
Self {
|
||||
event_loop,
|
||||
attributes,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn with_title<T: Into<String>>(self, title: T) -> Self {
|
||||
Self {
|
||||
attributes: self.attributes.with_title(title),
|
||||
..self
|
||||
}
|
||||
}
|
||||
|
||||
pub fn with_inner_size<S: Into<Size>>(self, size: S) -> Self {
|
||||
Self {
|
||||
attributes: self.attributes.with_inner_size(size),
|
||||
..self
|
||||
}
|
||||
}
|
||||
|
||||
pub fn build(self) -> WindowState {
|
||||
WindowState::new(self.event_loop, self.attributes)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct WindowState {
|
||||
pub device: wgpu::Device,
|
||||
pub queue: Arc<wgpu::Queue>,
|
||||
pub window: Arc<Window>,
|
||||
pub surface_desc: wgpu::SurfaceConfiguration,
|
||||
pub surface: wgpu::Surface<'static>,
|
||||
pub hidpi_factor: f64,
|
||||
pub minimized: bool,
|
||||
}
|
||||
|
||||
impl WindowState {
|
||||
fn new(event_loop: &ActiveEventLoop, attributes: WindowAttributes) -> Self {
|
||||
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
|
||||
backends: wgpu::Backends::PRIMARY,
|
||||
..Default::default()
|
||||
});
|
||||
|
||||
let window = Arc::new(event_loop.create_window(attributes).unwrap());
|
||||
|
||||
let size = window.inner_size();
|
||||
let hidpi_factor = window.scale_factor();
|
||||
let surface = instance.create_surface(window.clone()).unwrap();
|
||||
|
||||
let adapter = block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
|
||||
power_preference: wgpu::PowerPreference::HighPerformance,
|
||||
compatible_surface: Some(&surface),
|
||||
force_fallback_adapter: false,
|
||||
}))
|
||||
.unwrap();
|
||||
|
||||
let (device, queue) =
|
||||
block_on(adapter.request_device(&wgpu::DeviceDescriptor::default(), None)).unwrap();
|
||||
let queue = Arc::new(queue);
|
||||
|
||||
// Set up swap chain
|
||||
let surface_desc = wgpu::SurfaceConfiguration {
|
||||
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
|
||||
format: wgpu::TextureFormat::Bgra8UnormSrgb,
|
||||
width: size.width,
|
||||
height: size.height,
|
||||
present_mode: wgpu::PresentMode::Fifo,
|
||||
desired_maximum_frame_latency: 2,
|
||||
alpha_mode: wgpu::CompositeAlphaMode::Auto,
|
||||
view_formats: vec![wgpu::TextureFormat::Bgra8Unorm],
|
||||
};
|
||||
|
||||
surface.configure(&device, &surface_desc);
|
||||
|
||||
Self {
|
||||
device,
|
||||
queue,
|
||||
window,
|
||||
surface_desc,
|
||||
surface,
|
||||
hidpi_factor,
|
||||
minimized: false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn logical_size(&self) -> LogicalSize<u32> {
|
||||
PhysicalSize::new(self.surface_desc.width, self.surface_desc.height)
|
||||
.to_logical(self.hidpi_factor)
|
||||
}
|
||||
|
||||
pub fn handle_resize(&mut self, size: &PhysicalSize<u32>) {
|
||||
if size.width > 0 && size.height > 0 {
|
||||
self.minimized = false;
|
||||
self.surface_desc.width = size.width;
|
||||
self.surface_desc.height = size.height;
|
||||
self.surface.configure(&self.device, &self.surface_desc);
|
||||
} else {
|
||||
self.minimized = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct ImguiState {
|
||||
pub context: ContextGuard,
|
||||
pub platform: WinitPlatform,
|
||||
pub renderer: Renderer,
|
||||
pub clear_color: wgpu::Color,
|
||||
pub last_frame: Instant,
|
||||
pub last_cursor: Option<MouseCursor>,
|
||||
}
|
||||
impl ImguiState {
|
||||
pub fn new(window: &WindowState) -> Self {
|
||||
let mut context_guard = ContextGuard::new();
|
||||
let mut context = context_guard.lock().unwrap();
|
||||
|
||||
let mut platform = imgui_winit_support::WinitPlatform::new(&mut context);
|
||||
platform.attach_window(
|
||||
context.io_mut(),
|
||||
&window.window,
|
||||
imgui_winit_support::HiDpiMode::Default,
|
||||
);
|
||||
context.set_ini_filename(None);
|
||||
|
||||
let font_size = (16.0 * window.hidpi_factor) as f32;
|
||||
context.io_mut().font_global_scale = (1.0 / window.hidpi_factor) as f32;
|
||||
|
||||
context.fonts().add_font(&[FontSource::TtfData {
|
||||
data: include_bytes!("../../assets/selawk.ttf"),
|
||||
size_pixels: font_size,
|
||||
config: Some(imgui::FontConfig {
|
||||
oversample_h: 1,
|
||||
pixel_snap_h: true,
|
||||
size_pixels: font_size,
|
||||
..Default::default()
|
||||
}),
|
||||
}]);
|
||||
|
||||
let style = context.style_mut();
|
||||
style.use_light_colors();
|
||||
|
||||
//
|
||||
// Set up dear imgui wgpu renderer
|
||||
//
|
||||
let renderer_config = RendererConfig {
|
||||
texture_format: window.surface_desc.format,
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let renderer = Renderer::new(&mut context, &window.device, &window.queue, renderer_config);
|
||||
|
||||
let last_frame = Instant::now();
|
||||
let last_cursor = None;
|
||||
|
||||
drop(context);
|
||||
Self {
|
||||
context: context_guard,
|
||||
platform,
|
||||
renderer,
|
||||
clear_color: wgpu::Color::BLACK,
|
||||
last_frame,
|
||||
last_cursor,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct ContextGuard {
|
||||
value: Option<SuspendedContext>,
|
||||
}
|
||||
|
||||
impl ContextGuard {
|
||||
fn new() -> Self {
|
||||
Self {
|
||||
value: Some(SuspendedContext::create()),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn lock(&mut self) -> Option<ContextLock<'_>> {
|
||||
let sus = self.value.take()?;
|
||||
match sus.activate() {
|
||||
Ok(ctx) => Some(ContextLock {
|
||||
ctx: Some(ctx),
|
||||
holder: self,
|
||||
}),
|
||||
Err(sus) => {
|
||||
self.value = Some(sus);
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct ContextLock<'a> {
|
||||
ctx: Option<imgui::Context>,
|
||||
holder: &'a mut ContextGuard,
|
||||
}
|
||||
|
||||
impl<'a> Deref for ContextLock<'a> {
|
||||
type Target = imgui::Context;
|
||||
fn deref(&self) -> &Self::Target {
|
||||
self.ctx.as_ref().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> DerefMut for ContextLock<'a> {
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
self.ctx.as_mut().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Drop for ContextLock<'a> {
|
||||
fn drop(&mut self) {
|
||||
self.holder.value = self.ctx.take().map(|c| c.suspend())
|
||||
}
|
||||
}
|
||||
|
||||
pub trait UiExt {
|
||||
fn fullscreen_window(&self) -> Option<WindowToken<'_>>;
|
||||
fn right_align_text<T: AsRef<str>>(&self, text: T, space: f32);
|
||||
}
|
||||
|
||||
impl UiExt for imgui::Ui {
|
||||
fn fullscreen_window(&self) -> Option<WindowToken<'_>> {
|
||||
self.window("fullscreen")
|
||||
.position([0.0, 0.0], imgui::Condition::Always)
|
||||
.size(self.io().display_size, imgui::Condition::Always)
|
||||
.flags(imgui::WindowFlags::NO_DECORATION)
|
||||
.begin()
|
||||
}
|
||||
|
||||
fn right_align_text<T: AsRef<str>>(&self, text: T, space: f32) {
|
||||
let width = self.calc_text_size(text.as_ref())[0];
|
||||
let [left, y] = self.cursor_pos();
|
||||
let right = left + space;
|
||||
self.set_cursor_pos([right - width, y]);
|
||||
self.text(text);
|
||||
}
|
||||
}
|
||||
+384
@@ -0,0 +1,384 @@
|
||||
use std::{
|
||||
sync::{Arc, RwLock},
|
||||
time::Instant,
|
||||
};
|
||||
use wgpu::util::DeviceExt as _;
|
||||
use winit::{
|
||||
dpi::LogicalSize,
|
||||
event::{Event, WindowEvent},
|
||||
event_loop::{ActiveEventLoop, EventLoopProxy},
|
||||
window::WindowId,
|
||||
};
|
||||
|
||||
use crate::{
|
||||
emulator::{EmulatorClient, EmulatorCommand},
|
||||
input::InputMapper,
|
||||
renderer::GameRenderer,
|
||||
};
|
||||
|
||||
use super::{
|
||||
common::{ImguiState, WindowState, WindowStateBuilder},
|
||||
input::InputWindow,
|
||||
AppWindow, UserEvent,
|
||||
};
|
||||
|
||||
pub struct GameWindow {
|
||||
window: WindowState,
|
||||
imgui: Option<ImguiState>,
|
||||
pipeline: wgpu::RenderPipeline,
|
||||
bind_group: wgpu::BindGroup,
|
||||
client: EmulatorClient,
|
||||
input_mapper: Arc<RwLock<InputMapper>>,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
paused_due_to_minimize: bool,
|
||||
}
|
||||
|
||||
impl GameWindow {
|
||||
pub fn new(
|
||||
event_loop: &ActiveEventLoop,
|
||||
client: EmulatorClient,
|
||||
input_mapper: Arc<RwLock<InputMapper>>,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
) -> Self {
|
||||
let window = WindowStateBuilder::new(event_loop)
|
||||
.with_title("Shrooms VB")
|
||||
.with_inner_size(LogicalSize::new(384, 244))
|
||||
.build();
|
||||
let device = &window.device;
|
||||
|
||||
let eyes = Arc::new(GameRenderer::create_texture(device, "eye"));
|
||||
client.send_command(EmulatorCommand::SetRenderer(GameRenderer {
|
||||
queue: window.queue.clone(),
|
||||
eyes: eyes.clone(),
|
||||
}));
|
||||
let eyes = eyes.create_view(&wgpu::TextureViewDescriptor::default());
|
||||
let sampler = device.create_sampler(&wgpu::SamplerDescriptor::default());
|
||||
let colors = Colors {
|
||||
left: [1.0, 0.0, 0.0, 1.0],
|
||||
right: [0.0, 0.7734375, 0.9375, 1.0],
|
||||
};
|
||||
let color_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
|
||||
label: Some("colors"),
|
||||
contents: bytemuck::bytes_of(&colors),
|
||||
usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
|
||||
});
|
||||
let texture_bind_group_layout =
|
||||
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
|
||||
label: Some("texture bind group layout"),
|
||||
entries: &[
|
||||
wgpu::BindGroupLayoutEntry {
|
||||
binding: 0,
|
||||
visibility: wgpu::ShaderStages::FRAGMENT,
|
||||
ty: wgpu::BindingType::Texture {
|
||||
sample_type: wgpu::TextureSampleType::Float { filterable: true },
|
||||
view_dimension: wgpu::TextureViewDimension::D2,
|
||||
multisampled: false,
|
||||
},
|
||||
count: None,
|
||||
},
|
||||
wgpu::BindGroupLayoutEntry {
|
||||
binding: 1,
|
||||
visibility: wgpu::ShaderStages::FRAGMENT,
|
||||
ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
|
||||
count: None,
|
||||
},
|
||||
wgpu::BindGroupLayoutEntry {
|
||||
binding: 2,
|
||||
visibility: wgpu::ShaderStages::FRAGMENT,
|
||||
ty: wgpu::BindingType::Buffer {
|
||||
ty: wgpu::BufferBindingType::Uniform,
|
||||
has_dynamic_offset: false,
|
||||
min_binding_size: None,
|
||||
},
|
||||
count: None,
|
||||
},
|
||||
],
|
||||
});
|
||||
let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
|
||||
label: Some("bind group"),
|
||||
layout: &texture_bind_group_layout,
|
||||
entries: &[
|
||||
wgpu::BindGroupEntry {
|
||||
binding: 0,
|
||||
resource: wgpu::BindingResource::TextureView(&eyes),
|
||||
},
|
||||
wgpu::BindGroupEntry {
|
||||
binding: 1,
|
||||
resource: wgpu::BindingResource::Sampler(&sampler),
|
||||
},
|
||||
wgpu::BindGroupEntry {
|
||||
binding: 2,
|
||||
resource: color_buf.as_entire_binding(),
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
let shader = device.create_shader_module(wgpu::include_wgsl!("../anaglyph.wgsl"));
|
||||
let render_pipeline_layout =
|
||||
device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
|
||||
label: Some("render pipeline layout"),
|
||||
bind_group_layouts: &[&texture_bind_group_layout],
|
||||
push_constant_ranges: &[],
|
||||
});
|
||||
let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
|
||||
label: Some("render pipeline"),
|
||||
layout: Some(&render_pipeline_layout),
|
||||
vertex: wgpu::VertexState {
|
||||
module: &shader,
|
||||
entry_point: "vs_main",
|
||||
buffers: &[],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
},
|
||||
fragment: Some(wgpu::FragmentState {
|
||||
module: &shader,
|
||||
entry_point: "fs_main",
|
||||
targets: &[Some(wgpu::ColorTargetState {
|
||||
format: wgpu::TextureFormat::Bgra8UnormSrgb,
|
||||
blend: Some(wgpu::BlendState::REPLACE),
|
||||
write_mask: wgpu::ColorWrites::ALL,
|
||||
})],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
}),
|
||||
primitive: wgpu::PrimitiveState {
|
||||
topology: wgpu::PrimitiveTopology::TriangleList,
|
||||
strip_index_format: None,
|
||||
front_face: wgpu::FrontFace::Ccw,
|
||||
cull_mode: Some(wgpu::Face::Back),
|
||||
polygon_mode: wgpu::PolygonMode::Fill,
|
||||
unclipped_depth: false,
|
||||
conservative: false,
|
||||
},
|
||||
depth_stencil: None,
|
||||
multisample: wgpu::MultisampleState {
|
||||
count: 1,
|
||||
mask: !0,
|
||||
alpha_to_coverage_enabled: false,
|
||||
},
|
||||
multiview: None,
|
||||
cache: None,
|
||||
});
|
||||
|
||||
Self {
|
||||
window,
|
||||
imgui: None,
|
||||
pipeline: render_pipeline,
|
||||
bind_group,
|
||||
client,
|
||||
input_mapper,
|
||||
proxy,
|
||||
paused_due_to_minimize: false,
|
||||
}
|
||||
}
|
||||
|
||||
fn draw(&mut self, event_loop: &ActiveEventLoop) {
|
||||
let window = &mut self.window;
|
||||
let imgui = self.imgui.as_mut().unwrap();
|
||||
let mut context = imgui.context.lock().unwrap();
|
||||
let mut new_size = None;
|
||||
|
||||
let now = Instant::now();
|
||||
context.io_mut().update_delta_time(now - imgui.last_frame);
|
||||
imgui.last_frame = now;
|
||||
|
||||
let frame = match window.surface.get_current_texture() {
|
||||
Ok(frame) => frame,
|
||||
Err(e) => {
|
||||
if !self.window.minimized {
|
||||
eprintln!("dropped frame: {e:?}");
|
||||
}
|
||||
return;
|
||||
}
|
||||
};
|
||||
imgui
|
||||
.platform
|
||||
.prepare_frame(context.io_mut(), &window.window)
|
||||
.expect("Failed to prepare frame");
|
||||
let ui = context.new_frame();
|
||||
let mut menu_height = 0.0;
|
||||
ui.main_menu_bar(|| {
|
||||
menu_height = ui.window_size()[1];
|
||||
ui.menu("ROM", || {
|
||||
if ui.menu_item("Open ROM") {
|
||||
let rom = native_dialog::FileDialog::new()
|
||||
.add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
|
||||
.show_open_single_file()
|
||||
.unwrap();
|
||||
if let Some(path) = rom {
|
||||
self.client.send_command(EmulatorCommand::LoadGame(path));
|
||||
}
|
||||
}
|
||||
if ui.menu_item("Quit") {
|
||||
event_loop.exit();
|
||||
}
|
||||
});
|
||||
ui.menu("Emulation", || {
|
||||
let has_game = self.client.has_game();
|
||||
if self.client.is_running() {
|
||||
if ui.menu_item_config("Pause").enabled(has_game).build() {
|
||||
self.client.send_command(EmulatorCommand::Pause);
|
||||
}
|
||||
} else if ui.menu_item_config("Resume").enabled(has_game).build() {
|
||||
self.client.send_command(EmulatorCommand::Resume);
|
||||
}
|
||||
if ui.menu_item_config("Reset").enabled(has_game).build() {
|
||||
self.client.send_command(EmulatorCommand::Reset);
|
||||
}
|
||||
});
|
||||
ui.menu("Video", || {
|
||||
let current_dims = window.logical_size();
|
||||
for scale in 1..=4 {
|
||||
let label = format!("x{scale}");
|
||||
let dims = LogicalSize::new(384 * scale, 224 * scale + 20);
|
||||
let selected = dims == current_dims;
|
||||
if ui.menu_item_config(label).selected(selected).build() {
|
||||
if let Some(size) = window.window.request_inner_size(dims) {
|
||||
window.handle_resize(&size);
|
||||
new_size = Some(size);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
ui.menu("Input", || {
|
||||
if ui.menu_item("Bind Inputs") {
|
||||
let input_window = Box::new(InputWindow::new(
|
||||
event_loop,
|
||||
self.input_mapper.clone(),
|
||||
self.proxy.clone(),
|
||||
));
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenWindow(input_window))
|
||||
.unwrap();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
let mut encoder: wgpu::CommandEncoder = window
|
||||
.device
|
||||
.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: None });
|
||||
|
||||
if imgui.last_cursor != ui.mouse_cursor() {
|
||||
imgui.last_cursor = ui.mouse_cursor();
|
||||
imgui.platform.prepare_render(ui, &window.window);
|
||||
}
|
||||
|
||||
let view = frame
|
||||
.texture
|
||||
.create_view(&wgpu::TextureViewDescriptor::default());
|
||||
let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
|
||||
label: None,
|
||||
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
|
||||
view: &view,
|
||||
resolve_target: None,
|
||||
ops: wgpu::Operations {
|
||||
load: wgpu::LoadOp::Clear(imgui.clear_color),
|
||||
store: wgpu::StoreOp::Store,
|
||||
},
|
||||
})],
|
||||
depth_stencil_attachment: None,
|
||||
timestamp_writes: None,
|
||||
occlusion_query_set: None,
|
||||
});
|
||||
|
||||
// Draw the game
|
||||
rpass.set_pipeline(&self.pipeline);
|
||||
let window_width = window.surface_desc.width as f32;
|
||||
let window_height = window.surface_desc.height as f32;
|
||||
let menu_height = menu_height * window.hidpi_factor as f32;
|
||||
let ((x, y), (width, height)) =
|
||||
compute_game_bounds(window_width, window_height, menu_height);
|
||||
rpass.set_viewport(x, y, width, height, 0.0, 1.0);
|
||||
rpass.set_bind_group(0, &self.bind_group, &[]);
|
||||
rpass.draw(0..6, 0..1);
|
||||
|
||||
// Draw the menu on top of the game
|
||||
rpass.set_viewport(0.0, 0.0, window_width, window_height, 0.0, 1.0);
|
||||
imgui
|
||||
.renderer
|
||||
.render(context.render(), &window.queue, &window.device, &mut rpass)
|
||||
.expect("Rendering failed");
|
||||
|
||||
drop(rpass);
|
||||
|
||||
if let Some(size) = new_size {
|
||||
imgui.platform.handle_event::<UserEvent>(
|
||||
context.io_mut(),
|
||||
&window.window,
|
||||
&Event::WindowEvent {
|
||||
window_id: window.window.id(),
|
||||
event: WindowEvent::Resized(size),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
window.queue.submit(Some(encoder.finish()));
|
||||
|
||||
frame.present();
|
||||
}
|
||||
}
|
||||
|
||||
impl AppWindow for GameWindow {
|
||||
fn id(&self) -> WindowId {
|
||||
self.window.window.id()
|
||||
}
|
||||
|
||||
fn init(&mut self) {
|
||||
self.imgui = Some(ImguiState::new(&self.window));
|
||||
self.window.window.request_redraw();
|
||||
}
|
||||
|
||||
fn handle_event(&mut self, event_loop: &ActiveEventLoop, event: &Event<UserEvent>) {
|
||||
match event {
|
||||
Event::WindowEvent { event, .. } => match event {
|
||||
WindowEvent::Resized(size) => {
|
||||
self.window.handle_resize(size);
|
||||
if self.window.minimized {
|
||||
if self.client.is_running() {
|
||||
self.client.send_command(EmulatorCommand::Pause);
|
||||
self.paused_due_to_minimize = true;
|
||||
}
|
||||
} else if self.paused_due_to_minimize {
|
||||
self.client.send_command(EmulatorCommand::Resume);
|
||||
self.paused_due_to_minimize = false;
|
||||
}
|
||||
}
|
||||
WindowEvent::CloseRequested => event_loop.exit(),
|
||||
WindowEvent::RedrawRequested => self.draw(event_loop),
|
||||
_ => (),
|
||||
},
|
||||
Event::AboutToWait => {
|
||||
self.window.window.request_redraw();
|
||||
}
|
||||
_ => (),
|
||||
}
|
||||
let window = &self.window;
|
||||
let Some(imgui) = self.imgui.as_mut() else {
|
||||
return;
|
||||
};
|
||||
let mut context = imgui.context.lock().unwrap();
|
||||
imgui
|
||||
.platform
|
||||
.handle_event(context.io_mut(), &window.window, event);
|
||||
}
|
||||
}
|
||||
|
||||
fn compute_game_bounds(
|
||||
window_width: f32,
|
||||
window_height: f32,
|
||||
menu_height: f32,
|
||||
) -> ((f32, f32), (f32, f32)) {
|
||||
let available_width = window_width;
|
||||
let available_height = window_height - menu_height;
|
||||
|
||||
let width = available_width.min(available_height * 384.0 / 224.0);
|
||||
let height = available_height.min(available_width * 224.0 / 384.0);
|
||||
let x = (available_width - width) / 2.0;
|
||||
let y = menu_height + (available_height - height) / 2.0;
|
||||
((x, y), (width, height))
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)]
|
||||
#[repr(C)]
|
||||
struct Colors {
|
||||
left: [f32; 4],
|
||||
right: [f32; 4],
|
||||
}
|
||||
@@ -0,0 +1,223 @@
|
||||
use std::{
|
||||
sync::{Arc, RwLock},
|
||||
time::Instant,
|
||||
};
|
||||
|
||||
use winit::{
|
||||
dpi::LogicalSize,
|
||||
event::{Event, KeyEvent, WindowEvent},
|
||||
event_loop::{ActiveEventLoop, EventLoopProxy},
|
||||
platform::modifier_supplement::KeyEventExtModifierSupplement,
|
||||
};
|
||||
|
||||
use crate::{input::InputMapper, shrooms_vb_core::VBKey};
|
||||
|
||||
use super::{
|
||||
common::{ImguiState, UiExt, WindowState, WindowStateBuilder},
|
||||
AppWindow, UserEvent,
|
||||
};
|
||||
|
||||
pub struct InputWindow {
|
||||
window: WindowState,
|
||||
imgui: Option<ImguiState>,
|
||||
input_mapper: Arc<RwLock<InputMapper>>,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
now_binding: Option<VBKey>,
|
||||
}
|
||||
|
||||
const KEY_NAMES: [(VBKey, &str); 14] = [
|
||||
(VBKey::LU, "Up"),
|
||||
(VBKey::LD, "Down"),
|
||||
(VBKey::LL, "Left"),
|
||||
(VBKey::LR, "Right"),
|
||||
(VBKey::SEL, "Select"),
|
||||
(VBKey::STA, "Start"),
|
||||
(VBKey::B, "B"),
|
||||
(VBKey::A, "A"),
|
||||
(VBKey::LT, "L-Trigger"),
|
||||
(VBKey::RT, "R-Trigger"),
|
||||
(VBKey::RU, "R-Up"),
|
||||
(VBKey::RD, "R-Down"),
|
||||
(VBKey::RL, "R-Left"),
|
||||
(VBKey::RR, "R-Right"),
|
||||
];
|
||||
|
||||
impl InputWindow {
|
||||
pub fn new(
|
||||
event_loop: &ActiveEventLoop,
|
||||
input_mapper: Arc<RwLock<InputMapper>>,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
) -> Self {
|
||||
let window = WindowStateBuilder::new(event_loop)
|
||||
.with_title("Bind Inputs")
|
||||
.with_inner_size(LogicalSize::new(600, 400))
|
||||
.build();
|
||||
Self {
|
||||
window,
|
||||
imgui: None,
|
||||
input_mapper,
|
||||
now_binding: None,
|
||||
proxy,
|
||||
}
|
||||
}
|
||||
|
||||
fn draw(&mut self) {
|
||||
let window = &mut self.window;
|
||||
let imgui = self.imgui.as_mut().unwrap();
|
||||
let mut context = imgui.context.lock().unwrap();
|
||||
|
||||
let now = Instant::now();
|
||||
context.io_mut().update_delta_time(now - imgui.last_frame);
|
||||
imgui.last_frame = now;
|
||||
|
||||
let frame = match window.surface.get_current_texture() {
|
||||
Ok(frame) => frame,
|
||||
Err(e) => {
|
||||
if !self.window.minimized {
|
||||
eprintln!("dropped frame: {e:?}");
|
||||
}
|
||||
return;
|
||||
}
|
||||
};
|
||||
imgui
|
||||
.platform
|
||||
.prepare_frame(context.io_mut(), &window.window)
|
||||
.expect("Failed to prepare frame");
|
||||
let ui = context.new_frame();
|
||||
|
||||
let mut render_key_bindings = || {
|
||||
if let Some(table) = ui.begin_table("controls", 2) {
|
||||
let binding_names = {
|
||||
let mapper = self.input_mapper.read().unwrap();
|
||||
mapper.binding_names()
|
||||
};
|
||||
ui.table_next_row();
|
||||
|
||||
for (key, name) in KEY_NAMES {
|
||||
let binding = binding_names.get(&key).map(|s| s.as_str());
|
||||
ui.table_next_column();
|
||||
let [space, _] = ui.content_region_avail();
|
||||
ui.group(|| {
|
||||
ui.right_align_text(name, space * 0.20);
|
||||
ui.same_line();
|
||||
let label_text = if self.now_binding == Some(key) {
|
||||
"Press any input"
|
||||
} else {
|
||||
binding.unwrap_or("")
|
||||
};
|
||||
let label = format!("{}##{}", label_text, name);
|
||||
if ui.button_with_size(label, [space * 0.60, 0.0]) {
|
||||
self.now_binding = Some(key);
|
||||
}
|
||||
});
|
||||
ui.same_line();
|
||||
if ui.button(format!("Clear##{name}")) {
|
||||
let mut mapper = self.input_mapper.write().unwrap();
|
||||
mapper.clear_binding(key);
|
||||
}
|
||||
}
|
||||
|
||||
table.end();
|
||||
}
|
||||
};
|
||||
|
||||
if let Some(window) = ui.fullscreen_window() {
|
||||
if let Some(tabs) = ui.tab_bar("tabs") {
|
||||
if let Some(tab) = ui.tab_item("Player 1") {
|
||||
render_key_bindings();
|
||||
tab.end();
|
||||
}
|
||||
tabs.end();
|
||||
}
|
||||
window.end();
|
||||
}
|
||||
let mut encoder: wgpu::CommandEncoder = window
|
||||
.device
|
||||
.create_command_encoder(&wgpu::CommandEncoderDescriptor { label: None });
|
||||
|
||||
if imgui.last_cursor != ui.mouse_cursor() {
|
||||
imgui.last_cursor = ui.mouse_cursor();
|
||||
imgui.platform.prepare_render(ui, &window.window);
|
||||
}
|
||||
|
||||
let view = frame
|
||||
.texture
|
||||
.create_view(&wgpu::TextureViewDescriptor::default());
|
||||
let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
|
||||
label: None,
|
||||
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
|
||||
view: &view,
|
||||
resolve_target: None,
|
||||
ops: wgpu::Operations {
|
||||
load: wgpu::LoadOp::Clear(imgui.clear_color),
|
||||
store: wgpu::StoreOp::Store,
|
||||
},
|
||||
})],
|
||||
depth_stencil_attachment: None,
|
||||
timestamp_writes: None,
|
||||
occlusion_query_set: None,
|
||||
});
|
||||
|
||||
// Draw the game
|
||||
imgui
|
||||
.renderer
|
||||
.render(context.render(), &window.queue, &window.device, &mut rpass)
|
||||
.expect("Rendering failed");
|
||||
|
||||
drop(rpass);
|
||||
|
||||
window.queue.submit(Some(encoder.finish()));
|
||||
|
||||
frame.present();
|
||||
}
|
||||
|
||||
fn try_bind_key(&mut self, event: &KeyEvent) {
|
||||
if !event.state.is_pressed() {
|
||||
return;
|
||||
}
|
||||
let Some(vb) = self.now_binding.take() else {
|
||||
return;
|
||||
};
|
||||
let mut mapper = self.input_mapper.write().unwrap();
|
||||
mapper.bind_key(vb, event.key_without_modifiers());
|
||||
}
|
||||
}
|
||||
|
||||
impl AppWindow for InputWindow {
|
||||
fn id(&self) -> winit::window::WindowId {
|
||||
self.window.window.id()
|
||||
}
|
||||
|
||||
fn init(&mut self) {
|
||||
self.imgui = Some(ImguiState::new(&self.window));
|
||||
self.window.window.request_redraw();
|
||||
}
|
||||
|
||||
fn handle_event(&mut self, _: &ActiveEventLoop, event: &Event<UserEvent>) {
|
||||
match event {
|
||||
Event::WindowEvent { event, .. } => match event {
|
||||
WindowEvent::Resized(size) => self.window.handle_resize(size),
|
||||
WindowEvent::CloseRequested => self
|
||||
.proxy
|
||||
.send_event(UserEvent::CloseWindow(self.id()))
|
||||
.unwrap(),
|
||||
WindowEvent::KeyboardInput { event, .. } => self.try_bind_key(event),
|
||||
WindowEvent::RedrawRequested => self.draw(),
|
||||
_ => (),
|
||||
},
|
||||
Event::AboutToWait => {
|
||||
self.window.window.request_redraw();
|
||||
}
|
||||
_ => (),
|
||||
}
|
||||
|
||||
let window = &self.window;
|
||||
let Some(imgui) = self.imgui.as_mut() else {
|
||||
return;
|
||||
};
|
||||
let mut context = imgui.context.lock().unwrap();
|
||||
imgui
|
||||
.platform
|
||||
.handle_event(context.io_mut(), &window.window, event);
|
||||
}
|
||||
}
|
||||
+101
@@ -0,0 +1,101 @@
|
||||
use anyhow::{bail, Result};
|
||||
use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
|
||||
use itertools::Itertools;
|
||||
use rubato::{FftFixedInOut, Resampler};
|
||||
|
||||
pub struct Audio {
|
||||
#[allow(unused)]
|
||||
stream: cpal::Stream,
|
||||
sampler: FftFixedInOut<f32>,
|
||||
input_buffer: Vec<Vec<f32>>,
|
||||
output_buffer: Vec<Vec<f32>>,
|
||||
sample_sink: rtrb::Producer<f32>,
|
||||
}
|
||||
|
||||
impl Audio {
|
||||
pub fn init() -> Result<Self> {
|
||||
let host = cpal::default_host();
|
||||
let Some(device) = host.default_output_device() else {
|
||||
bail!("No output device available");
|
||||
};
|
||||
let Some(config) = device
|
||||
.supported_output_configs()?
|
||||
.find(|c| c.channels() == 2 && c.sample_format().is_float())
|
||||
else {
|
||||
bail!("No suitable output config available");
|
||||
};
|
||||
let mut config = config.with_max_sample_rate().config();
|
||||
let sampler = FftFixedInOut::new(41700, config.sample_rate.0 as usize, 834, 2)?;
|
||||
config.buffer_size = cpal::BufferSize::Fixed(sampler.output_frames_max() as u32);
|
||||
|
||||
let input_buffer = sampler.input_buffer_allocate(true);
|
||||
let output_buffer = sampler.output_buffer_allocate(true);
|
||||
let (sample_sink, mut sample_source) =
|
||||
rtrb::RingBuffer::new(sampler.output_frames_max() * 4);
|
||||
|
||||
let stream = device.build_output_stream(
|
||||
&config,
|
||||
move |data: &mut [f32], _| {
|
||||
let requested = data.len();
|
||||
let chunk = match sample_source.read_chunk(data.len()) {
|
||||
Ok(c) => c,
|
||||
Err(rtrb::chunks::ChunkError::TooFewSlots(n)) => {
|
||||
sample_source.read_chunk(n).unwrap()
|
||||
}
|
||||
};
|
||||
let len = chunk.len();
|
||||
let (first, second) = chunk.as_slices();
|
||||
data[0..first.len()].copy_from_slice(first);
|
||||
data[first.len()..len].copy_from_slice(second);
|
||||
for rest in &mut data[len..requested] {
|
||||
*rest = 0.0;
|
||||
}
|
||||
chunk.commit_all();
|
||||
},
|
||||
move |err| eprintln!("stream error: {err}"),
|
||||
None,
|
||||
)?;
|
||||
stream.play()?;
|
||||
Ok(Self {
|
||||
stream,
|
||||
sampler,
|
||||
input_buffer,
|
||||
output_buffer,
|
||||
sample_sink,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn update(&mut self, samples: &[f32]) {
|
||||
for sample in samples.chunks_exact(2) {
|
||||
for (channel, value) in self.input_buffer.iter_mut().zip(sample) {
|
||||
channel.push(*value);
|
||||
}
|
||||
if self.input_buffer[0].len() >= self.sampler.input_frames_next() {
|
||||
let (_, output_samples) = self
|
||||
.sampler
|
||||
.process_into_buffer(&self.input_buffer, &mut self.output_buffer, None)
|
||||
.unwrap();
|
||||
|
||||
let chunk = match self.sample_sink.write_chunk_uninit(output_samples * 2) {
|
||||
Ok(c) => c,
|
||||
Err(rtrb::chunks::ChunkError::TooFewSlots(n)) => {
|
||||
self.sample_sink.write_chunk_uninit(n).unwrap()
|
||||
}
|
||||
};
|
||||
let interleaved = self.output_buffer[0]
|
||||
.iter()
|
||||
.interleave(self.output_buffer[1].iter())
|
||||
.cloned();
|
||||
chunk.fill_from_iter(interleaved);
|
||||
|
||||
for channel in &mut self.input_buffer {
|
||||
channel.clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
while self.sample_sink.slots() < self.sampler.output_frames_max() * 2 {
|
||||
std::hint::spin_loop();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
use std::sync::{Arc, RwLock};
|
||||
|
||||
use winit::event::{ElementState, KeyEvent};
|
||||
|
||||
use crate::{input::InputMapper, shrooms_vb_core::VBKey};
|
||||
|
||||
pub struct ControllerState {
|
||||
input_mapper: Arc<RwLock<InputMapper>>,
|
||||
pressed: VBKey,
|
||||
}
|
||||
|
||||
impl ControllerState {
|
||||
pub fn new(input_mapper: Arc<RwLock<InputMapper>>) -> Self {
|
||||
Self {
|
||||
input_mapper,
|
||||
pressed: VBKey::SGN,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn pressed(&self) -> VBKey {
|
||||
self.pressed
|
||||
}
|
||||
|
||||
pub fn key_event(&mut self, event: &KeyEvent) -> bool {
|
||||
let Some(input) = self.key_event_to_input(event) else {
|
||||
return false;
|
||||
};
|
||||
match event.state {
|
||||
ElementState::Pressed => {
|
||||
if self.pressed.contains(input) {
|
||||
return false;
|
||||
}
|
||||
self.pressed.insert(input);
|
||||
true
|
||||
}
|
||||
ElementState::Released => {
|
||||
if !self.pressed.contains(input) {
|
||||
return false;
|
||||
}
|
||||
self.pressed.remove(input);
|
||||
true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn key_event_to_input(&self, event: &KeyEvent) -> Option<VBKey> {
|
||||
let mapper = self.input_mapper.read().unwrap();
|
||||
mapper.key_event(event)
|
||||
}
|
||||
}
|
||||
+123
-17
@@ -1,46 +1,126 @@
|
||||
use std::{
|
||||
fs,
|
||||
path::Path,
|
||||
sync::mpsc::{self, TryRecvError},
|
||||
path::{Path, PathBuf},
|
||||
sync::{
|
||||
atomic::{AtomicBool, Ordering},
|
||||
mpsc::{self, RecvError, TryRecvError},
|
||||
Arc,
|
||||
},
|
||||
};
|
||||
|
||||
use anyhow::Result;
|
||||
|
||||
use crate::{renderer::GameRenderer, shrooms_vb_core::CoreVB};
|
||||
use crate::{
|
||||
audio::Audio,
|
||||
renderer::GameRenderer,
|
||||
shrooms_vb_core::{CoreVB, VBKey},
|
||||
};
|
||||
|
||||
pub struct EmulatorBuilder {
|
||||
rom: Option<PathBuf>,
|
||||
commands: mpsc::Receiver<EmulatorCommand>,
|
||||
running: Arc<AtomicBool>,
|
||||
has_game: Arc<AtomicBool>,
|
||||
}
|
||||
|
||||
impl EmulatorBuilder {
|
||||
pub fn new() -> (Self, EmulatorClient) {
|
||||
let (queue, commands) = mpsc::channel();
|
||||
let builder = Self {
|
||||
rom: None,
|
||||
commands,
|
||||
running: Arc::new(AtomicBool::new(false)),
|
||||
has_game: Arc::new(AtomicBool::new(false)),
|
||||
};
|
||||
let client = EmulatorClient {
|
||||
queue,
|
||||
running: builder.running.clone(),
|
||||
has_game: builder.has_game.clone(),
|
||||
};
|
||||
(builder, client)
|
||||
}
|
||||
|
||||
pub fn with_rom(self, path: &Path) -> Self {
|
||||
Self {
|
||||
rom: Some(path.into()),
|
||||
..self
|
||||
}
|
||||
}
|
||||
|
||||
pub fn build(self) -> Result<Emulator> {
|
||||
let mut emulator = Emulator::new(self.commands, self.running, self.has_game)?;
|
||||
if let Some(path) = self.rom {
|
||||
emulator.load_rom(&path)?;
|
||||
}
|
||||
Ok(emulator)
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Emulator {
|
||||
sim: CoreVB,
|
||||
audio: Audio,
|
||||
commands: mpsc::Receiver<EmulatorCommand>,
|
||||
renderer: Option<GameRenderer>,
|
||||
running: Arc<AtomicBool>,
|
||||
has_game: Arc<AtomicBool>,
|
||||
}
|
||||
|
||||
impl Emulator {
|
||||
pub fn new() -> (Self, EmulatorClient) {
|
||||
let (sink, source) = mpsc::channel();
|
||||
let emu = Emulator {
|
||||
fn new(
|
||||
commands: mpsc::Receiver<EmulatorCommand>,
|
||||
running: Arc<AtomicBool>,
|
||||
has_game: Arc<AtomicBool>,
|
||||
) -> Result<Self> {
|
||||
Ok(Self {
|
||||
sim: CoreVB::new(),
|
||||
commands: source,
|
||||
audio: Audio::init()?,
|
||||
commands,
|
||||
renderer: None,
|
||||
};
|
||||
let queue = EmulatorClient { queue: sink };
|
||||
(emu, queue)
|
||||
running,
|
||||
has_game,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn load_rom(&mut self, path: &Path) -> Result<()> {
|
||||
let bytes = fs::read(path)?;
|
||||
self.sim.reset();
|
||||
self.sim.load_rom(bytes)?;
|
||||
self.has_game.store(true, Ordering::Release);
|
||||
self.running.store(true, Ordering::Release);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn run(&mut self) {
|
||||
let mut eye_contents = vec![0u8; 384 * 224 * 2];
|
||||
let mut audio_samples = vec![];
|
||||
loop {
|
||||
self.sim.emulate_frame();
|
||||
let mut idle = true;
|
||||
if self.running.load(Ordering::Acquire) {
|
||||
idle = false;
|
||||
self.sim.emulate_frame();
|
||||
}
|
||||
if let Some(renderer) = &mut self.renderer {
|
||||
if self.sim.read_pixels(&mut eye_contents) {
|
||||
idle = false;
|
||||
renderer.render(&eye_contents);
|
||||
}
|
||||
}
|
||||
self.sim.read_samples(&mut audio_samples);
|
||||
if !audio_samples.is_empty() {
|
||||
idle = false;
|
||||
self.audio.update(&audio_samples);
|
||||
audio_samples.clear();
|
||||
}
|
||||
if idle {
|
||||
// The game is paused, and we have output all the video/audio we have.
|
||||
// Block the thread until a new command comes in.
|
||||
match self.commands.recv() {
|
||||
Ok(command) => self.handle_command(command),
|
||||
Err(RecvError) => {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
loop {
|
||||
match self.commands.try_recv() {
|
||||
Ok(command) => self.handle_command(command),
|
||||
@@ -60,11 +140,25 @@ impl Emulator {
|
||||
EmulatorCommand::SetRenderer(renderer) => {
|
||||
self.renderer = Some(renderer);
|
||||
}
|
||||
EmulatorCommand::PressStart => {
|
||||
self.sim.set_keys(0x1003);
|
||||
EmulatorCommand::LoadGame(path) => {
|
||||
if let Err(error) = self.load_rom(&path) {
|
||||
eprintln!("error loading rom: {}", error);
|
||||
}
|
||||
}
|
||||
EmulatorCommand::ReleaseStart => {
|
||||
self.sim.set_keys(0x0003);
|
||||
EmulatorCommand::Pause => {
|
||||
self.running.store(false, Ordering::Release);
|
||||
}
|
||||
EmulatorCommand::Resume => {
|
||||
if self.has_game.load(Ordering::Acquire) {
|
||||
self.running.store(true, Ordering::Relaxed);
|
||||
}
|
||||
}
|
||||
EmulatorCommand::Reset => {
|
||||
self.sim.reset();
|
||||
self.running.store(true, Ordering::Release);
|
||||
}
|
||||
EmulatorCommand::SetKeys(keys) => {
|
||||
self.sim.set_keys(keys);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -73,15 +167,27 @@ impl Emulator {
|
||||
#[derive(Debug)]
|
||||
pub enum EmulatorCommand {
|
||||
SetRenderer(GameRenderer),
|
||||
PressStart,
|
||||
ReleaseStart,
|
||||
LoadGame(PathBuf),
|
||||
Pause,
|
||||
Resume,
|
||||
Reset,
|
||||
SetKeys(VBKey),
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct EmulatorClient {
|
||||
queue: mpsc::Sender<EmulatorCommand>,
|
||||
running: Arc<AtomicBool>,
|
||||
has_game: Arc<AtomicBool>,
|
||||
}
|
||||
|
||||
impl EmulatorClient {
|
||||
pub fn is_running(&self) -> bool {
|
||||
self.running.load(Ordering::Acquire)
|
||||
}
|
||||
pub fn has_game(&self) -> bool {
|
||||
self.has_game.load(Ordering::Acquire)
|
||||
}
|
||||
pub fn send_command(&self, command: EmulatorCommand) {
|
||||
if let Err(err) = self.queue.send(command) {
|
||||
eprintln!(
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use winit::{
|
||||
event::KeyEvent,
|
||||
keyboard::{Key, NamedKey},
|
||||
platform::modifier_supplement::KeyEventExtModifierSupplement,
|
||||
};
|
||||
|
||||
use crate::shrooms_vb_core::VBKey;
|
||||
|
||||
pub struct InputMapper {
|
||||
vb_bindings: HashMap<VBKey, Key>,
|
||||
key_bindings: HashMap<Key, VBKey>,
|
||||
}
|
||||
|
||||
impl InputMapper {
|
||||
pub fn new() -> Self {
|
||||
let mut mapper = Self {
|
||||
vb_bindings: HashMap::new(),
|
||||
key_bindings: HashMap::new(),
|
||||
};
|
||||
mapper.bind_key(VBKey::SEL, Key::Character("a".into()));
|
||||
mapper.bind_key(VBKey::STA, Key::Character("s".into()));
|
||||
mapper.bind_key(VBKey::B, Key::Character("d".into()));
|
||||
mapper.bind_key(VBKey::A, Key::Character("f".into()));
|
||||
mapper.bind_key(VBKey::LT, Key::Character("e".into()));
|
||||
mapper.bind_key(VBKey::RT, Key::Character("r".into()));
|
||||
mapper.bind_key(VBKey::RU, Key::Character("i".into()));
|
||||
mapper.bind_key(VBKey::RL, Key::Character("j".into()));
|
||||
mapper.bind_key(VBKey::RD, Key::Character("k".into()));
|
||||
mapper.bind_key(VBKey::RR, Key::Character("l".into()));
|
||||
mapper.bind_key(VBKey::LU, Key::Named(NamedKey::ArrowUp));
|
||||
mapper.bind_key(VBKey::LL, Key::Named(NamedKey::ArrowLeft));
|
||||
mapper.bind_key(VBKey::LD, Key::Named(NamedKey::ArrowDown));
|
||||
mapper.bind_key(VBKey::LR, Key::Named(NamedKey::ArrowRight));
|
||||
mapper
|
||||
}
|
||||
|
||||
pub fn binding_names(&self) -> HashMap<VBKey, String> {
|
||||
self.vb_bindings
|
||||
.iter()
|
||||
.map(|(k, v)| {
|
||||
let name = match v {
|
||||
Key::Character(char) => char.to_string(),
|
||||
Key::Named(key) => format!("{:?}", key),
|
||||
k => format!("{:?}", k),
|
||||
};
|
||||
(*k, name)
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub fn bind_key(&mut self, vb: VBKey, key: Key) {
|
||||
if let Some(old) = self.vb_bindings.insert(vb, key.clone()) {
|
||||
self.key_bindings.remove(&old);
|
||||
}
|
||||
self.key_bindings.insert(key, vb);
|
||||
}
|
||||
|
||||
pub fn clear_binding(&mut self, vb: VBKey) {
|
||||
if let Some(old) = self.vb_bindings.remove(&vb) {
|
||||
self.key_bindings.remove(&old);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn key_event(&self, event: &KeyEvent) -> Option<VBKey> {
|
||||
self.key_bindings
|
||||
.get(&event.key_without_modifiers())
|
||||
.cloned()
|
||||
}
|
||||
}
|
||||
+28
-10
@@ -1,32 +1,50 @@
|
||||
use std::{path::PathBuf, thread};
|
||||
use std::{path::PathBuf, process};
|
||||
|
||||
use anyhow::Result;
|
||||
use app::App;
|
||||
use clap::Parser;
|
||||
use emulator::Emulator;
|
||||
use emulator::EmulatorBuilder;
|
||||
use thread_priority::{ThreadBuilder, ThreadPriority};
|
||||
use winit::event_loop::{ControlFlow, EventLoop};
|
||||
|
||||
mod app;
|
||||
mod audio;
|
||||
mod controller;
|
||||
mod emulator;
|
||||
mod input;
|
||||
mod renderer;
|
||||
mod shrooms_vb_core;
|
||||
|
||||
#[derive(Parser)]
|
||||
struct Args {
|
||||
rom: PathBuf,
|
||||
rom: Option<PathBuf>,
|
||||
}
|
||||
|
||||
fn main() -> Result<()> {
|
||||
let args = Args::parse();
|
||||
|
||||
let (mut emulator, client) = Emulator::new();
|
||||
emulator.load_rom(&args.rom)?;
|
||||
thread::spawn(move || {
|
||||
emulator.run();
|
||||
});
|
||||
let (mut builder, client) = EmulatorBuilder::new();
|
||||
if let Some(path) = args.rom {
|
||||
builder = builder.with_rom(&path);
|
||||
}
|
||||
|
||||
let event_loop = EventLoop::new().unwrap();
|
||||
ThreadBuilder::default()
|
||||
.name("Emulator".to_owned())
|
||||
.priority(ThreadPriority::Max)
|
||||
.spawn_careless(move || {
|
||||
let mut emulator = match builder.build() {
|
||||
Ok(e) => e,
|
||||
Err(err) => {
|
||||
eprintln!("Error initializing emulator: {err}");
|
||||
process::exit(1);
|
||||
}
|
||||
};
|
||||
emulator.run();
|
||||
})?;
|
||||
|
||||
let event_loop = EventLoop::with_user_event().build().unwrap();
|
||||
event_loop.set_control_flow(ControlFlow::Poll);
|
||||
event_loop.run_app(&mut App::new(client))?;
|
||||
let proxy = event_loop.create_proxy();
|
||||
event_loop.run_app(&mut App::new(client, proxy))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
+95
-3
@@ -1,6 +1,8 @@
|
||||
use std::{ffi::c_void, ptr};
|
||||
use std::{ffi::c_void, ptr, slice};
|
||||
|
||||
use anyhow::{anyhow, Result};
|
||||
use bitflags::bitflags;
|
||||
use num_derive::{FromPrimitive, ToPrimitive};
|
||||
|
||||
#[repr(C)]
|
||||
struct VB {
|
||||
@@ -9,6 +11,43 @@ struct VB {
|
||||
|
||||
#[allow(non_camel_case_types)]
|
||||
type c_int = i32;
|
||||
#[allow(non_camel_case_types)]
|
||||
type c_uint = u32;
|
||||
|
||||
#[repr(u32)]
|
||||
#[derive(FromPrimitive, ToPrimitive)]
|
||||
enum VBDataType {
|
||||
S8 = 0,
|
||||
U8 = 1,
|
||||
S16 = 2,
|
||||
U16 = 3,
|
||||
S32 = 4,
|
||||
F32 = 5,
|
||||
}
|
||||
|
||||
bitflags! {
|
||||
#[repr(transparent)]
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
|
||||
pub struct VBKey: u16 {
|
||||
const PWR = 0x0001;
|
||||
const SGN = 0x0002;
|
||||
const A = 0x0004;
|
||||
const B = 0x0008;
|
||||
const RT = 0x0010;
|
||||
const LT = 0x0020;
|
||||
const RU = 0x0040;
|
||||
const RR = 0x0080;
|
||||
const LR = 0x0100;
|
||||
const LL = 0x0200;
|
||||
const LD = 0x0400;
|
||||
const LU = 0x0800;
|
||||
const STA = 0x1000;
|
||||
const SEL = 0x2000;
|
||||
const RL = 0x4000;
|
||||
const RD = 0x8000;
|
||||
}
|
||||
}
|
||||
|
||||
type OnFrame = extern "C" fn(sim: *mut VB) -> c_int;
|
||||
|
||||
#[link(name = "vb")]
|
||||
@@ -27,6 +66,13 @@ extern "C" {
|
||||
right_stride_x: c_int,
|
||||
right_stride_y: c_int,
|
||||
);
|
||||
#[link_name = "vbGetSamples"]
|
||||
fn vb_get_samples(
|
||||
sim: *mut VB,
|
||||
typ_: *mut VBDataType,
|
||||
capacity: *mut c_uint,
|
||||
position: *mut c_uint,
|
||||
) -> *mut c_void;
|
||||
#[link_name = "vbGetUserData"]
|
||||
fn vb_get_user_data(sim: *mut VB) -> *mut c_void;
|
||||
#[link_name = "vbInit"]
|
||||
@@ -39,6 +85,13 @@ extern "C" {
|
||||
fn vb_set_keys(sim: *mut VB, keys: u16) -> u16;
|
||||
#[link_name = "vbSetFrameCallback"]
|
||||
fn vb_set_frame_callback(sim: *mut VB, on_frame: OnFrame);
|
||||
#[link_name = "vbSetSamples"]
|
||||
fn vb_set_samples(
|
||||
sim: *mut VB,
|
||||
samples: *mut c_void,
|
||||
typ_: VBDataType,
|
||||
capacity: c_uint,
|
||||
) -> c_int;
|
||||
#[link_name = "vbSetUserData"]
|
||||
fn vb_set_user_data(sim: *mut VB, tag: *mut c_void);
|
||||
#[link_name = "vbSizeOf"]
|
||||
@@ -53,6 +106,9 @@ extern "C" fn on_frame(sim: *mut VB) -> i32 {
|
||||
1
|
||||
}
|
||||
|
||||
const AUDIO_CAPACITY_SAMPLES: usize = 834 * 4;
|
||||
const AUDIO_CAPACITY_FLOATS: usize = AUDIO_CAPACITY_SAMPLES * 2;
|
||||
|
||||
struct VBState {
|
||||
frame_seen: bool,
|
||||
}
|
||||
@@ -79,9 +135,18 @@ impl CoreVB {
|
||||
unsafe { vb_set_user_data(sim, Box::into_raw(Box::new(state)).cast()) };
|
||||
unsafe { vb_set_frame_callback(sim, on_frame) };
|
||||
|
||||
// set up audio buffer
|
||||
let audio_buffer = vec![0.0f32; AUDIO_CAPACITY_FLOATS];
|
||||
let samples: *mut c_void = Box::into_raw(audio_buffer.into_boxed_slice()).cast();
|
||||
unsafe { vb_set_samples(sim, samples, VBDataType::F32, AUDIO_CAPACITY_SAMPLES as u32) };
|
||||
|
||||
CoreVB { sim }
|
||||
}
|
||||
|
||||
pub fn reset(&mut self) {
|
||||
unsafe { vb_reset(self.sim) };
|
||||
}
|
||||
|
||||
pub fn load_rom(&mut self, rom: Vec<u8>) -> Result<()> {
|
||||
self.unload_rom();
|
||||
|
||||
@@ -138,13 +203,40 @@ impl CoreVB {
|
||||
true
|
||||
}
|
||||
|
||||
pub fn set_keys(&mut self, keys: u16) {
|
||||
unsafe { vb_set_keys(self.sim, keys) };
|
||||
pub fn read_samples(&mut self, samples: &mut Vec<f32>) {
|
||||
let mut position = 0;
|
||||
let ptr =
|
||||
unsafe { vb_get_samples(self.sim, ptr::null_mut(), ptr::null_mut(), &mut position) };
|
||||
// SAFETY: position is an offset in a buffer of (f32, f32). so, position * 2 is an offset in a buffer of f32.
|
||||
let read_samples: &mut [f32] =
|
||||
unsafe { slice::from_raw_parts_mut(ptr.cast(), position as usize * 2) };
|
||||
samples.extend_from_slice(read_samples);
|
||||
|
||||
unsafe {
|
||||
vb_set_samples(
|
||||
self.sim,
|
||||
ptr,
|
||||
VBDataType::F32,
|
||||
AUDIO_CAPACITY_SAMPLES as u32,
|
||||
)
|
||||
};
|
||||
}
|
||||
|
||||
pub fn set_keys(&mut self, keys: VBKey) {
|
||||
unsafe { vb_set_keys(self.sim, keys.bits()) };
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for CoreVB {
|
||||
fn drop(&mut self) {
|
||||
let ptr =
|
||||
unsafe { vb_get_samples(self.sim, ptr::null_mut(), ptr::null_mut(), ptr::null_mut()) };
|
||||
// SAFETY: the audio buffer originally came from a Vec<u32>
|
||||
let floats: Vec<f32> = unsafe {
|
||||
Vec::from_raw_parts(ptr.cast(), AUDIO_CAPACITY_FLOATS, AUDIO_CAPACITY_FLOATS)
|
||||
};
|
||||
drop(floats);
|
||||
|
||||
// SAFETY: the *mut VB owns its userdata.
|
||||
// There is no way for the userdata to be null or otherwise invalid.
|
||||
let ptr: *mut VBState = unsafe { vb_get_user_data(self.sim).cast() };
|
||||
|
||||
Reference in New Issue
Block a user