me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move text logic in iced_wgpu to a text module

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-11-13 03:54:36 +01:00
parent 73f3c90007
commit f0b1e65ba4
6 changed files with 131 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

70
wgpu/src/renderer.rs
View file

@ -1,4 +1,4 @@
use crate::{font, quad, Image, Primitive, Quad, Transformation};
use crate::{quad, text, Image, Primitive, Quad, Transformation};
use iced_native::{
renderer::Debugger, renderer::Windowed, Background, Color, Layout,
MouseCursor, Point, Rectangle, Vector, Widget,
@ -7,11 +7,8 @@ use iced_native::{
use wgpu::{
Adapter, BackendBit, CommandEncoderDescriptor, Device, DeviceDescriptor,
Extensions, Limits, PowerPreference, Queue, RequestAdapterOptions,
TextureFormat,
};
use std::cell::RefCell;
mod target;
mod widget;
@ -22,8 +19,7 @@ pub struct Renderer {
queue: Queue,
quad_pipeline: quad::Pipeline,
image_pipeline: crate::image::Pipeline,
text_pipeline: wgpu_glyph::GlyphBrush<'static, ()>,
text_measurements: RefCell<glyph_brush::GlyphBrush<'static, ()>>,
text_pipeline: text::Pipeline,
}
pub struct Layer<'a> {
@ -61,28 +57,7 @@ impl Renderer {
limits: Limits { max_bind_groups: 2 },
});
// TODO: Font customization
let font_source = font::Source::new();
let default_font = font_source
.load(&[font::Family::SansSerif, font::Family::Serif])
.expect("Find sans-serif or serif font");
let mono_font = font_source
.load(&[font::Family::Monospace])
.expect("Find monospace font");
let text_pipeline =
wgpu_glyph::GlyphBrushBuilder::using_fonts_bytes(vec![
default_font.clone(),
mono_font,
])
.initial_cache_size((2048, 2048))
.build(&mut device, TextureFormat::Bgra8UnormSrgb);
let text_measurements =
glyph_brush::GlyphBrushBuilder::using_font_bytes(default_font)
.build();
let text_pipeline = text::Pipeline::new(&mut device);
let quad_pipeline = quad::Pipeline::new(&mut device);
let image_pipeline = crate::image::Pipeline::new(&mut device);
@ -92,7 +67,6 @@ impl Renderer {
quad_pipeline,
image_pipeline,
text_pipeline,
text_measurements: RefCell::new(text_measurements),
}
}
@ -298,7 +272,7 @@ impl Renderer {
let first = layers.first().unwrap();
let mut overlay = Layer::new(first.bounds, Vector::new(0, 0));
let font_id = wgpu_glyph::FontId(self.text_pipeline.fonts().len() - 1);
let font_id = self.text_pipeline.overlay_font();
let scale = wgpu_glyph::Scale { x: 20.0, y: 20.0 };
for (i, line) in lines.iter().enumerate() {
@ -383,20 +357,18 @@ impl Renderer {
self.text_pipeline.queue(text);
}
self.text_pipeline
.draw_queued_with_transform_and_scissoring(
&mut self.device,
encoder,
target,
transformation.into(),
wgpu_glyph::Region {
x: bounds.x,
y: bounds.y,
width: bounds.width,
height: bounds.height,
},
)
.expect("Draw text");
self.text_pipeline.draw_queued(
&mut self.device,
encoder,
target,
transformation,
wgpu_glyph::Region {
x: bounds.x,
y: bounds.y,
width: bounds.width,
height: bounds.height,
},
);
}
}
}
@ -410,15 +382,7 @@ impl iced_native::Renderer for Renderer {
) -> iced_native::layout::Node {
let node = element.layout(self, &iced_native::layout::Limits::NONE);
// Trim measurements cache
// TODO: We should probably use a `GlyphCalculator` for this. However,
// it uses a lifetimed `GlyphCalculatorGuard` with side-effects on drop.
// This makes stuff quite inconvenient. A manual method for trimming the
// cache would make our lives easier.
self.text_measurements
.borrow_mut()
.process_queued(|_, _| {}, |_| {})
.expect("Trim text measurements");
self.text_pipeline.clear_measurement_cache();
node
}