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

Remove further weird offsets

Browse Source
This commit is contained in:
Devine Lu Linvega 2018-08-03 11:41:37 +12:00
parent 55a0f755b6
commit fe6192c6bc
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/sources/scripts/cursor.js
View File

@ -93,8 +93,8 @@ function Cursor()
{
var grid = dotgrid.tool.settings.size.width/dotgrid.grid_x;
return {
x:clamp(step(pos.x,grid),0,dotgrid.tool.settings.size.width),
y:clamp(step(pos.y,grid),0,dotgrid.tool.settings.size.height)
x:clamp(step(pos.x,grid),grid,dotgrid.tool.settings.size.width+grid),
y:clamp(step(pos.y,grid),grid,dotgrid.tool.settings.size.height+grid)
};
}
}

24
desktop/sources/scripts/guide.js
View File

@ -8,7 +8,7 @@ function Guide()
this.el.style.height = "320px";
this.show_extras = true;
this.scale = 1; // require('electron').remote.getCurrentWindow().this.scaleFactor;
this.scale = 2; // require('electron').remote.getCurrentWindow().this.scaleFactor;
this.start = function()
{
@ -79,13 +79,21 @@ function Guide()
{
if(!this.show_extras){ return; }
for (var x = dotgrid.grid_x; x >= 0; x--) {
var cursor = {x:parseInt(dotgrid.cursor.pos.x/dotgrid.grid_width),y:parseInt(dotgrid.cursor.pos.y/dotgrid.grid_width)}
for (var x = dotgrid.grid_x-1; x >= 0; x--) {
for (var y = dotgrid.grid_y; y >= 0; y--) {
var pos_x = parseInt(x * dotgrid.grid_width) + dotgrid.grid_width ;
var pos_y = parseInt(y * dotgrid.grid_height) + dotgrid.grid_height ;
var is_step = x % dotgrid.block_x == 0 && y % dotgrid.block_y == 0;
var radius = is_step ? 2.5 : 1.5;
this.draw_marker({x:pos_x,y:pos_y},radius,is_step);
// Color
var color = is_step ? dotgrid.theme.active.f_med : dotgrid.theme.active.f_low;
if((y == 0 || y == dotgrid.grid_y) && cursor.x == x+1){ color = dotgrid.theme.active.f_high; }
else if((x == 0 || x == dotgrid.grid_x-1) && cursor.y == y+1){ color = dotgrid.theme.active.f_high; }
this.draw_marker({
x:parseInt(x * dotgrid.grid_width) + dotgrid.grid_width,
y:parseInt(y * dotgrid.grid_height) + dotgrid.grid_height
},is_step ? 2.5 : 1.5,color);
}
}
}
@ -128,13 +136,13 @@ function Guide()
ctx.closePath();
}
this.draw_marker = function(pos,radius = 1,step)
this.draw_marker = function(pos,radius = 1,color)
{
var ctx = this.el.getContext('2d');
ctx.beginPath();
ctx.lineWidth = 2;
ctx.arc(pos.x * this.scale, pos.y * this.scale, radius, 0, 2 * Math.PI, false);
ctx.fillStyle = step ? dotgrid.theme.active.f_med : dotgrid.theme.active.f_low;
ctx.fillStyle = color;
ctx.fill();
ctx.closePath();
}