enrico
/
stiletto
1
1
Fork 0
Code Issues 27 Pull Requests 3 Releases Wiki Activity

WIP: Eraser implementation #7

Draft
Franciman wants to merge 8 commits from eraserhead into master
pull from: eraserhead
merge into: enrico:master
Conversation 5 Commits 8 Files Changed 5 +5 -3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b1dd4caed - Show all commits

6
src/canvas.rs
View File

@ -37,6 +37,7 @@ impl CanvasElement {
} }
// O(1) complexity // O(1) complexity
// TODO: This is only a toy implementation, this is not at all correct!
fn segment_intersects_rect(segment: &druid::kurbo::PathSeg, rect: druid::Rect) -> bool { fn segment_intersects_rect(segment: &druid::kurbo::PathSeg, rect: druid::Rect) -> bool {
match segment { match segment {
druid::kurbo::PathSeg::Line(line) => rect.contains(line.p0) || rect.contains(line.p1), druid::kurbo::PathSeg::Line(line) => rect.contains(line.p0) || rect.contains(line.p1),
@ -46,7 +47,7 @@ fn segment_intersects_rect(segment: &druid::kurbo::PathSeg, rect: druid::Rect) -
} }
druid::kurbo::PathSeg::Cubic(cubic) => { druid::kurbo::PathSeg::Cubic(cubic) => {
rect.contains(cubic.p0) || rect.contains(cubic.p1) || rect.contains(cubic.p2) rect.contains(cubic.p0) || rect.contains(cubic.p1) || rect.contains(cubic.p2) || rect.contains(cubic.p3)
} }
} }
} }
@ -68,6 +69,7 @@ impl Canvas {
pub fn erase(&mut self, eraser_rect: druid::Rect) { pub fn erase(&mut self, eraser_rect: druid::Rect) {
for elem in self.elements.iter_mut() { for elem in self.elements.iter_mut() {
if elem.bounding_box().intersect(eraser_rect).area() > 0.0 { if elem.bounding_box().intersect(eraser_rect).area() > 0.0 {
// TODO: if a part of the path is erased, split the path into subpaths
match elem { match elem {
CanvasElement::Freehand { path, thickness: _ } => { CanvasElement::Freehand { path, thickness: _ } => {
// Remove segments intersecting the eraser // Remove segments intersecting the eraser
@ -82,7 +84,7 @@ impl Canvas {
} }
} }
pub fn push_back(&mut self, element: CanvasElement) { pub fn add_element(&mut self, element: CanvasElement) {
self.elements.push_back(element); self.elements.push_back(element);
} }
} }

2
src/canvas_tools.rs
View File

@ -67,7 +67,7 @@ impl CanvasTool {
if let Some(current_element) = current_element.take() { if let Some(current_element) = current_element.take() {
canvas.update(move |canvas: &Canvas| -> Canvas { canvas.update(move |canvas: &Canvas| -> Canvas {
let mut new_canvas = canvas.clone(); let mut new_canvas = canvas.clone();
new_canvas.push_back(current_element); new_canvas.add_element(current_element);
return new_canvas; return new_canvas;
}); });
} }