migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00
Code Activity

refactor RunMode: move it from backend to the demo App (#23)

Browse Source 
This simplifies the egui_glium and egui_web backends substantially,
reduces the scope of RunMode to a single file, and
removes duplicated code.

Basically: this is how I should have written it from the beginning.
This commit is contained in:
Emil Ernerfeldt
2020-09-16 08:03:40 +02:00
committed by GitHub
parent 0ea80ae10a
commit 5856cded95
8 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
egui_glium/src/backend.rs
View File

@@ -6,7 +6,7 @@ use crate::{
};
pub use egui::{
app::{App, Backend, RunMode, Storage},
app::{App, Backend, Storage},
Srgba,
};
@@ -16,30 +16,20 @@ const WINDOW_KEY: &str = "window";
pub struct GliumBackend {
frame_times: egui::MovementTracker<f32>,
quit: bool,
run_mode: RunMode,
painter: Painter,
}
impl GliumBackend {
pub fn new(run_mode: RunMode, painter: Painter) -> Self {
pub fn new(painter: Painter) -> Self {
Self {
frame_times: egui::MovementTracker::new(1000, 1.0),
quit: false,
run_mode,
painter,
}
}
}
impl Backend for GliumBackend {
fn run_mode(&self) -> RunMode {
self.run_mode
}
fn set_run_mode(&mut self, run_mode: RunMode) {
self.run_mode = run_mode;
}
fn cpu_time(&self) -> f32 {
self.frame_times.average().unwrap_or_default()
}
@@ -62,12 +52,7 @@ impl Backend for GliumBackend {
}
/// Run an egui app
pub fn run(
title: &str,
run_mode: RunMode,
mut storage: FileStorage,
mut app: impl App + 'static,
) -> ! {
pub fn run(title: &str, mut storage: FileStorage, mut app: impl App + 'static) -> ! {
let event_loop = glutin::event_loop::EventLoop::new();
let mut window = glutin::window::WindowBuilder::new()
.with_decorations(true)
@@ -98,7 +83,7 @@ pub fn run(
// used to keep track of time for animations
let start_time = Instant::now();
let mut runner = GliumBackend::new(run_mode, Painter::new(&display));
let mut runner = GliumBackend::new(Painter::new(&display));
let mut clipboard = init_clipboard();
event_loop.run(move |event, _, control_flow| {
@@ -120,13 +105,10 @@ pub fn run(
*control_flow = if runner.quit {
glutin::event_loop::ControlFlow::Exit
} else if runner.run_mode() == RunMode::Continuous {
} else if output.needs_repaint {
display.gl_window().window().request_redraw();
glutin::event_loop::ControlFlow::Poll
} else {
if output.needs_repaint {
display.gl_window().window().request_redraw();
}
glutin::event_loop::ControlFlow::Wait
};