Atlas48/pointvec
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7 from cantbesure1/master

Browse Source 
cursor and thickness bugfix
This commit is contained in:
Лu Лinveгa 2017-11-07 20:52:56 +13:00 committed by GitHub
commit 72fb763715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sources/scripts/dotgrid.js
View File

@ -135,13 +135,8 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y,thickness = 3,lineca
{
var pos = this.position_in_grid(e.clientX,e.clientY);
pos = this.position_on_grid(pos[0],pos[1]);
pos = [pos[0],pos[1]]
if(pos[1] > 300){ return; }
if(pos[0] < -300){ return; }
if(pos[0] > 0){ return; }
if(pos[1] < 0){ return; }
if(pos[2]) return;
if(from === null){ this.set_from(pos); }
else if(to === null){ this.set_to(pos); }
@ -177,7 +172,7 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y,thickness = 3,lineca
this.mod_thickness = function(mod)
{
this.thickness += mod;
this.thickness = Math.max(this.thickness+mod,0);
this.draw();
}
@ -394,11 +389,16 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y,thickness = 3,lineca
return [(window.innerWidth/2) - (this.width/2) - x,y - 50];
}
this.position_on_grid = function(x,y)
this.position_on_grid = function(x,y) // rounds the mouse position to the nearest cell, and limits the coords to within the box
{
x = parseInt(x/this.grid_width) * this.grid_width - (this.grid_width/2) + 5;
y = parseInt(y/this.grid_height) * this.grid_height + (this.grid_height/2) +5;
return [parseInt(x),parseInt(y)];
x = Math.round(x/this.grid_width)*this.grid_width
y = Math.round(y/this.grid_height)*this.grid_height+this.grid_height
off = (x<-this.width || x>0 || y>this.height || y<0)
if(off) { // change position so the cursor will not be seen
x = 50
y = -50
}
return [parseInt(x),parseInt(y),off];
}
}

2
sources/scripts/keyboard.js
View File

@ -40,7 +40,7 @@ function Keyboard()
case 87 : dotgrid.erase(); break; // 'W'
case 8 : dotgrid.erase(); break; // 'Backspace'
case 69 : dotgrid.export(); break; // 'e'
case 13 : dotgrid.export(); break; // 'e'
case 13 : dotgrid.export(); break; // 'Enter'
case 9 : dotgrid.toggle_fill(); e.preventDefault(); break; // 'tab'