akkartik/lines-polygon-experiment - Change DDXXXXBRUH4UHHPOLAK2IG45C4QAPGSR4MTLV3MVFV3EMND43DIAC

new mode for polygons

Created by Kartik K. Agaram on June 15, 2022

DDXXXXBRUH4UHHPOLAK2IG45C4QAPGSR4MTLV3MVFV3EMND43DIAC

Dependencies

In channels

main

Change contents

Insertion in main.lua at line 64 [4.2]
[3.109]
[3.109]
```
Current_drawing_submode = nil
```

Insertion in geom.lua at line 30 [3.11579]

[3.12009]

  elseif shape.mode == 'polygon' then
    -- TODO
    return false

Insertion in geom.lua at line 170 [3.11579]

[3.14960]

end
function geom.rotate(cx,cy, x,y, theta)
  local x2,y2 = x-cx,y-cy
  local x3 = x2*math.cos(theta) - y2*math.sin(theta)
  local y3 = x2*math.sin(theta) + y2*math.cos(theta)
  return cx+x3,cy+y3

Insertion in file.lua at line 66 [3.15083]

[3.16909]

    elseif shape.mode == 'polygon' then
      local name = shape.center.name
      shape.center = Drawing.insert_point(drawing.points, shape.center.x,shape.center.y)
      drawing.points[shape.center].name = name
      local name = shape.p1.name
      shape.p1 = Drawing.insert_point(drawing.points, shape.p1.x,shape.p1.y)
      drawing.points[shape.p1].name = name

Insertion in file.lua at line 103 [3.15083]

[5.164]

[3.17803]

    elseif shape.mode == 'polygon' then
      outfile:write(json.encode({mode=shape.mode, num_vertices=shape.num_vertices, center=drawing.points[shape.center], p1=drawing.points[shape.p1]}), '\n')

Insertion in file.lua at line 168 [3.15083]

[6.2914]

    elseif shape.mode == 'polygon' then
      local name = shape.center.name
      shape.center = Drawing.insert_point(drawing.points, shape.center.x,shape.center.y)
      drawing.points[shape.center].name = name
      local name = shape.p1.name
      shape.p1 = Drawing.insert_point(drawing.points, shape.p1.x,shape.p1.y)
      drawing.points[shape.p1].name = name

Insertion in drawing_tests.lua at line 188 [9.15]

[7.7377]

[8.2608]

