akkartik/sokoban.love - Change FBDRL6LHPTBPMU3R356OLY4XE4ELQQEDXMCZGCBT2RFHLR7VQXQAC

delete points or shapes

Deleting a point deletes all shapes that use it (but not other points in those shapes).

Created by Kartik K. Agaram on May 15, 2022

FBDRL6LHPTBPMU3R356OLY4XE4ELQQEDXMCZGCBT2RFHLR7VQXQAC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 100 [7.2]

B:BD[6.237] → [3.3:34]

∅:D[3.34] → [6.277:317]

B:BD[6.277] → [6.277:317]

B:BD[6.317] → [2.3:80]

∅:D[2.80] → [6.317:370]

B:BD[6.317] → [6.317:370]

B:BD[6.370] → [2.81:158]

        if near(p, mx,my) then
          love.graphics.setColor(1,0,0)
          love.graphics.circle('line', pixels(p.x)+16,pixels(p.y)+line.y, 4)
        else
          love.graphics.setColor(0,0,0)
          love.graphics.circle('fill', pixels(p.x)+16,pixels(p.y)+line.y, 2)

[6.237]

[6.370]

        if p.deleted == nil then
          if near(p, mx,my) then
            love.graphics.setColor(1,0,0)
            love.graphics.circle('line', pixels(p.x)+16,pixels(p.y)+line.y, 4)
          else
            love.graphics.setColor(0,0,0)
            love.graphics.circle('fill', pixels(p.x)+16,pixels(p.y)+line.y, 2)
          end

Insertion in main.lua at line 289 [7.2]
[8.694]
[8.694]
```
  elseif shape.mode == 'deleted' then
```
Insertion in main.lua at line 368 [7.2]
[8.1549]
[9.3287]
```
  elseif shape.mode == 'deleted' then
```
Replacement in main.lua at line 472 [7.2]
B:BD[10.1063] → [10.1063:1092]
```
  elseif chord == 'C-d' then
```
[10.1063]
[10.1092]
```
  elseif chord == 'C-x' then
```

Replacement in main.lua at line 549 [7.2]

B:BD[11.864] → [11.864:910]

    local drawing,p = select_point_at_mouse()

[11.864]

[11.910]

    local drawing,_,p = select_point_at_mouse()

Replacement in main.lua at line 557 [7.2]

B:BD[5.471] → [5.471:517]

    local drawing,p = select_point_at_mouse()

[5.471]

[5.517]

    local drawing,_,p = select_point_at_mouse()

Insertion in main.lua at line 563 [7.2]

[11.1064]

    end
  elseif chord == 'C-d' and not love.mouse.isDown('1') then
    local drawing,i,p = select_point_at_mouse()
    if drawing then
      for _,shape in ipairs(drawing.shapes) do
        if contains_point(shape, i) then
          shape.mode = 'deleted'
        end
      end
      drawing.points[i].deleted = true
    end
    local drawing,i,shape = select_shape_at_mouse()
    if drawing then
      shape.mode = 'deleted'

Replacement in main.lua at line 613 [7.2]
∅:D[4.1408] → [9.3419:3460]
B:BD[12.433] → [9.3419:3460]
```
          if on_shape(mx,my, shape) then
```
[4.1408]
[12.507]
```
          if on_shape(mx,my, drawing, shape) then
```

Replacement in main.lua at line 628 [7.2]

B:BD[11.1475] → [11.1475:1524]

        for _,point in ipairs(drawing.points) do

[11.1475]

[11.1524]

        for i,point in ipairs(drawing.points) do

Replacement in main.lua at line 631 [7.2]

B:BD[11.1585] → [11.1585:1618]

            return drawing,point

[11.1585]

[13.448]

            return drawing,i,point

Insertion in main.lua at line 650 [7.2]

[14.1841]

[6.2255]

function contains_point(shape, p)
  if shape.mode == 'freehand' then
    -- not supported
  elseif shape.mode == 'line' then
    print(p, shape.p1, shape.p2)
    return shape.p1 == p or shape.p2 == p
  elseif shape.mode == 'polygon' then
    return table.find(shape.vertices, p)
  elseif shape.mode == 'circle' then
    return shape.center == p
  elseif shape.mode == 'arc' then
    return shape.center == p
    -- ugh, how to support angles
  elseif shape.mode == 'deleted' then
    -- already done
  else
    assert(false)
  end
end