fnmain/egui-glyphon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix deps

Browse source
This commit is contained in:
Isaac Mills 2024-02-05 11:19:45 -05:00
commit c635390455
Signed by: fnmain
GPG key ID: B67D7410F33A0F61
3 changed files with 29 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

90
Cargo.lock generated
View file

@ -910,16 +910,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]]
name = "ecolor"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57539aabcdbb733b6806ef421b66dec158dc1582107ad6d51913db3600303354"
dependencies = [
"bytemuck",
]
[[package]]
name = "ecolor"
version = "0.25.0"
source = "git+https://github.com/emilk/egui#b5222008047b469f06c4fd6e868942752df7ff68"
source = "git+https://github.com/emilk/egui#74f00f9017781d193bca6142ce764b6dd32a0e6f"
dependencies = [
"bytemuck",
]
@ -927,12 +918,13 @@ dependencies = [
[[package]]
name = "eframe"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79c00143a1d564cf27570234c9a199cbe75dc3d43a135510fb2b93406a87ee8e"
source = "git+https://github.com/emilk/egui#74f00f9017781d193bca6142ce764b6dd32a0e6f"
dependencies = [
"bytemuck",
"cocoa",
"egui 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
"document-features",
"egui",
"egui-wgpu",
"egui-winit",
"egui_glow",
"glow",
@ -945,11 +937,13 @@ dependencies = [
"parking_lot",
"percent-encoding",
"raw-window-handle 0.5.2",
"raw-window-handle 0.6.0",
"static_assertions",
"thiserror",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
"web-time",
"winapi",
"winit",
]
@ -957,32 +951,21 @@ dependencies = [
[[package]]
name = "egui"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0bf640ed7f3bf3d14ebf00d73bacc09c886443ee84ca6494bde37953012c9e3"
source = "git+https://github.com/emilk/egui#74f00f9017781d193bca6142ce764b6dd32a0e6f"
dependencies = [
"accesskit",
"ahash",
"epaint 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
"epaint",
"log",
"nohash-hasher",
]
[[package]]
name = "egui"
version = "0.25.0"
source = "git+https://github.com/emilk/egui#b5222008047b469f06c4fd6e868942752df7ff68"
dependencies = [
"ahash",
"epaint 0.25.0 (git+https://github.com/emilk/egui)",
"nohash-hasher",
]
[[package]]
name = "egui-glyphon"
version = "0.1.0"
dependencies = [
"eframe",
"egui 0.25.0 (git+https://github.com/emilk/egui)",
"egui",
"egui-wgpu",
"glyphon",
]
@ -990,30 +973,30 @@ dependencies = [
[[package]]
name = "egui-wgpu"
version = "0.25.0"
source = "git+https://github.com/emilk/egui#b5222008047b469f06c4fd6e868942752df7ff68"
source = "git+https://github.com/emilk/egui#74f00f9017781d193bca6142ce764b6dd32a0e6f"
dependencies = [
"bytemuck",
"document-features",
"egui 0.25.0 (git+https://github.com/emilk/egui)",
"epaint 0.25.0 (git+https://github.com/emilk/egui)",
"egui",
"epaint",
"log",
"thiserror",
"type-map",
"web-time",
"wgpu",
"winit",
]
[[package]]
name = "egui-winit"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d95d9762056c541bd2724de02910d8bccf3af8e37689dc114b21730e64f80a0"
source = "git+https://github.com/emilk/egui#74f00f9017781d193bca6142ce764b6dd32a0e6f"
dependencies = [
"accesskit_winit",
"arboard",
"egui 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
"egui",
"log",
"raw-window-handle 0.5.2",
"raw-window-handle 0.6.0",
"smithay-clipboard",
"web-time",
"webbrowser",
@ -1023,31 +1006,23 @@ dependencies = [
[[package]]
name = "egui_glow"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb2ef815e80d117339c7d6b813f7678d23522d699ccd3243e267ef06166009b9"
source = "git+https://github.com/emilk/egui#74f00f9017781d193bca6142ce764b6dd32a0e6f"
dependencies = [
"bytemuck",
"egui 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
"egui",
"glow",
"log",
"memoffset 0.7.1",
"raw-window-handle 0.5.2",
"wasm-bindgen",
"web-sys",
"winit",
]
[[package]]
name = "emath"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ee58355767587db7ba3738930d93cad3052cd834c2b48b9ef6ef26fe4823b7e"
dependencies = [
"bytemuck",
]
[[package]]
name = "emath"
version = "0.25.0"
source = "git+https://github.com/emilk/egui#b5222008047b469f06c4fd6e868942752df7ff68"
source = "git+https://github.com/emilk/egui#74f00f9017781d193bca6142ce764b6dd32a0e6f"
dependencies = [
"bytemuck",
]
@ -1076,33 +1051,18 @@ dependencies = [
[[package]]
name = "epaint"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e638cb066bff0903bbb6143116cfd134a42279c7d68f19c0352a94f15a402de7"
source = "git+https://github.com/emilk/egui#74f00f9017781d193bca6142ce764b6dd32a0e6f"
dependencies = [
"ab_glyph",
"ahash",
"bytemuck",
"ecolor 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
"emath 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ecolor",
"emath",
"log",
"nohash-hasher",
"parking_lot",
]
[[package]]
name = "epaint"
version = "0.25.0"
source = "git+https://github.com/emilk/egui#b5222008047b469f06c4fd6e868942752df7ff68"
dependencies = [
"ab_glyph",
"ahash",
"bytemuck",
"ecolor 0.25.0 (git+https://github.com/emilk/egui)",
"emath 0.25.0 (git+https://github.com/emilk/egui)",
"nohash-hasher",
"parking_lot",
]
[[package]]
name = "equivalent"
version = "1.0.1"

6
Cargo.toml
View file

@ -6,9 +6,9 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
egui = { git = "https://github.com/emilk/egui", version = "0.25.0" }
egui-wgpu = { git = "https://github.com/emilk/egui", version = "0.25.0" }
egui = { git = "https://github.com/emilk/egui" }
egui-wgpu = { git = "https://github.com/emilk/egui" }
glyphon = { git = "https://github.com/StratusFearMe21/glyphon" }
[dev-dependencies]
eframe = { git = "https://github.com/emilk/egui", version = "0.25.0" }
eframe = { git = "https://github.com/emilk/egui" }

2
src/lib.rs
View file

@ -5,8 +5,8 @@ use std::sync::Arc;
use egui::mutex::{Mutex, RwLock};
use egui::{Pos2, Rect, Vec2};
use egui_wgpu::renderer::ScreenDescriptor;
use egui_wgpu::wgpu;
use egui_wgpu::ScreenDescriptor;
use glyphon::{
Buffer, Color, ColorMode, FontSystem, PrepareError, RenderError, Resolution, SwashCache,
TextArea, TextAtlas, TextBounds, TextRenderer,