migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

Rename Texture to FontImage

Browse Source
This commit is contained in:
Emil Ernerfeldt
2021-12-28 21:02:23 +01:00
parent d775eb3733
commit 190c85a40f
21 changed files with 93 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
egui_glium/src/epi_backend.rs
View File

@@ -86,7 +86,7 @@ pub fn run(app: Box<dyn epi::App>, native_options: &epi::NativeOptions) -> ! {
&mut target,
integration.egui_ctx.pixels_per_point(),
clipped_meshes,
&integration.egui_ctx.texture(),
&integration.egui_ctx.font_image(),
);
target.finish().unwrap();

2
egui_glium/src/lib.rs
View File

@@ -153,7 +153,7 @@ impl EguiGlium {
target,
self.egui_ctx.pixels_per_point(),
clipped_meshes,
&self.egui_ctx.texture(),
&self.egui_ctx.font_image(),
);
}
}

14
egui_glium/src/painter.rs
View File

@@ -65,15 +65,15 @@ impl Painter {
pub fn upload_egui_texture(
&mut self,
facade: &dyn glium::backend::Facade,
texture: &egui::Texture,
font_image: &egui::FontImage,
) {
if self.egui_texture_version == Some(texture.version) {
if self.egui_texture_version == Some(font_image.version) {
return; // No change
}
let pixels: Vec<Vec<(u8, u8, u8, u8)>> = texture
let pixels: Vec<Vec<(u8, u8, u8, u8)>> = font_image
.pixels
.chunks(texture.width as usize)
.chunks(font_image.width as usize)
.map(|row| {
row.iter()
.map(|&a| Color32::from_white_alpha(a).to_tuple())
@@ -85,7 +85,7 @@ impl Painter {
let mipmaps = texture::MipmapsOption::NoMipmap;
self.egui_texture =
Some(SrgbTexture2d::with_format(facade, pixels, format, mipmaps).unwrap());
self.egui_texture_version = Some(texture.version);
self.egui_texture_version = Some(font_image.version);
}
/// Main entry-point for painting a frame.
@@ -97,9 +97,9 @@ impl Painter {
target: &mut T,
pixels_per_point: f32,
cipped_meshes: Vec<egui::ClippedMesh>,
egui_texture: &egui::Texture,
font_image: &egui::FontImage,
) {
self.upload_egui_texture(display, egui_texture);
self.upload_egui_texture(display, font_image);
for egui::ClippedMesh(clip_rect, mesh) in cipped_meshes {
self.paint_mesh(target, display, pixels_per_point, clip_rect, &mesh);