diff --git a/desktop/sources/scripts/generator.js b/desktop/sources/scripts/generator.js index 8e75416..82e74fe 100644 --- a/desktop/sources/scripts/generator.js +++ b/desktop/sources/scripts/generator.js @@ -20,21 +20,21 @@ function Generator(layer) return l; } - this.render = function(segment,mirror = 0) + this.render = function(id,segment,mirror = 0) { var type = segment.type; var vertices = segment.vertices; var html = ''; var skip = 0; - for(id in vertices){ + for(i in vertices){ if(skip > 0){ skip -= 1; continue; } - var vertex = vertices[id] - var next = vertices[parseInt(id)+1] - var after_next = vertices[parseInt(id)+2] + var vertex = vertices[i] + var next = vertices[parseInt(i)+1] + var after_next = vertices[parseInt(i)+2] - if(id == 0){ + if(id == 0 && i == 0){ html += `M${vertex.x},${vertex.y} ` } @@ -71,7 +71,7 @@ function Generator(layer) for(id in layer){ var seg = layer[id]; - s += `${this.render(seg,mirror)}` + s += `${this.render(id,seg,mirror)}` } return s; diff --git a/desktop/sources/scripts/guide.js b/desktop/sources/scripts/guide.js index d7d58d5..174dfab 100644 --- a/desktop/sources/scripts/guide.js +++ b/desktop/sources/scripts/guide.js @@ -19,9 +19,14 @@ function Guide() this.refresh = function() { this.clear(); - this.draw_markers() - this.draw_vertices() - this.draw_paths() + + if(dotgrid.tool.index == 2){ this.draw_markers() ;this.draw_vertices() } + this.draw_path(new Generator(dotgrid.tool.layers[2]).toString({x:15,y:15},scale),dotgrid.tool.styles[2]) + if(dotgrid.tool.index == 1){ this.draw_markers() ;this.draw_vertices() } + this.draw_path(new Generator(dotgrid.tool.layers[1]).toString({x:15,y:15},scale),dotgrid.tool.styles[1]) + if(dotgrid.tool.index == 0){ this.draw_markers(); this.draw_vertices() } + this.draw_path(new Generator(dotgrid.tool.layers[0]).toString({x:15,y:15},scale),dotgrid.tool.styles[0]) + this.draw_handles() this.draw_translation(); this.draw_cursor(); @@ -135,13 +140,6 @@ function Guide() ctx.closePath(); } - this.draw_paths = function() - { - this.draw_path(new Generator(dotgrid.tool.layers[2]).toString({x:15,y:15},scale),dotgrid.tool.styles[2]) - this.draw_path(new Generator(dotgrid.tool.layers[1]).toString({x:15,y:15},scale),dotgrid.tool.styles[1]) - this.draw_path(new Generator(dotgrid.tool.layers[0]).toString({x:15,y:15},scale),dotgrid.tool.styles[0]) - } - this.draw_path = function(path,style) { var ctx = this.el.getContext('2d');