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

Migrated brush mouse events into cursor.paint

Browse Source
This commit is contained in:
Devine Lu Linvega 2016-12-19 10:14:07 -07:00
parent 01e8b81fda
commit 53898a5881
2 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/modes/mode.paint.js
View File

@ -4,18 +4,35 @@ function Mode_Paint()
this.name = "Paint"; this.name = "Paint";
this.is_drawing = false;
this.mouse_down = function(event) this.mouse_down = function(event)
{ {
ronin.brush.draw_start(event); ronin.brush.draw(event); this.is_drawing = true;
for (i = 0; i < ronin.brush.pointers.length; i++) {
ronin.brush.pointers[i].start();
}
} }
this.mouse_move = function(event) this.mouse_move = function(event)
{ {
ronin.brush.draw(event); if(this.is_drawing === false){return;}
// this.position = new Position(event.clientX - parseFloat(ronin.surface.style.left) - parseFloat(ronin.canvas.element.style.left),event.clientY- parseFloat(ronin.surface.style.top) - parseFloat(ronin.canvas.element.style.top));
ronin.brush.position = ronin.position_in_canvas(event);
for (i = 0; i < ronin.brush.pointers.length; i++) {
ronin.brush.pointers[i].draw();
}
} }
this.mouse_up = function(event) this.mouse_up = function(event)
{ {
ronin.brush.draw_stop(event); this.is_drawing = false;
for (i = 0; i < ronin.brush.pointers.length; i++) {
ronin.brush.pointers[i].stop();
}
} }
} }

32
scripts/modules/brush.js
View File

@ -6,7 +6,6 @@ function Brush(rune)
this.pointers = [new Pointer(new Position())]; this.pointers = [new Pointer(new Position())];
this.position = new Position(); this.position = new Position();
this.is_drawing = false;
this.size = 1; this.size = 1;
this.opacity = 1; this.opacity = 1;
this.color = new Color(); this.color = new Color();
@ -62,37 +61,6 @@ function Brush(rune)
this.pointers.push(pointer); this.pointers.push(pointer);
} }
// Draw
this.draw = function(e)
{
if(this.is_drawing === false){return;}
this.position = new Position(e.clientX - parseFloat(ronin.surface.style.left) - parseFloat(ronin.canvas.element.style.left),e.clientY- parseFloat(ronin.surface.style.top) - parseFloat(ronin.canvas.element.style.top));
for (i = 0; i < this.pointers.length; i++) {
this.pointers[i].draw();
}
}
this.draw_start = function(e)
{
this.is_drawing = true;
for (i = 0; i < this.pointers.length; i++) {
this.pointers[i].start();
}
}
this.draw_stop = function(e)
{
this.is_drawing = false;
for (i = 0; i < this.pointers.length; i++) {
this.pointers[i].stop();
}
}
this.widget = function() this.widget = function()
{ {
return "> "+this.size+" <span style='color:"+this.color.render()+"'>"+this.color.render()+"</span> "; return "> "+this.size+" <span style='color:"+this.color.render()+"'>"+this.color.render()+"</span> ";