Implement Primitive::Cached
This commit is contained in:
Héctor Ramón Jiménez
parent
37f0d97159
commit
b74e7e7353
12 changed files with 151 additions and 105 deletions
|
|
@ -10,7 +10,6 @@ use iced_native::{
|
|||
layout, Background, Color, Layout, MouseCursor, Point, Rectangle, Vector,
|
||||
Widget,
|
||||
};
|
||||
use std::sync::Arc;
|
||||
|
||||
mod widget;
|
||||
|
||||
|
|
@ -29,9 +28,8 @@ pub struct Renderer {
|
|||
|
||||
struct Layer<'a> {
|
||||
bounds: Rectangle<u32>,
|
||||
offset: Vector<u32>,
|
||||
quads: Vec<Quad>,
|
||||
meshes: Vec<(Point, Arc<triangle::Mesh2D>)>,
|
||||
meshes: Vec<(Point, &'a triangle::Mesh2D)>,
|
||||
text: Vec<wgpu_glyph::Section<'a>>,
|
||||
|
||||
#[cfg(any(feature = "image", feature = "svg"))]
|
||||
|
|
@ -39,10 +37,9 @@ struct Layer<'a> {
|
|||
}
|
||||
|
||||
impl<'a> Layer<'a> {
|
||||
pub fn new(bounds: Rectangle<u32>, offset: Vector<u32>) -> Self {
|
||||
pub fn new(bounds: Rectangle<u32>) -> Self {
|
||||
Self {
|
||||
bounds,
|
||||
offset,
|
||||
quads: Vec::new(),
|
||||
text: Vec::new(),
|
||||
meshes: Vec::new(),
|
||||
|
|
@ -103,17 +100,14 @@ impl Renderer {
|
|||
|
||||
let mut layers = Vec::new();
|
||||
|
||||
layers.push(Layer::new(
|
||||
Rectangle {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: u32::from(width),
|
||||
height: u32::from(height),
|
||||
},
|
||||
Vector::new(0, 0),
|
||||
));
|
||||
layers.push(Layer::new(Rectangle {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: u32::from(width),
|
||||
height: u32::from(height),
|
||||
}));
|
||||
|
||||
self.draw_primitive(primitive, &mut layers);
|
||||
self.draw_primitive(Vector::new(0.0, 0.0), primitive, &mut layers);
|
||||
self.draw_overlay(overlay, &mut layers);
|
||||
|
||||
for layer in layers {
|
||||
|
|
@ -137,17 +131,16 @@ impl Renderer {
|
|||
|
||||
fn draw_primitive<'a>(
|
||||
&mut self,
|
||||
translation: Vector,
|
||||
primitive: &'a Primitive,
|
||||
layers: &mut Vec<Layer<'a>>,
|
||||
) {
|
||||
let layer = layers.last_mut().unwrap();
|
||||
|
||||
match primitive {
|
||||
Primitive::None => {}
|
||||
Primitive::Group { primitives } => {
|
||||
// TODO: Inspect a bit and regroup (?)
|
||||
for primitive in primitives {
|
||||
self.draw_primitive(primitive, layers)
|
||||
self.draw_primitive(translation, primitive, layers)
|
||||
}
|
||||
}
|
||||
Primitive::Text {
|
||||
|
|
@ -179,12 +172,11 @@ impl Renderer {
|
|||
}
|
||||
};
|
||||
|
||||
let layer = layers.last_mut().unwrap();
|
||||
|
||||
layer.text.push(wgpu_glyph::Section {
|
||||
text: &content,
|
||||
screen_position: (
|
||||
x - layer.offset.x as f32,
|
||||
y - layer.offset.y as f32,
|
||||
),
|
||||
screen_position: (x + translation.x, y + translation.y),
|
||||
bounds: (bounds.width, bounds.height),
|
||||
scale: wgpu_glyph::Scale { x: *size, y: *size },
|
||||
color: color.into_linear(),
|
||||
|
|
@ -222,11 +214,13 @@ impl Renderer {
|
|||
border_width,
|
||||
border_color,
|
||||
} => {
|
||||
// TODO: Move some of this computations to the GPU (?)
|
||||
let layer = layers.last_mut().unwrap();
|
||||
|
||||
// TODO: Move some of these computations to the GPU (?)
|
||||
layer.quads.push(Quad {
|
||||
position: [
|
||||
bounds.x - layer.offset.x as f32,
|
||||
bounds.y - layer.offset.y as f32,
|
||||
bounds.x + translation.x,
|
||||
bounds.y + translation.y,
|
||||
],
|
||||
scale: [bounds.width, bounds.height],
|
||||
color: match background {
|
||||
|
|
@ -238,38 +232,59 @@ impl Renderer {
|
|||
});
|
||||
}
|
||||
Primitive::Mesh2D { origin, buffers } => {
|
||||
layer.meshes.push((*origin, buffers.clone()));
|
||||
let layer = layers.last_mut().unwrap();
|
||||
|
||||
layer.meshes.push((*origin + translation, buffers));
|
||||
}
|
||||
Primitive::Clip {
|
||||
bounds,
|
||||
offset,
|
||||
content,
|
||||
} => {
|
||||
let layer = layers.last_mut().unwrap();
|
||||
|
||||
let layer_bounds: Rectangle<f32> = layer.bounds.into();
|
||||
|
||||
let clip = Rectangle {
|
||||
x: bounds.x - layer.offset.x as f32,
|
||||
y: bounds.y - layer.offset.y as f32,
|
||||
x: bounds.x + translation.x,
|
||||
y: bounds.y + translation.y,
|
||||
..*bounds
|
||||
};
|
||||
|
||||
// Only draw visible content
|
||||
if let Some(clip_bounds) = layer_bounds.intersection(&clip) {
|
||||
let clip_layer =
|
||||
Layer::new(clip_bounds.into(), layer.offset + *offset);
|
||||
let new_layer = Layer::new(layer.bounds, layer.offset);
|
||||
let clip_layer = Layer::new(clip_bounds.into());
|
||||
let new_layer = Layer::new(layer.bounds);
|
||||
|
||||
layers.push(clip_layer);
|
||||
self.draw_primitive(content, layers);
|
||||
self.draw_primitive(
|
||||
translation
|
||||
- Vector::new(offset.x as f32, offset.y as f32),
|
||||
content,
|
||||
layers,
|
||||
);
|
||||
layers.push(new_layer);
|
||||
}
|
||||
}
|
||||
|
||||
Primitive::Cached { origin, cache } => {
|
||||
self.draw_primitive(
|
||||
translation + Vector::new(origin.x, origin.y),
|
||||
&cache,
|
||||
layers,
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg(feature = "image")]
|
||||
Primitive::Image { handle, bounds } => {
|
||||
let layer = layers.last_mut().unwrap();
|
||||
|
||||
layer.images.push(Image {
|
||||
handle: image::Handle::Raster(handle.clone()),
|
||||
position: [bounds.x, bounds.y],
|
||||
position: [
|
||||
bounds.x + translation.x,
|
||||
bounds.y + translation.y,
|
||||
],
|
||||
size: [bounds.width, bounds.height],
|
||||
});
|
||||
}
|
||||
|
|
@ -278,9 +293,14 @@ impl Renderer {
|
|||
|
||||
#[cfg(feature = "svg")]
|
||||
Primitive::Svg { handle, bounds } => {
|
||||
let layer = layers.last_mut().unwrap();
|
||||
|
||||
layer.images.push(Image {
|
||||
handle: image::Handle::Vector(handle.clone()),
|
||||
position: [bounds.x, bounds.y],
|
||||
position: [
|
||||
bounds.x + translation.x,
|
||||
bounds.y + translation.y,
|
||||
],
|
||||
size: [bounds.width, bounds.height],
|
||||
});
|
||||
}
|
||||
|
|
@ -295,7 +315,7 @@ impl Renderer {
|
|||
layers: &mut Vec<Layer<'a>>,
|
||||
) {
|
||||
let first = layers.first().unwrap();
|
||||
let mut overlay = Layer::new(first.bounds, Vector::new(0, 0));
|
||||
let mut overlay = Layer::new(first.bounds);
|
||||
|
||||
let font_id = self.text_pipeline.overlay_font();
|
||||
let scale = wgpu_glyph::Scale { x: 20.0, y: 20.0 };
|
||||
|
|
@ -337,12 +357,8 @@ impl Renderer {
|
|||
let bounds = layer.bounds * scale_factor;
|
||||
|
||||
if layer.meshes.len() > 0 {
|
||||
let translated = transformation
|
||||
* Transformation::scale(scale_factor, scale_factor)
|
||||
* Transformation::translate(
|
||||
-(layer.offset.x as f32),
|
||||
-(layer.offset.y as f32),
|
||||
);
|
||||
let scaled = transformation
|
||||
* Transformation::scale(scale_factor, scale_factor);
|
||||
|
||||
self.triangle_pipeline.draw(
|
||||
device,
|
||||
|
|
@ -350,7 +366,7 @@ impl Renderer {
|
|||
target,
|
||||
target_width,
|
||||
target_height,
|
||||
translated,
|
||||
scaled,
|
||||
&layer.meshes,
|
||||
bounds,
|
||||
);
|
||||
|
|
@ -371,18 +387,14 @@ impl Renderer {
|
|||
#[cfg(any(feature = "image", feature = "svg"))]
|
||||
{
|
||||
if layer.images.len() > 0 {
|
||||
let translated_and_scaled = transformation
|
||||
* Transformation::scale(scale_factor, scale_factor)
|
||||
* Transformation::translate(
|
||||
-(layer.offset.x as f32),
|
||||
-(layer.offset.y as f32),
|
||||
);
|
||||
let scaled = transformation
|
||||
* Transformation::scale(scale_factor, scale_factor);
|
||||
|
||||
self.image_pipeline.draw(
|
||||
device,
|
||||
encoder,
|
||||
&layer.images,
|
||||
translated_and_scaled,
|
||||
scaled,
|
||||
bounds,
|
||||
target,
|
||||
scale_factor,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue