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

Avoid reallocating tessellators in Frame methods

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-08-26 15:41:12 +07:00
parent d0fe7b57ea
commit 82d967c04f
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

63
graphics/src/widget/canvas/frame.rs
View file

@ -5,15 +5,19 @@ use crate::{
triangle, Primitive, triangle, Primitive,
}; };
use lyon::tessellation;
/// The frame of a [`Canvas`]. /// The frame of a [`Canvas`].
/// ///
/// [`Canvas`]: crate::widget::Canvas /// [`Canvas`]: crate::widget::Canvas
#[derive(Debug)] #[allow(missing_debug_implementations)]
pub struct Frame { pub struct Frame {
size: Size, size: Size,
buffers: lyon::tessellation::VertexBuffers<triangle::Vertex2D, u32>, buffers: lyon::tessellation::VertexBuffers<triangle::Vertex2D, u32>,
primitives: Vec<Primitive>, primitives: Vec<Primitive>,
transforms: Transforms, transforms: Transforms,
fill_tessellator: tessellation::FillTessellator,
stroke_tessellator: tessellation::StrokeTessellator,
} }
#[derive(Debug)] #[derive(Debug)]
@ -45,6 +49,8 @@ impl Frame {
is_identity: true, is_identity: true,
}, },
}, },
fill_tessellator: tessellation::FillTessellator::new(),
stroke_tessellator: tessellation::StrokeTessellator::new(),
} }
} }
@ -75,26 +81,30 @@ impl Frame {
/// Draws the given [`Path`] on the [`Frame`] by filling it with the /// Draws the given [`Path`] on the [`Frame`] by filling it with the
/// provided style. /// provided style.
pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) { pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) {
use lyon::tessellation::{
BuffersBuilder, FillOptions, FillTessellator,
};
let Fill { color, rule } = fill.into(); let Fill { color, rule } = fill.into();
let mut buffers = BuffersBuilder::new( let mut buffers = tessellation::BuffersBuilder::new(
&mut self.buffers, &mut self.buffers,
FillVertex(color.into_linear()), FillVertex(color.into_linear()),
); );
let mut tessellator = FillTessellator::new(); let options =
let options = FillOptions::default().with_fill_rule(rule.into()); tessellation::FillOptions::default().with_fill_rule(rule.into());
let result = if self.transforms.current.is_identity { let result = if self.transforms.current.is_identity {
tessellator.tessellate_path(path.raw(), &options, &mut buffers) self.fill_tessellator.tessellate_path(
path.raw(),
&options,
&mut buffers,
)
} else { } else {
let path = path.transformed(&self.transforms.current.raw); let path = path.transformed(&self.transforms.current.raw);
tessellator.tessellate_path(path.raw(), &options, &mut buffers) self.fill_tessellator.tessellate_path(
path.raw(),
&options,
&mut buffers,
)
}; };
let _ = result.expect("Tessellate path"); let _ = result.expect("Tessellate path");
@ -109,13 +119,10 @@ impl Frame {
fill: impl Into<Fill>, fill: impl Into<Fill>,
) { ) {
use lyon::path::builder::PathBuilder; use lyon::path::builder::PathBuilder;
use lyon::tessellation::{
BuffersBuilder, FillOptions, FillTessellator,
};
let Fill { color, rule } = fill.into(); let Fill { color, rule } = fill.into();
let mut buffers = BuffersBuilder::new( let mut buffers = tessellation::BuffersBuilder::new(
&mut self.buffers, &mut self.buffers,
FillVertex(color.into_linear()), FillVertex(color.into_linear()),
); );
@ -130,10 +137,10 @@ impl Frame {
lyon::math::Vector::new(size.width, size.height), lyon::math::Vector::new(size.width, size.height),
); );
let mut tessellator = FillTessellator::new(); let options =
let options = FillOptions::default().with_fill_rule(rule.into()); tessellation::FillOptions::default().with_fill_rule(rule.into());
let mut builder = tessellator.builder(&options, &mut buffers); let mut builder = self.fill_tessellator.builder(&options, &mut buffers);
builder.add_rectangle( builder.add_rectangle(
&lyon::math::Rect::new(top_left, size.into()), &lyon::math::Rect::new(top_left, size.into()),
@ -146,31 +153,33 @@ impl Frame {
/// Draws the stroke of the given [`Path`] on the [`Frame`] with the /// Draws the stroke of the given [`Path`] on the [`Frame`] with the
/// provided style. /// provided style.
pub fn stroke(&mut self, path: &Path, stroke: impl Into<Stroke>) { pub fn stroke(&mut self, path: &Path, stroke: impl Into<Stroke>) {
use lyon::tessellation::{
BuffersBuilder, StrokeOptions, StrokeTessellator,
};
let stroke = stroke.into(); let stroke = stroke.into();
let mut buffers = BuffersBuilder::new( let mut buffers = tessellation::BuffersBuilder::new(
&mut self.buffers, &mut self.buffers,
StrokeVertex(stroke.color.into_linear()), StrokeVertex(stroke.color.into_linear()),
); );
let mut tessellator = StrokeTessellator::new(); let mut options = tessellation::StrokeOptions::default();
let mut options = StrokeOptions::default();
options.line_width = stroke.width; options.line_width = stroke.width;
options.start_cap = stroke.line_cap.into(); options.start_cap = stroke.line_cap.into();
options.end_cap = stroke.line_cap.into(); options.end_cap = stroke.line_cap.into();
options.line_join = stroke.line_join.into(); options.line_join = stroke.line_join.into();
let result = if self.transforms.current.is_identity { let result = if self.transforms.current.is_identity {
tessellator.tessellate_path(path.raw(), &options, &mut buffers) self.stroke_tessellator.tessellate_path(
path.raw(),
&options,
&mut buffers,
)
} else { } else {
let path = path.transformed(&self.transforms.current.raw); let path = path.transformed(&self.transforms.current.raw);
tessellator.tessellate_path(path.raw(), &options, &mut buffers) self.stroke_tessellator.tessellate_path(
path.raw(),
&options,
&mut buffers,
)
}; };
let _ = result.expect("Stroke path"); let _ = result.expect("Stroke path");