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

Minor change

Browse Source
This commit is contained in:
Devine Lu Linvega 2018-05-08 13:32:06 +12:00
parent 1e9056cb5a
commit 0e90aec8ea
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
desktop/sources/scripts/dotgrid.js
View File

@ -487,8 +487,11 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y)
this.paste = function(e)
{
var data = e.clipboardData.getData("text/source");
data = JSON.parse(data.trim());
dotgrid.tool.import(data);
if(is_json(data)){
data = JSON.parse(data.trim());
dotgrid.tool.import(data);
}
this.draw();
}
@ -513,6 +516,18 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y)
return {x:x,y:y};
}
function is_json(text)
{
try{
JSON.parse(text);
return true;
}
catch (error){
return false;
}
}
function pos_is_equal(a,b){ return a && b && a.x == b.x && a.y == b.y }
function clamp(v, min, max) { return v < min ? min : v > max ? max : v; }
}

5
desktop/sources/scripts/tool.js
View File

@ -265,7 +265,7 @@ function Tool()
return html
}
this.mirror_mod = function(vertex,angle,mirror_x = false,mirror_y = false)
this.mirror_mod = function(vertex,angle = 0,mirror_x = false,mirror_y = false)
{
if(!vertex){ return null; }
@ -275,6 +275,9 @@ function Tool()
if(mirror_y == true){
return {x:vertex.x,y:(dotgrid.tool.settings.size.height - vertex.y)+(dotgrid.height/2)}
}
if(angle == 0){
return vertex;
}
return rotate_point(vertex.x,vertex.y,dotgrid.tool.settings.size.width/2,dotgrid.tool.settings.size.height/2,angle)
}