Skip to content

Commit

Permalink
Update egui to version 0.29 and glow to 0.14 (#498)
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-barentin authored Oct 31, 2024
1 parent fd60174 commit 092b39b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ egui-gui = ["egui_glow", "egui", "getrandom"] # Additional GUI features
text = ["swash", "lyon"] # Text mesh generation features

[dependencies]
glow = "0.13"
glow = "0.14"
cgmath = "0.18"
three-d-asset = {version = "0.7"}
thiserror = "1"
open-enum = "0.5"
winit = {version = "0.28", optional = true}
egui = { version = "0.28", optional = true }
egui_glow = { version = "0.28", optional = true }
egui = { version = "0.29", optional = true }
egui_glow = { version = "0.29", optional = true }
getrandom = { version = "0.2", features = ["js"], optional = true }
swash = { version = "0.1", optional = true }
lyon = { version = "1", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions src/gui/egui_gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl GUI {
pub fn from_gl_context(context: std::sync::Arc<crate::context::Context>) -> Self {
GUI {
egui_context: egui::Context::default(),
painter: RefCell::new(Painter::new(context, "", None).unwrap()),
painter: RefCell::new(Painter::new(context, "", None, true).unwrap()),
output: RefCell::new(None),
viewport: Viewport::new_at_origo(1, 1),
modifiers: Modifiers::default(),
Expand Down Expand Up @@ -193,9 +193,9 @@ impl GUI {
..Default::default()
};

self.egui_context.begin_frame(egui_input);
self.egui_context.begin_pass(egui_input);
callback(&self.egui_context);
*self.output.borrow_mut() = Some(self.egui_context.end_frame());
*self.output.borrow_mut() = Some(self.egui_context.end_pass());

for event in events.iter_mut() {
if let Event::ModifiersChange { modifiers } = event {
Expand Down

0 comments on commit 092b39b

Please sign in to comment.