From bef1257276f8689c3a03072a5755947208bd758f Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Wed, 22 Nov 2017 19:04:14 +1300 Subject: [PATCH] Fixed issue with eraser --- sources/scripts/core/cursor.js | 6 ------ sources/scripts/modules/brush.js | 20 +------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/sources/scripts/core/cursor.js b/sources/scripts/core/cursor.js index d816524..763db40 100644 --- a/sources/scripts/core/cursor.js +++ b/sources/scripts/core/cursor.js @@ -61,9 +61,6 @@ function Cursor(rune) else if(e.altKey && e.shiftKey){ ronin.brush.methods.pick.run(pos); } - else if(e.altKey){ - ronin.brush.erase(ronin.cursor.line); - } else if(e.shiftKey){ } @@ -94,9 +91,6 @@ function Cursor(rune) else if(e.altKey && e.shiftKey){ ronin.brush.methods.pick.run(pos); } - else if(e.altKey){ - ronin.brush.erase(ronin.cursor.line); - } else if(e.shiftKey){ ronin.cursor.drag(ronin.cursor.line); } diff --git a/sources/scripts/modules/brush.js b/sources/scripts/modules/brush.js index f888ab2..8470625 100644 --- a/sources/scripts/modules/brush.js +++ b/sources/scripts/modules/brush.js @@ -49,24 +49,6 @@ function Brush() } } - this.erase = function(line) - { - var ctx = ronin.render.context(); - - if(!line.to){ - line.to = line.from - } - - ctx.beginPath(); - ctx.globalCompositeOperation="destination-out"; - ctx.moveTo(line.from.x * 2,line.from.y * 2); - ctx.lineTo(line.to.x * 2,line.to.y * 2); - ctx.lineCap="round"; - ctx.lineWidth = this.thickness(line); - ctx.stroke(); - ctx.closePath(); - } - this.pick = function(line) { if(!line.to){ @@ -120,7 +102,7 @@ function Pointer(options) } ctx.beginPath(); - ctx.globalCompositeOperation="source-over"; + ctx.globalCompositeOperation = ronin.keyboard.is_down["Alt"] ? "destination-out" : "source-over"; ctx.moveTo((line.from.x * 2) + this.options.offset.x,(line.from.y * 2) + this.options.offset.y); ctx.lineTo((line.to.x * 2) + this.options.offset.x,(line.to.y * 2) + this.options.offset.y); ctx.lineCap="round";