dakedres/ronin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor updates to brush

Browse Source
This commit is contained in:
Devine Lu Linvega 2017-11-21 19:46:27 +13:00
parent 63715078d9
commit 4820e2b2b5
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sources/scripts/core/cursor.js
View File

@ -53,9 +53,15 @@ function Cursor(rune)
// Save original query // Save original query
ronin.cursor.query = ronin.commander.input_el.value; ronin.cursor.query = ronin.commander.input_el.value;
if(e.altKey && e.shiftKey){ if(ronin.commander.active_module()){
}
else if(e.altKey && e.shiftKey){
ronin.brush.methods.pick.run(pos); ronin.brush.methods.pick.run(pos);
} }
else{
ronin.brush.stroke(ronin.cursor.line);
}
if(e.shiftKey){ ronin.cursor.mode = "rect"; } if(e.shiftKey){ ronin.cursor.mode = "rect"; }
if(e.altKey){ ronin.cursor.mode = "arc_to"; } if(e.altKey){ ronin.cursor.mode = "arc_to"; }

10
sources/scripts/modules/brush.js
View File

@ -33,7 +33,7 @@ function Brush()
this.thickness = function(line) this.thickness = function(line)
{ {
var t = ronin.cursor.size * this.ports.speed; var t = ronin.cursor.size * this.ports.speed;
this.absolute_thickness = t > this.absolute_thickness ? this.absolute_thickness+0.5 : this.absolute_thickness-0.5; this.absolute_thickness = t > this.absolute_thickness ? this.absolute_thickness+0.25 : this.absolute_thickness-0.25;
return this.absolute_thickness * 3; return this.absolute_thickness * 3;
} }
@ -43,8 +43,6 @@ function Brush()
this.ports.speed = 1-distance_between(line.from,line.to)/15.0; this.ports.speed = 1-distance_between(line.from,line.to)/15.0;
this.ports.distance += this.ports.speed; this.ports.distance += this.ports.speed;
// this.ports.noise = Math.random(255/255.0);
// this.ports.x = line.from.x/2;
for(pointer_id in this.pointers){ for(pointer_id in this.pointers){
this.pointers[pointer_id].stroke(line); this.pointers[pointer_id].stroke(line);
@ -82,7 +80,7 @@ function Brush()
function distance_between(a,b) function distance_between(a,b)
{ {
return Math.sqrt( (a.x-b.x)*(a.x-b.x) + (a.y-b.y)*(a.y-b.y) ); return a && b ? Math.sqrt( (a.x-b.x)*(a.x-b.x) + (a.y-b.y)*(a.y-b.y) ) : 0;
} }
} }
@ -109,6 +107,10 @@ function Pointer(options)
line.to.x = (this.options.mirror.x*2) - line.to.x; line.to.x = (this.options.mirror.x*2) - line.to.x;
} }
if(!line.to){
line.to = line.from
}
ctx.beginPath(); ctx.beginPath();
ctx.globalCompositeOperation="source-over"; ctx.globalCompositeOperation="source-over";
ctx.moveTo((line.from.x * 2) + this.options.offset.x,(line.from.y * 2) + this.options.offset.y); ctx.moveTo((line.from.x * 2) + this.options.offset.x,(line.from.y * 2) + this.options.offset.y);