end
function test_draw_polygon()
  io.write('\ntest_draw_polygon')
  -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
  App.screen.init{width=Margin_left+300, height=300}
  Lines = load_array{'```lines', '```', ''}
  Line_width = 256  -- drawing coordinates 1:1 with pixels
  App.draw()
  check_eq(Current_drawing_mode, 'line', 'F - test_draw_polygon/baseline/drawing_mode')
  check_eq(#Lines, 2, 'F - test_draw_polygon/baseline/#lines')
  check_eq(Lines[1].mode, 'drawing', 'F - test_draw_polygon/baseline/mode')
  check_eq(Lines[1].y, Margin_top+Drawing_padding_top, 'F - test_draw_polygon/baseline/y')
  check_eq(Lines[1].h, 128, 'F - test_draw_polygon/baseline/y')
  check_eq(#Lines[1].shapes, 0, 'F - test_draw_polygon/baseline/#shapes')
  -- start a stroke
  App.run_after_mouse_press(Margin_left+35, Margin_top+Drawing_padding_top+36, 1)
  -- switch to polygon mode
  App.run_after_keychord('5')
  App.run_after_mouse_release(Margin_left+55, Margin_top+Drawing_padding_top+26, 1)
  local drawing = Lines[1]
  check_eq(#drawing.shapes, 1, 'F - test_draw_polygon/#shapes')
  check_eq(#drawing.points, 2, 'F - test_draw_polygon/vertices')
  local shape = drawing.shapes[1]
  check_eq(shape.mode, 'polygon', 'F - test_draw_polygon/shape_mode')
  check_eq(shape.num_vertices, 5, 'F - test_draw_polygon/vertices')

Insertion in drawing.lua at line 99 [11.98]

[10.1183]

  elseif shape.mode == 'polygon' then
    local center = drawing.points[shape.center]
    local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top
    local p1 = drawing.points[shape.p1]
    local x,y = Drawing.pixels(p1.x)+left, Drawing.pixels(p1.y)+top
    Drawing.draw_polygon(shape.num_vertices, cx,cy, x,y)

Deletion in drawing.lua at line 144 [11.98]
B:BD[10.2868] → [10.2868:2906]
B:BD[10.2906] → [12.226:238]
```
  elseif shape.mode == 'polygon' then
    -- TODO
```

Insertion in drawing.lua at line 158 [11.98]

[13.2936]

[10.3372]

  elseif shape.mode == 'polygon' then
    local center = drawing.points[shape.center]
    local mx,my = Drawing.coord(App.mouse_x()-left), Drawing.coord(App.mouse_y()-top)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
    local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top
    Drawing.draw_polygon(Current_drawing_submode, cx,cy, App.mouse_x(),App.mouse_y())

Insertion in drawing.lua at line 193 [11.98]

[14.646]

[10.4359]

function Drawing.draw_polygon(n, cx,cy, x1,y1)
  local r = geom.dist(cx,cy, x1,y1)
  local theta = 2*math.pi/n
  local prevx,prevy = x1,y1
  for i=1,n do
    x,y = geom.rotate(cx,cy, prevx,prevy, theta)
    love.graphics.line(prevx,prevy, x,y)
    prevx,prevy = x,y
  end
end

Insertion in drawing.lua at line 218 [11.98]

[14.1464]

  elseif Current_drawing_mode == 'polygon' then
    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-Margin_left), Drawing.coord(y-drawing.y))
    drawing.pending = {mode=Current_drawing_mode, num_vertices=Current_drawing_submode, center=j}

Deletion in drawing.lua at line 294 [11.98]
B:BD[15.1696] → [16.1179:1231]
B:BD[16.1231] → [12.290:306]
```
      elseif drawing.pending.mode == 'polygon' then
        -- TODO
```

Insertion in drawing.lua at line 309 [11.98]

[13.6330]

[16.2919]

      elseif drawing.pending.mode == 'polygon' then
        local mx,my = Drawing.coord(x-Margin_left), Drawing.coord(y-drawing.y)
        drawing.pending.p1 = Drawing.insert_point(drawing.points, mx,my)
        table.insert(drawing.shapes, drawing.pending)

Replacement in drawing.lua at line 347 [11.98]

B:BD[2.315] → [2.315:440]

    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then

[2.315]

[2.440]

    elseif drawing.pending.mode == 'rectangle' then

Replacement in drawing.lua at line 349 [11.98]

B:BD[2.495] → [2.495:577]

    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then

[2.495]

[2.577]

    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then

Replacement in drawing.lua at line 362 [11.98]

B:BD[2.1136] → [2.1136:1261]

    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' or drawing.pending.mode == 'square' then

[2.1136]

[2.1261]

    elseif drawing.pending.mode == 'rectangle' then

Replacement in drawing.lua at line 364 [11.98]

B:BD[2.1316] → [2.1316:1398]

    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then

[2.1316]

[2.1398]

    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then

Insertion in drawing.lua at line 393 [11.98]

[17.6992]

[18.2149]

  elseif chord == 'C-3' and not App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 3
  elseif chord == 'C-4' and not App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 4
  elseif chord == 'C-5' and not App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 5
  elseif chord == 'C-6' and not App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 6
  elseif chord == 'C-7' and not App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 7
  elseif chord == 'C-8' and not App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 8
  elseif chord == 'C-9' and not App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 9
  elseif chord == '3' and App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 3
    Drawing.switch_current_drawing_pending_to_polygon()
  elseif chord == '4' and App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 4
    Drawing.switch_current_drawing_pending_to_polygon()
  elseif chord == '5' and App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 5
    Drawing.switch_current_drawing_pending_to_polygon()
  elseif chord == '6' and App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 6
    Drawing.switch_current_drawing_pending_to_polygon()
  elseif chord == '7' and App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 7
    Drawing.switch_current_drawing_pending_to_polygon()
  elseif chord == '8' and App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 8
    Drawing.switch_current_drawing_pending_to_polygon()
  elseif chord == '9' and App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
    Current_drawing_submode = 9
    Drawing.switch_current_drawing_pending_to_polygon()

Insertion in drawing.lua at line 510 [11.98]

[13.8179]

function Drawing.switch_current_drawing_pending_to_polygon()
  local _,drawing = Drawing.current_drawing()
  if drawing.pending.mode == 'freehand' then
    drawing.pending.center = Drawing.insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)
  elseif drawing.pending.mode == 'line' or drawing.pending.mode == 'manhattan' then
    drawing.pending.center = drawing.pending.p1
  elseif drawing.pending.mode == 'rectangle' then
    drawing.pending.center = drawing.pending.vertices[1]
  elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
    -- reuse center
  end
  drawing.pending.mode = 'polygon'
  drawing.pending.num_vertices = Current_drawing_submode
end

Insertion in drawing.lua at line 620 [11.98]

[3.21231]

  elseif shape.mode == 'polygon' then
    return shape.center == p or shape.p1 == p