Skip to content

Commit 9d59696

Browse files
KentaTheBugMakerKentaTheBugMaker
authored
Reducing glutin dependency in egui_glow (#1151)
Use winit wherever possible
1 parent fa43d16 commit 9d59696

File tree

4 files changed

+28
-31
lines changed

4 files changed

+28
-31
lines changed

‎egui_glow/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ All notable changes to the `egui_glow` integration will be noted in this file.
66
* `EguiGlow::run` no longer returns the shapes to paint, but stores them internally until you call `EguiGlow::paint` ([#1110](https://github.com/emilk/egui/pull/1110)).
77
* Added `set_texture_filter` method to `Painter` ([#1041](https://github.com/emilk/egui/pull/1041)).
88
* Fix failure to run in Chrome ([#1092](https://github.com/emilk/egui/pull/1092)).
9-
9+
* `EguiGlow::new` now takes `&winit::Window` because there are no reason to use `&glutin::WindowedContext` ([#1151](https://github.com/emilk/egui/pull/1151)).
10+
* `EguiGlow::paint` now takes `&winit::Window` because there are no reason to use `&glutin::WindowedContext` ([#1151](https://github.com/emilk/egui/pull/1151)).
1011

1112
## 0.16.0 - 2021-12-29
1213
* Made winit/glutin an optional dependency ([#868](https://github.com/emilk/egui/pull/868)).

‎egui_glow/examples/pure_glow.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn main() {
4444
let event_loop = glutin::event_loop::EventLoop::with_user_event();
4545
let (gl_window, gl) = create_display(&event_loop);
4646

47-
let mut egui_glow = egui_glow::EguiGlow::new(&gl_window, &gl);
47+
let mut egui_glow = egui_glow::EguiGlow::new(gl_window.window(), &gl);
4848

4949
event_loop.run(move |event, _, control_flow| {
5050
let mut redraw = || {
@@ -78,7 +78,7 @@ fn main() {
7878

7979
// draw things behind egui here
8080

81-
egui_glow.paint(&gl_window, &gl);
81+
egui_glow.paint(gl_window.window(), &gl);
8282

8383
// draw things on top of egui here
8484

‎egui_glow/src/epi_backend.rs

+16-15
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
use crate::*;
2+
use egui_winit::winit;
23

34
struct RequestRepaintEvent;
45

5-
struct GlowRepaintSignal(std::sync::Mutex<glutin::event_loop::EventLoopProxy<RequestRepaintEvent>>);
6+
struct GlowRepaintSignal(std::sync::Mutex<winit::event_loop::EventLoopProxy<RequestRepaintEvent>>);
67

78
impl epi::backend::RepaintSignal for GlowRepaintSignal {
89
fn request_repaint(&self) {
@@ -12,8 +13,8 @@ impl epi::backend::RepaintSignal for GlowRepaintSignal {
1213

1314
#[allow(unsafe_code)]
1415
fn create_display(
15-
window_builder: glutin::window::WindowBuilder,
16-
event_loop: &glutin::event_loop::EventLoop<RequestRepaintEvent>,
16+
window_builder: winit::window::WindowBuilder,
17+
event_loop: &winit::event_loop::EventLoop<RequestRepaintEvent>,
1718
) -> (
1819
glutin::WindowedContext<glutin::PossiblyCurrent>,
1920
glow::Context,
@@ -51,7 +52,7 @@ pub fn run(app: Box<dyn epi::App>, native_options: &epi::NativeOptions) -> ! {
5152
let window_settings = persistence.load_window_settings();
5253
let window_builder =
5354
egui_winit::epi::window_builder(native_options, &window_settings).with_title(app.name());
54-
let event_loop = glutin::event_loop::EventLoop::with_user_event();
55+
let event_loop = winit::event_loop::EventLoop::with_user_event();
5556
let (gl_window, gl) = create_display(window_builder, &event_loop);
5657

5758
let repaint_signal = std::sync::Arc::new(GlowRepaintSignal(std::sync::Mutex::new(
@@ -116,12 +117,12 @@ pub fn run(app: Box<dyn epi::App>, native_options: &epi::NativeOptions) -> ! {
116117

117118
{
118119
*control_flow = if integration.should_quit() {
119-
glutin::event_loop::ControlFlow::Exit
120+
winit::event_loop::ControlFlow::Exit
120121
} else if needs_repaint {
121122
gl_window.window().request_redraw();
122-
glutin::event_loop::ControlFlow::Poll
123+
winit::event_loop::ControlFlow::Poll
123124
} else {
124-
glutin::event_loop::ControlFlow::Wait
125+
winit::event_loop::ControlFlow::Wait
125126
};
126127
}
127128

@@ -132,30 +133,30 @@ pub fn run(app: Box<dyn epi::App>, native_options: &epi::NativeOptions) -> ! {
132133
// Platform-dependent event handlers to workaround a winit bug
133134
// See: https://github.com/rust-windowing/winit/issues/987
134135
// See: https://github.com/rust-windowing/winit/issues/1619
135-
glutin::event::Event::RedrawEventsCleared if cfg!(windows) => redraw(),
136-
glutin::event::Event::RedrawRequested(_) if !cfg!(windows) => redraw(),
136+
winit::event::Event::RedrawEventsCleared if cfg!(windows) => redraw(),
137+
winit::event::Event::RedrawRequested(_) if !cfg!(windows) => redraw(),
137138

138-
glutin::event::Event::WindowEvent { event, .. } => {
139-
if let glutin::event::WindowEvent::Focused(new_focused) = event {
139+
winit::event::Event::WindowEvent { event, .. } => {
140+
if let winit::event::WindowEvent::Focused(new_focused) = event {
140141
is_focused = new_focused;
141142
}
142143

143-
if let glutin::event::WindowEvent::Resized(physical_size) = event {
144+
if let winit::event::WindowEvent::Resized(physical_size) = event {
144145
gl_window.resize(physical_size);
145146
}
146147

147148
integration.on_event(&event);
148149
if integration.should_quit() {
149-
*control_flow = glutin::event_loop::ControlFlow::Exit;
150+
*control_flow = winit::event_loop::ControlFlow::Exit;
150151
}
151152

152153
gl_window.window().request_redraw(); // TODO: ask egui if the events warrants a repaint instead
153154
}
154-
glutin::event::Event::LoopDestroyed => {
155+
winit::event::Event::LoopDestroyed => {
155156
integration.on_exit(gl_window.window());
156157
painter.destroy(&gl);
157158
}
158-
glutin::event::Event::UserEvent(RequestRepaintEvent) => {
159+
winit::event::Event::UserEvent(RequestRepaintEvent) => {
159160
gl_window.window().request_redraw();
160161
}
161162
_ => (),

‎egui_glow/src/lib.rs

+8-13
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@
8888
#![allow(clippy::manual_range_contains)]
8989

9090
pub mod painter;
91+
#[cfg(feature = "winit")]
92+
use egui_winit::winit;
9193
pub use glow;
9294
pub use painter::Painter;
9395
#[cfg(feature = "winit")]
@@ -119,10 +121,7 @@ pub struct EguiGlow {
119121

120122
#[cfg(feature = "winit")]
121123
impl EguiGlow {
122-
pub fn new(
123-
gl_window: &glutin::WindowedContext<glutin::PossiblyCurrent>,
124-
gl: &glow::Context,
125-
) -> Self {
124+
pub fn new(window: &winit::window::Window, gl: &glow::Context) -> Self {
126125
let painter = crate::Painter::new(gl, None, "")
127126
.map_err(|error| {
128127
crate::misc_util::glow_print_error(format!(
@@ -134,7 +133,7 @@ impl EguiGlow {
134133

135134
Self {
136135
egui_ctx: Default::default(),
137-
egui_winit: egui_winit::State::new(painter.max_texture_side(), gl_window.window()),
136+
egui_winit: egui_winit::State::new(painter.max_texture_side(), window),
138137
painter,
139138
shapes: Default::default(),
140139
textures_delta: Default::default(),
@@ -147,7 +146,7 @@ impl EguiGlow {
147146
/// and only when this returns `false` pass on the events to your game.
148147
///
149148
/// Note that egui uses `tab` to move focus between elements, so this will always return `true` for tabs.
150-
pub fn on_event(&mut self, event: &glutin::event::WindowEvent<'_>) -> bool {
149+
pub fn on_event(&mut self, event: &winit::event::WindowEvent<'_>) -> bool {
151150
self.egui_winit.on_event(&self.egui_ctx, event)
152151
}
153152

@@ -156,7 +155,7 @@ impl EguiGlow {
156155
/// Call [`Self::paint`] later to paint.
157156
pub fn run(
158157
&mut self,
159-
window: &glutin::window::Window,
158+
window: &winit::window::Window,
160159
run_ui: impl FnMut(&egui::Context),
161160
) -> bool {
162161
let raw_input = self.egui_winit.take_egui_input(window);
@@ -172,11 +171,7 @@ impl EguiGlow {
172171
}
173172

174173
/// Paint the results of the last call to [`Self::run`].
175-
pub fn paint(
176-
&mut self,
177-
gl_window: &glutin::WindowedContext<glutin::PossiblyCurrent>,
178-
gl: &glow::Context,
179-
) {
174+
pub fn paint(&mut self, window: &winit::window::Window, gl: &glow::Context) {
180175
let shapes = std::mem::take(&mut self.shapes);
181176
let mut textures_delta = std::mem::take(&mut self.textures_delta);
182177

@@ -185,7 +180,7 @@ impl EguiGlow {
185180
}
186181

187182
let clipped_meshes = self.egui_ctx.tessellate(shapes);
188-
let dimensions: [u32; 2] = gl_window.window().inner_size().into();
183+
let dimensions: [u32; 2] = window.inner_size().into();
189184
self.painter.paint_meshes(
190185
gl,
191186
dimensions,

0 commit comments

Comments
 (0)