liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Stretch edge & shape bounds separately and avoid a clone, in rendering api

This commit is contained in:
Nathan Adams 2020-05-21 18:20:27 +02:00
parent 04690581ba
commit 55215273e8
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
core/src/drawing.rs
View File

@ -111,42 +111,25 @@ impl Drawing {
if let Some(command) = self
.current_fill
.as_ref()
.and_then(|(_, commands)| commands.last().cloned())
.and_then(|(_, commands)| commands.last())
{
self.stretch_bounds(command)
stretch_bounding_box(&mut self.edge_bounds, command);
stretch_bounding_box(&mut self.shape_bounds, command);
}
if let Some(command) = self
.current_line
.as_ref()
.and_then(|(_, commands)| commands.last().cloned())
.and_then(|(_, commands)| commands.last())
{
self.stretch_bounds(command)
stretch_bounding_box(&mut self.edge_bounds, command);
stretch_bounding_box(&mut self.shape_bounds, command);
}
}
self.dirty = true;
}
fn stretch_bounds(&mut self, command: DrawCommand) {
match command {
DrawCommand::MoveTo { x, y } => {
self.shape_bounds.encompass(x, y);
self.edge_bounds.encompass(x, y);
}
DrawCommand::LineTo { x, y } => {
self.shape_bounds.encompass(x, y);
self.edge_bounds.encompass(x, y);
}
DrawCommand::CurveTo { x1, y1, x2, y2 } => {
self.shape_bounds.encompass(x1, y1);
self.shape_bounds.encompass(x2, y2);
self.edge_bounds.encompass(x1, y1);
self.edge_bounds.encompass(x2, y2);
}
}
}
pub fn run_frame(&mut self, context: &mut UpdateContext) {
if self.dirty {
self.dirty = false;
@ -211,3 +194,18 @@ impl Drawing {
self.shape_bounds.clone()
}
}
fn stretch_bounding_box(bounding_box: &mut BoundingBox, command: &DrawCommand) {
match *command {
DrawCommand::MoveTo { x, y } => {
bounding_box.encompass(x, y);
}
DrawCommand::LineTo { x, y } => {
bounding_box.encompass(x, y);
}
DrawCommand::CurveTo { x1, y1, x2, y2 } => {
bounding_box.encompass(x1, y1);
bounding_box.encompass(x2, y2);
}
}
}