akkartik/lines-polygon-experiment - Change WDMPH4ANFQ4YDIBCKDE5ZSRRNIJFBR5W5CH4VYYFKWS5Q63KHLFAC

drop support for squares

They're a regular polygon, so we'll switch to the new feature for them.

Created by Kartik K. Agaram on June 15, 2022

WDMPH4ANFQ4YDIBCKDE5ZSRRNIJFBR5W5CH4VYYFKWS5Q63KHLFAC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 34 [11.2]

B:BD[10.405] → [10.405:471]

--    an array vertices for mode 'polygon', 'rectangle', 'square'

[10.405]

[10.471]

--    an array vertices for mode 'rectangle'

Insertion in main.lua at line 37 [11.2]

[2.41]

--    center, p1, num_vertices for mode 'polygon'

Deletion in icons.lua at line 50 [12.5323]

B:BD[12.6510] → [13.206:402]

function icon.square(x, y)
  love.graphics.line(x+6,y+6, x+6,y+16)
  love.graphics.line(x+6,y+16, x+16,y+16)
  love.graphics.line(x+16,y+16, x+16,y+6)
  love.graphics.line(x+16,y+6, x+6,y+6)
end

Replacement in geom.lua at line 28 [12.11579]

∅:D[5.518] → [13.1041:1134]

B:BD[12.11923] → [13.1041:1134]

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

[5.518]

[12.11961]

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

Replacement in file.lua at line 60 [12.15083]

∅:D[14.1350] → [15.139:234]

B:BD[12.16742] → [15.139:234]

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

[14.1350]

[12.16782]

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

Replacement in file.lua at line 89 [12.15083]

∅:D[7.131] → [15.289:384]

B:BD[12.17539] → [15.289:384]

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

[7.131]

[12.17579]

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

Replacement in file.lua at line 153 [12.15083]

B:BD[16.2610] → [16.2610:2705]

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

[16.2610]

[16.2705]

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

Deletion in drawing_tests.lua at line 308 [18.15]

B:BD[17.7101] → [17.7101:9419]

B:BD[17.9419] → [9.148:149]

