desktop: Add egui crates

This commit is contained in:
Mike Welsh 2023-03-26 22:12:44 -07:00 committed by Nathan Adams
parent a1797a351d
commit ef1125f456
2 changed files with 112 additions and 1 deletions

109
Cargo.lock generated
View File

@ -312,6 +312,12 @@ dependencies = [
"system-deps", "system-deps",
] ]
[[package]]
name = "atomic_refcell"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
[[package]] [[package]]
name = "atty" name = "atty"
version = "0.2.14" version = "0.2.14"
@ -1253,12 +1259,68 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]]
name = "ecolor"
version = "0.21.0"
source = "git+https://github.com/emilk/egui?rev=ea71b7f#ea71b7f20b631c4d762dae4683e5fe89585f9212"
dependencies = [
"bytemuck",
]
[[package]]
name = "egui"
version = "0.21.0"
source = "git+https://github.com/emilk/egui?rev=ea71b7f#ea71b7f20b631c4d762dae4683e5fe89585f9212"
dependencies = [
"ahash 0.8.3",
"epaint",
"log",
"nohash-hasher",
]
[[package]]
name = "egui-wgpu"
version = "0.21.0"
source = "git+https://github.com/emilk/egui?rev=ea71b7f#ea71b7f20b631c4d762dae4683e5fe89585f9212"
dependencies = [
"bytemuck",
"epaint",
"log",
"thiserror",
"type-map 0.5.0",
"wgpu",
"winit",
]
[[package]]
name = "egui-winit"
version = "0.21.1"
source = "git+https://github.com/emilk/egui?rev=ea71b7f#ea71b7f20b631c4d762dae4683e5fe89585f9212"
dependencies = [
"arboard",
"egui",
"instant",
"log",
"raw-window-handle",
"smithay-clipboard",
"webbrowser",
"winit",
]
[[package]] [[package]]
name = "either" name = "either"
version = "1.8.1" version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "emath"
version = "0.21.0"
source = "git+https://github.com/emilk/egui?rev=ea71b7f#ea71b7f20b631c4d762dae4683e5fe89585f9212"
dependencies = [
"bytemuck",
]
[[package]] [[package]]
name = "embed-resource" name = "embed-resource"
version = "2.1.1" version = "2.1.1"
@ -1342,6 +1404,22 @@ dependencies = [
"termcolor", "termcolor",
] ]
[[package]]
name = "epaint"
version = "0.21.0"
source = "git+https://github.com/emilk/egui?rev=ea71b7f#ea71b7f20b631c4d762dae4683e5fe89585f9212"
dependencies = [
"ab_glyph",
"ahash 0.8.3",
"atomic_refcell",
"bytemuck",
"ecolor",
"emath",
"log",
"nohash-hasher",
"parking_lot",
]
[[package]] [[package]]
name = "errno" name = "errno"
version = "0.3.1" version = "0.3.1"
@ -2175,7 +2253,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f"
dependencies = [ dependencies = [
"type-map", "type-map 0.4.0",
"unic-langid", "unic-langid",
] ]
@ -2807,6 +2885,12 @@ dependencies = [
"memoffset 0.6.5", "memoffset 0.6.5",
] ]
[[package]]
name = "nohash-hasher"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "7.1.3"
@ -3638,6 +3722,9 @@ dependencies = [
"clap", "clap",
"cpal", "cpal",
"dirs", "dirs",
"egui",
"egui-wgpu",
"egui-winit",
"embed-resource", "embed-resource",
"generational-arena", "generational-arena",
"isahc", "isahc",
@ -3654,6 +3741,7 @@ dependencies = [
"unic-langid", "unic-langid",
"url", "url",
"webbrowser", "webbrowser",
"wgpu",
"winapi", "winapi",
"winit", "winit",
] ]
@ -4159,6 +4247,16 @@ dependencies = [
"wayland-protocols", "wayland-protocols",
] ]
[[package]]
name = "smithay-clipboard"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8"
dependencies = [
"smithay-client-toolkit",
"wayland-client",
]
[[package]] [[package]]
name = "snafu" name = "snafu"
version = "0.7.4" version = "0.7.4"
@ -4730,6 +4828,15 @@ dependencies = [
"rustc-hash", "rustc-hash",
] ]
[[package]]
name = "type-map"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
dependencies = [
"rustc-hash",
]
[[package]] [[package]]
name = "typed-arena" name = "typed-arena"
version = "2.0.2" version = "2.0.2"

View File

@ -10,6 +10,9 @@ version.workspace = true
[dependencies] [dependencies]
clap = { version = "4.3.0", features = ["derive"] } clap = { version = "4.3.0", features = ["derive"] }
cpal = "0.15.2" cpal = "0.15.2"
egui = { git = "https://github.com/emilk/egui", rev = "ea71b7f" }
egui-wgpu = { git = "https://github.com/emilk/egui", rev = "ea71b7f", features = ["winit"] }
egui-winit = { git = "https://github.com/emilk/egui", rev = "ea71b7f" }
ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules"] } ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules"] }
ruffle_render = { path = "../render", features = ["clap"] } ruffle_render = { path = "../render", features = ["clap"] }
ruffle_render_wgpu = { path = "../render/wgpu", features = ["clap"] } ruffle_render_wgpu = { path = "../render/wgpu", features = ["clap"] }
@ -29,6 +32,7 @@ bytemuck = "1.13.1"
os_info = { version = "3", default-features = false } os_info = { version = "3", default-features = false }
unic-langid = "0.9.1" unic-langid = "0.9.1"
sys-locale = "0.3.0" sys-locale = "0.3.0"
wgpu = { version = "0.16.0" }
# Deliberately held back to match tracy client used by profiling crate # Deliberately held back to match tracy client used by profiling crate
tracing-tracy = { version = "=0.10.0", optional = true } tracing-tracy = { version = "=0.10.0", optional = true }