From 5a1709adeb61bc390f05f732143f4c788e24877b Mon Sep 17 00:00:00 2001 From: Victor Giers Date: Fri, 8 Jan 2021 23:24:24 +0100 Subject: [PATCH] reset function for bounder, reset on right click --- bounder.pde | 12 ++++++++++-- scancropper2.pde | 10 +++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/bounder.pde b/bounder.pde index b7f360a..f2b3f9a 100644 --- a/bounder.pde +++ b/bounder.pde @@ -9,7 +9,7 @@ class Bounder { return a; } PVector p1, p2, p3, p4; - void click() { + void leftclick() { if (state < 3) state++; else state = 1; if (state == 1) { @@ -21,9 +21,17 @@ class Bounder { } if (state == 3) { h = -p2.dist(new PVector(mouseX, mouseY)); - noLoop(); } } + + void rightclick(){ + reset(); + } + void reset(){ + boolean redrawthis = (state == 3) ? true : false; + state = 0; + if(redrawthis) redraw(); + } void update() { if (state == 2) { h = -p2.dist(new PVector(mouseX, mouseY)); diff --git a/scancropper2.pde b/scancropper2.pde index 48419b6..bb5a793 100644 --- a/scancropper2.pde +++ b/scancropper2.pde @@ -55,8 +55,7 @@ void keyPressed() { } if (key == ' ') { if (bounder.state == 3) bounder.compile(false); - bounder.state = 0; - println("Bounder reset"); + bounder.reset(); } if (key == CODED) { if (keyCode == RIGHT) { @@ -76,7 +75,12 @@ void keyPressed() { } void mousePressed() { - bounder.click(); + if(mouseButton == LEFT){ + bounder.leftclick(); + } + if(mouseButton == RIGHT){ + bounder.rightclick(); + } } void setImage(int i) {