function test_draw_square()
  io.write('\ntest_draw_square')
  -- 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_square/baseline/drawing_mode')
  check_eq(#Lines, 2, 'F - test_draw_square/baseline/#lines')
  check_eq(Lines[1].mode, 'drawing', 'F - test_draw_square/baseline/mode')
  check_eq(Lines[1].y, Margin_top+Drawing_padding_top, 'F - test_draw_square/baseline/y')
  check_eq(Lines[1].h, 128, 'F - test_draw_square/baseline/y')
  check_eq(#Lines[1].shapes, 0, 'F - test_draw_square/baseline/#shapes')
  -- first point
  App.run_after_mouse_press(Margin_left+35, Margin_top+Drawing_padding_top+36, 1)
  App.run_after_keychord('s')  -- square mode
  -- second point/first edge
  App.mouse_move(Margin_left+42, Margin_top+Drawing_padding_top+45)
  App.run_after_keychord('p')
  -- override second point/first edge
  App.mouse_move(Margin_left+65, Margin_top+Drawing_padding_top+66)
  App.run_after_keychord('p')
  -- release (decides which side of first edge to draw square on)
  App.run_after_mouse_release(Margin_left+15, Margin_top+Drawing_padding_top+26, 1)
  local drawing = Lines[1]
  check_eq(#drawing.shapes, 1, 'F - test_draw_square/#shapes')
  check_eq(#drawing.points, 5, 'F - test_draw_square/#points')  -- currently includes every point added
  check_eq(drawing.shapes[1].mode, 'square', 'F - test_draw_square/shape_mode')
  check_eq(#drawing.shapes[1].vertices, 4, 'F - test_draw_square/vertices')
  local p = drawing.points[drawing.shapes[1].vertices[1]]
  check_eq(p.x, 35, 'F - test_draw_square/p1:x')
  check_eq(p.y, 36, 'F - test_draw_square/p1:y')
  local p = drawing.points[drawing.shapes[1].vertices[2]]
  check_eq(p.x, 65, 'F - test_draw_square/p2:x')
  check_eq(p.y, 66, 'F - test_draw_square/p2:y')
  local p = drawing.points[drawing.shapes[1].vertices[3]]
  check_eq(p.x, 35, 'F - test_draw_square/p3:x')
  check_eq(p.y, 96, 'F - test_draw_square/p3:y')
  local p = drawing.points[drawing.shapes[1].vertices[4]]
  check_eq(p.x, 5, 'F - test_draw_square/p4:x')
  check_eq(p.y, 66, 'F - test_draw_square/p4:y')
end

Replacement in drawing.lua at line 87 [20.98]

B:BD[19.636] → [13.1653:1746]

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

[19.636]

[19.674]

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

Deletion in drawing.lua at line 163 [20.98]

B:BD[13.2936] → [13.2936:2973]

B:BD[13.2973] → [21.1977:2026]

∅:D[21.2026] → [13.3030:4013]

B:BD[13.3030] → [13.3030:4013]

  elseif shape.mode == 'square' then
    local pmx,pmy = App.mouse_x(), App.mouse_y()
    local first = drawing.points[shape.vertices[1]]
    if #shape.vertices == 1 then
      love.graphics.line(Drawing.pixels(first.x)+left,Drawing.pixels(first.y)+top, pmx,pmy)
      return
    end
    local second = drawing.points[shape.vertices[2]]
    local mx,my = Drawing.coord(pmx-left), Drawing.coord(pmy-top)
    local thirdx,thirdy, fourthx,fourthy = Drawing.complete_square(first.x,first.y, second.x,second.y, mx,my)
    love.graphics.line(Drawing.pixels(first.x)+left,Drawing.pixels(first.y)+top, Drawing.pixels(second.x)+left,Drawing.pixels(second.y)+top)
    love.graphics.line(Drawing.pixels(second.x)+left,Drawing.pixels(second.y)+top, Drawing.pixels(thirdx)+left,Drawing.pixels(thirdy)+top)
    love.graphics.line(Drawing.pixels(thirdx)+left,Drawing.pixels(thirdy)+top, Drawing.pixels(fourthx)+left,Drawing.pixels(fourthy)+top)
    love.graphics.line(Drawing.pixels(fourthx)+left,Drawing.pixels(fourthy)+top, Drawing.pixels(first.x)+left,Drawing.pixels(first.y)+top)

Replacement in drawing.lua at line 202 [20.98]

B:BD[22.1252] → [13.4062:4185]

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

[22.1252]

[8.3709]

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

Deletion in drawing.lua at line 301 [20.98]

B:BD[13.5388] → [13.5388:5400]

B:BD[13.5400] → [23.2221:2366]

B:BD[23.2366] → [8.4635:4716]

∅:D[8.4716] → [23.2438:2649]

B:BD[23.2438] → [23.2438:2649]

∅:D[23.2649] → [13.5882:6000]

B:BD[13.5882] → [13.5882:6000]

B:BD[13.6000] → [23.2650:2918]

∅:D[23.2918] → [13.6304:6318]

B:BD[13.6304] → [13.6304:6318]

        end
      elseif drawing.pending.mode == 'square' then
        assert(#drawing.pending.vertices <= 2)
        if #drawing.pending.vertices == 2 then
          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
            local first = drawing.points[drawing.pending.vertices[1]]
            local second = drawing.points[drawing.pending.vertices[2]]
            local thirdx,thirdy, fourthx,fourthy = Drawing.complete_square(first.x,first.y, second.x,second.y, mx,my)
            table.insert(drawing.pending.vertices, Drawing.insert_point(drawing.points, thirdx,thirdy))
            table.insert(drawing.pending.vertices, Drawing.insert_point(drawing.points, fourthx,fourthy))
            table.insert(drawing.shapes, drawing.pending)
          end

Replacement in drawing.lua at line 342 [20.98]

B:BD[24.6467] → [3.10:98]

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

[24.6467]

[3.98]

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

Replacement in drawing.lua at line 361 [20.98]

B:BD[13.7160] → [4.11:97]

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

[13.7160]

[4.97]

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

Deletion in drawing.lua at line 365 [20.98]

B:BD[13.7207] → [25.1878:1933]

∅:D[25.1933] → [13.7267:7303]

∅:D[21.2903] → [13.7267:7303]

B:BD[13.7267] → [13.7267:7303]

B:BD[13.7303] → [25.1934:1983]

∅:D[25.1983] → [13.7357:7393]

∅:D[21.2955] → [13.7357:7393]

B:BD[13.7357] → [13.7357:7393]

B:BD[13.7393] → [26.114:162]

∅:D[26.162] → [13.7439:7954]

B:BD[13.7439] → [13.7439:7954]

B:BD[13.7954] → [4.137:380]

∅:D[4.380] → [13.7954:7998]

B:BD[13.7954] → [13.7954:7998]

  elseif chord == 'C-s' and not App.mouse_down(1) then
    Current_drawing_mode = 'square'
  elseif App.mouse_down(1) and chord == 's' then
    Current_drawing_mode = 'square'
    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 == 'circle' or drawing.pending.mode == 'arc' then
      drawing.pending.vertices = {drawing.pending.center}
    elseif drawing.pending.mode == 'rectangle' then
      -- reuse existing (1-2) vertices
    elseif drawing.pending.mode == 'polygon' then
      while #drawing.pending.vertices > 2 do
        table.remove(drawing.pending.vertices)
      end
    end
    drawing.pending.mode = 'square'

Replacement in drawing.lua at line 370 [20.98]

B:BD[17.9759] → [17.9759:9886]

  elseif App.mouse_down(1) and chord == 'p' and (Current_drawing_mode == 'rectangle' or Current_drawing_mode == 'square') then

[17.9759]

[26.163]

  elseif App.mouse_down(1) and chord == 'p' and Current_drawing_mode == 'rectangle' then

Replacement in drawing.lua at line 395 [20.98]

B:BD[24.8053] → [4.381:506]

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

[24.8053]

[24.8103]

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

Replacement in drawing.lua at line 406 [20.98]

B:BD[24.8641] → [3.132:257]

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

[24.8641]

[24.8691]

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

Replacement in drawing.lua at line 419 [20.98]

B:BD[24.9357] → [4.507:632]

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

[24.9357]

[24.9407]

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

Deletion in drawing.lua at line 515 [20.98]

B:BD[13.10081] → [13.10081:10586]

∅:D[13.10586] → [24.11786:11792]

B:BD[24.11786] → [24.11786:11792]

B:BD[24.11792] → [13.10587:10651]

  return thirdx,thirdy, fourthx,fourthy
end
function Drawing.complete_square(firstx,firsty, secondx,secondy, x,y)
  -- use x,y only to decide which side of the first edge to complete the square on
  local deltax = secondx-firstx
  local deltay = secondy-firsty
  local thirdx = secondx+deltay
  local thirdy = secondy-deltax
  if not geom.same_side(firstx,firsty, secondx,secondy, thirdx,thirdy, x,y) then
    deltax = -deltax
    deltay = -deltay
    thirdx = secondx+deltay
    thirdy = secondy-deltax
  end
  local fourthx = firstx+deltay
  local fourthy = firsty-deltax

Replacement in drawing.lua at line 580 [20.98]

B:BD[12.21152] → [6.11:104]

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

[12.21152]

[12.21190]

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