akkartik/lines-polygon-experiment - Change W7JMT5V2ELDFZG354LUL5AR6IQLIYQUDXBEPDNZ2BEBXDCZLQJTAC

rip out most support for polygons

Created by Kartik K. Agaram on June 15, 2022

W7JMT5V2ELDFZG354LUL5AR6IQLIYQUDXBEPDNZ2BEBXDCZLQJTAC

Dependencies

In channels

main

Change contents

Replacement in geom.lua at line 28 [5.11579]

B:BD[4.518] → [3.109:176]

  elseif shape.mode == 'polygon' or shape.mode == 'rectangle' then

[4.518]

[5.11961]

  elseif shape.mode == 'rectangle' then

Replacement in file.lua at line 60 [5.15083]

B:BD[6.1350] → [3.178:247]

    elseif shape.mode == 'polygon' or shape.mode == 'rectangle' then

[6.1350]

[5.16782]

    elseif shape.mode == 'rectangle' then

Replacement in file.lua at line 89 [5.15083]

B:BD[7.131] → [3.248:317]

    elseif shape.mode == 'polygon' or shape.mode == 'rectangle' then

[7.131]

[5.17579]

    elseif shape.mode == 'rectangle' then

Replacement in file.lua at line 153 [5.15083]

B:BD[8.2610] → [3.318:387]

    elseif shape.mode == 'polygon' or shape.mode == 'rectangle' then

[8.2610]

[8.2705]

    elseif shape.mode == 'rectangle' then

Deletion in drawing_tests.lua at line 188 [10.15]

B:BD[9.7377] → [9.7377:7381]

