viliusle#311 polygons

bit9labs · Jan 7, 2023 · bbb17d5 · bbb17d5
1 parent fc0ccf3
commit bbb17d5
Show file tree

Hide file tree

Showing 4 changed files with 430 additions and 19 deletions.
diff --git a/images/test-collection.json b/images/test-collection.json
@@ -1741,22 +1741,10 @@
  "composition": "source-over",
  "rotate": null,
  "data": {
- "start": {
- "x": 400,
- "y": 660.5
- },
- "cp1": {
- "x": 477.5,
- "y": 661.5
- },
- "cp2": {
- "x": 400,
- "y": 708
- },
- "end": {
- "x": 480,
- "y": 707.5
- }
+ "start": {"x": 400, "y": 660.5},
+ "cp1": {"x": 477.5, "y": 661.5},
+ "cp2": {"x": 400, "y": 708},
+ "end": {"x": 480, "y": 707.5}
  },
  "params": {
  "size": 4
@@ -1768,6 +1756,48 @@
  "bezier_curve",
  "render"
  ]
+ },
+ {
+ "id": 49,
+ "parent_id": 0,
+ "name": "Polygon #49",
+ "type": "polygon",
+ "link": null,
+ "x": 0,
+ "y": 0,
+ "width": null,
+ "width_original": null,
+ "height": null,
+ "height_original": null,
+ "visible": true,
+ "is_vector": true,
+ "hide_selection_if_active": true,
+ "opacity": 100,
+ "order": 49,
+ "composition": "source-over",
+ "rotate": null,
+ "data": [
+ {"x": 950, "y": 551},
+ {"x": 950, "y": 599},
+ {"x": 900, "y": 599},
+ {"x": 935, "y": 586},
+ {"x": 915, "y": 533.2}
+ ],
+ "params": {
+ "size": 4,
+ "border_size": 4,
+ "border": true,
+ "fill": true,
+ "border_color": "#555555",
+ "fill_color": "#aaaaaa"
+ },
+ "status": "draft",
+ "color": "#ff0000",
+ "filters": [],
+ "render_function": [
+ "polygon",
+ "render"
+ ]
  }
  ],
  "data": [

diff --git a/src/js/config.js b/src/js/config.js
@@ -493,6 +493,18 @@ config.TOOLS = [
  delay: 400,
  },
  },
+ {
+ name: 'polygon',
+ visible: false,
+ attributes: {
+ size: 4,
+ border_size: 4,
+ border: true,
+ fill: true,
+ border_color: '#555555',
+ fill_color: '#aaaaaa',
+ },
+ },
 ];
 
 //link to active tool

diff --git a/src/js/tools/shapes/bezier_curve.js b/src/js/tools/shapes/bezier_curve.js
@@ -270,15 +270,15 @@ class Bezier_Curve_class extends Base_tools_class {
  end: {x: x + width, y: y + height}
  };
 
- this.draw_bezier(ctx, 0, 0, data, 2, '#555', true, null);
+ this.draw_bezier(ctx, 0, 0, data, 2, '#555');
  }
 
  render(ctx, layer) {
  var params = layer.params;
- this.draw_bezier(ctx, layer.x, layer.y, layer.data, params.size, layer.color, false, layer.id);
+ this.draw_bezier(ctx, layer.x, layer.y, layer.data, params.size, layer.color);
  }
 
- draw_bezier(ctx, x, y, data, lineWidth, color, is_demo, layer_id) {
+ draw_bezier(ctx, x, y, data, lineWidth, color) {
  if(data.end.x == null || data.cp2.x == null){
  return;
  }