kitgit

tirbofish/dropbear · diff

d27053d · Thribhu K

feature: text rendering now works (workaround for wgpu 27) + input feature: contained widgets now work. feature: shorthand for UI

Unverified

diff --git a/Cargo.toml b/Cargo.toml
index 5908bf2..4aa4d1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -74,13 +74,13 @@ rapier3d = { version = "0.32", features = [ "simd-stable", "serde-serialize" ] }
 cbindgen = { version = "0.29.2" }
 postcard = { version = "1.1", features = ["use-std"]}
 pollster = "0.4"
-yakui = { git = "https://github.com/SecondHalfGames/yakui", rev = "af8fc1f", features = ["default-fonts"] }
-yakui-wgpu = { git = "https://github.com/SecondHalfGames/yakui", rev = "af8fc1f" }
-yakui-winit = { git = "https://github.com/SecondHalfGames/yakui", rev = "af8fc1f" }
+#yakui = { git = "https://github.com/SecondHalfGames/yakui", rev = "af8fc1f", features = ["default-fonts"] }
+#yakui-wgpu = { git = "https://github.com/SecondHalfGames/yakui", rev = "af8fc1f" }
+#yakui-winit = { git = "https://github.com/SecondHalfGames/yakui", rev = "af8fc1f" }
 thiserror = "2.0"
 tempfile = "3.24"
 combine = "4.6"
-glyphon = "0.8"
+glyphon = { git = "https://github.com/grovesNL/glyphon", rev = "9dd9376" }
 
 [workspace.dependencies.image]
 version = "0.25"
diff --git a/crates/dropbear-engine/Cargo.toml b/crates/dropbear-engine/Cargo.toml
index 5a68677..bce2147 100644
--- a/crates/dropbear-engine/Cargo.toml
+++ b/crates/dropbear-engine/Cargo.toml
@@ -44,8 +44,8 @@ dashmap.workspace = true
 typetag.workspace = true
 postcard.workspace = true
 pollster.workspace = true
-yakui-wgpu.workspace = true
-yakui.workspace = true
+#yakui-wgpu.workspace = true
+#yakui.workspace = true
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
 rfd.workspace = true
diff --git a/crates/dropbear-engine/src/graphics.rs b/crates/dropbear-engine/src/graphics.rs
index 00c51c5..f5072e1 100644
--- a/crates/dropbear-engine/src/graphics.rs
+++ b/crates/dropbear-engine/src/graphics.rs
@@ -32,8 +32,8 @@ pub struct SharedGraphicsContext {
     pub future_queue: Arc<FutureQueue>,
     pub supports_storage: bool,
     pub mipmapper: Arc<MipMapper>,
-    pub yakui_renderer: Arc<Mutex<yakui_wgpu::YakuiWgpu>>,
-    pub yakui_texture: yakui::TextureId,
+    // pub yakui_renderer: Arc<Mutex<yakui_wgpu::YakuiWgpu>>,
+    // pub yakui_texture: yakui::TextureId,
 }

Large diffs are not rendered by default. Showing the first 50 of 1670 lines. Show full diff