B:BD[9.7381] → [11.680: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')
  -- first point
  App.run_after_mouse_press(Margin_left+5, Margin_top+Drawing_padding_top+6, 1)
  App.run_after_keychord('g')  -- polygon mode
  -- second point
  App.mouse_move(Margin_left+65, Margin_top+Drawing_padding_top+36)
  App.run_after_keychord('p')  -- add point
  -- final point
  App.run_after_mouse_release(Margin_left+35, 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, 3, 'F - test_draw_polygon/vertices')
  local shape = drawing.shapes[1]
  check_eq(shape.mode, 'polygon', 'F - test_draw_polygon/shape_mode')
  check_eq(#shape.vertices, 3, 'F - test_draw_polygon/vertices')
  local p = drawing.points[shape.vertices[1]]
  check_eq(p.x, 5, 'F - test_draw_polygon/p1:x')
  check_eq(p.y, 6, 'F - test_draw_polygon/p1:y')
  local p = drawing.points[shape.vertices[2]]
  check_eq(p.x, 65, 'F - test_draw_polygon/p2:x')
  check_eq(p.y, 36, 'F - test_draw_polygon/p2:y')
  local p = drawing.points[shape.vertices[3]]
  check_eq(p.x, 35, 'F - test_draw_polygon/p3:x')
  check_eq(p.y, 26, 'F - test_draw_polygon/p3:y')

Deletion in drawing_tests.lua at line 411 [10.15]

B:BD[2.2692] → [2.2692:4208]

∅:D[12.1938] → [13.1770:1774]

∅:D[2.4208] → [13.1770:1774]

B:BD[13.1770] → [13.1770:1774]

B:BD[13.1774] → [2.4209:5522]

end
function test_delete_point_from_polygon()
  io.write('\ntest_delete_point_from_polygon')
  -- create a drawing with two lines connected at a point
  App.screen.init{width=Margin_left+300, height=300}
  Lines = load_array{'```lines', '```', ''}
  Line_width = 256  -- drawing coordinates 1:1 with pixels
  Current_drawing_mode = 'line'
  App.draw()
  -- first point
  App.run_after_mouse_press(Margin_left+5, Margin_top+Drawing_padding_top+6, 1)
  App.run_after_keychord('g')  -- polygon mode
  -- second point
  App.mouse_move(Margin_left+65, Margin_top+Drawing_padding_top+36)
  App.run_after_keychord('p')  -- add point
  -- third point
  App.mouse_move(Margin_left+35, Margin_top+Drawing_padding_top+26)
  App.run_after_keychord('p')  -- add point
  -- fourth point
  App.run_after_mouse_release(Margin_left+14, Margin_top+Drawing_padding_top+16, 1)
  local drawing = Lines[1]
  check_eq(#drawing.shapes, 1, 'F - test_delete_point_from_polygon/baseline/#shapes')
  check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/baseline/mode')
  check_eq(#drawing.shapes[1].vertices, 4, 'F - test_delete_point_from_polygon/baseline/vertices')
  -- hover on a point and delete
  App.mouse_move(Margin_left+35, Margin_top+Drawing_padding_top+26)
  App.run_after_keychord('C-d')
  -- just the one point is deleted
  check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/shape')
  check_eq(#drawing.shapes[1].vertices, 3, 'F - test_delete_point_from_polygon/vertices')
end
function test_delete_point_from_polygon()
  io.write('\ntest_delete_point_from_polygon')
  -- create a drawing with two lines connected at a point
  App.screen.init{width=Margin_left+300, height=300}
  Lines = load_array{'```lines', '```', ''}
  Line_width = 256  -- drawing coordinates 1:1 with pixels
  Current_drawing_mode = 'line'
  App.draw()
  -- first point
  App.run_after_mouse_press(Margin_left+5, Margin_top+Drawing_padding_top+6, 1)
  App.run_after_keychord('g')  -- polygon mode
  -- second point
  App.mouse_move(Margin_left+65, Margin_top+Drawing_padding_top+36)
  App.run_after_keychord('p')  -- add point
  -- third point
  App.run_after_mouse_release(Margin_left+14, Margin_top+Drawing_padding_top+16, 1)
  local drawing = Lines[1]
  check_eq(#drawing.shapes, 1, 'F - test_delete_point_from_polygon/baseline/#shapes')
  check_eq(drawing.shapes[1].mode, 'polygon', 'F - test_delete_point_from_polygon/baseline/mode')
  check_eq(#drawing.shapes[1].vertices, 3, 'F - test_delete_point_from_polygon/baseline/vertices')
  -- hover on a point and delete
  App.mouse_move(Margin_left+65, Margin_top+Drawing_padding_top+36)
  App.run_after_keychord('C-d')
  -- there's < 3 points left, so the whole polygon is deleted
  check_eq(drawing.shapes[1].mode, 'deleted', 'F - test_delete_point_from_polygon')

Replacement in drawing.lua at line 87 [15.98]

B:BD[14.636] → [3.390:457]

  elseif shape.mode == 'polygon' or shape.mode == 'rectangle' then

[14.636]

[14.674]

  elseif shape.mode == 'rectangle' then

Replacement in drawing.lua at line 139 [15.98]

B:BD[14.2906] → [14.2906:3256]

B:BD[14.3256] → [16.1818:1926]

    -- don't close the loop on a pending polygon
    local prev = nil
    for _,point in ipairs(shape.vertices) do
      local curr = drawing.points[point]
      if prev then
        love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)
      end
      prev = curr
    end
    love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, App.mouse_x(),App.mouse_y())

[14.2906]

[17.1853]

    -- TODO

Replacement in drawing.lua at line 193 [15.98]

B:BD[18.1252] → [3.458:545]

  elseif Current_drawing_mode == 'polygon' or Current_drawing_mode == 'rectangle' then

[18.1252]

[19.3709]

  elseif Current_drawing_mode == 'rectangle' then

Replacement in drawing.lua at line 273 [15.98]

B:BD[20.1231] → [19.4473:4552]

∅:D[19.4552] → [20.1301:1519]

B:BD[20.1301] → [20.1301:1519]

∅:D[20.1519] → [21.2042:2054]

B:BD[21.2042] → [21.2042:2054]

        local mx,my = Drawing.coord(x-Margin_left), Drawing.coord(y-drawing.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < drawing.h then
          table.insert(drawing.pending.vertices, Drawing.insert_point(drawing.points, mx,my))
          table.insert(drawing.shapes, drawing.pending)
        end

[20.1231]

[20.1520]

        -- TODO

Deletion in drawing.lua at line 318 [15.98]

B:BD[22.5858] → [23.1666:1721]

∅:D[23.1721] → [22.5918:5955]

∅:D[16.2683] → [22.5918:5955]

B:BD[22.5918] → [22.5918:5955]

B:BD[22.5955] → [23.1722:1771]

∅:D[23.1771] → [22.6009:6046]

∅:D[16.2735] → [22.6009:6046]

B:BD[22.6009] → [22.6009:6046]

B:BD[22.6046] → [24.16:64]

∅:D[24.64] → [22.6092:6467]

B:BD[22.6092] → [22.6092:6467]

B:BD[22.6467] → [3.546:598]

∅:D[3.598] → [25.98:131]

B:BD[25.98] → [25.98:131]

∅:D[25.131] → [22.6467:6652]

B:BD[22.6467] → [22.6467:6652]

  elseif chord == 'C-g' and not App.mouse_down(1) then
    Current_drawing_mode = 'polygon'
  elseif App.mouse_down(1) and chord == 'g' then
    Current_drawing_mode = 'polygon'
    local _,drawing = Drawing.current_drawing()
    if drawing.pending.mode == 'freehand' then
      drawing.pending.vertices = {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
      if drawing.pending.vertices == nil then
        drawing.pending.vertices = {drawing.pending.p1}
      end
    elseif drawing.pending.mode == 'rectangle' then
      -- reuse existing vertices
    elseif drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.vertices = {drawing.pending.center}
    end
    drawing.pending.mode = 'polygon'

Replacement in drawing.lua at line 329 [15.98]

B:BD[17.7020] → [17.7020:7102]

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

[17.7020]

[17.7102]

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

Deletion in drawing.lua at line 331 [15.98]
B:BD[17.7160] → [3.599:649]
∅:D[3.649] → [26.97:136]
B:BD[26.97] → [26.97:136]
```
    elseif drawing.pending.mode == 'polygon' then
      -- reuse existing (1-2) vertices
```

Deletion in drawing.lua at line 333 [15.98]

B:BD[17.7998] → [11.9421:9759]

  elseif App.mouse_down(1) and chord == 'p' and Current_drawing_mode == 'polygon' then
    local _,drawing = Drawing.current_drawing()
    local mx,my = Drawing.coord(App.mouse_x()-Margin_left), Drawing.coord(App.mouse_y()-drawing.y)
    local j = Drawing.insert_point(drawing.points, mx,my)
    table.insert(drawing.pending.vertices, j)

Replacement in drawing.lua at line 358 [15.98]

B:BD[22.8053] → [3.740:829]

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

[22.8053]

[22.8103]

    elseif drawing.pending.mode == 'polygon' then
      -- reuse center
    elseif drawing.pending.mode == 'rectangle' then

Replacement in drawing.lua at line 369 [15.98]

B:BD[22.8509] → [22.8509:8591]

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

[22.8509]

[22.8591]

    elseif drawing.pending.mode == 'rectangle' then
      drawing.pending.p1 = drawing.pending.vertices[1]
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'circle' or drawing.pending.mode == 'arc' then

Deletion in drawing.lua at line 373 [15.98]
B:BD[22.8641] → [3.830:919]
∅:D[25.257] → [22.8691:8746]
∅:D[3.919] → [22.8691:8746]
B:BD[22.8691] → [22.8691:8746]
```
    elseif drawing.pending.mode == 'polygon' or drawing.pending.mode == 'rectangle' then
      drawing.pending.p1 = drawing.pending.vertices[1]
```

Replacement in drawing.lua at line 384 [15.98]

B:BD[22.9357] → [3.920:1009]

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

[22.9357]

[22.9407]

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

Replacement in drawing.lua at line 386 [15.98]

B:BD[22.9462] → [22.9462:9544]

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

[22.9462]

[22.9544]

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

Replacement in drawing.lua at line 426 [15.98]

B:BD[22.10920] → [22.10920:11243]

          if shape.mode == 'polygon' then
            local idx = table.find(shape.vertices, i)
            assert(idx)
            table.remove(shape.vertices, idx)
            if #shape.vertices < 3 then
              shape.mode = 'deleted'
            end
          else
            shape.mode = 'deleted'
          end

[22.10920]

[22.11243]

          shape.mode = 'deleted'

Replacement in drawing.lua at line 536 [15.98]

B:BD[5.21152] → [3.1010:1077]

  elseif shape.mode == 'polygon' or shape.mode == 'rectangle' then

[5.21152]

[5.21190]

  elseif shape.mode == 'rectangle' then