akkartik/lines-polygon-experiment - Change 2RO7JXUCFMVAELFDKZ3KNUXI5JZO4YRVUHG7CIGBI2PGMENTK27QC

Merge upstream into main

Created by Kartik K. Agaram on July 13, 2022

2RO7JXUCFMVAELFDKZ3KNUXI5JZO4YRVUHG7CIGBI2PGMENTK27QC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in help.lua at line 77 [6.6622]
∅:∅[2.2946] → [5.222:231]
B:B[5.222] → [5.222:231]
BD:B[5.222] → [5.222:231]
```
    else
```
Resurrecting zombie bytes in help.lua at line 82 [6.6622]
∅:∅[2.3220] → [5.494:502]
B:B[5.494] → [5.494:502]
BD:B[5.494] → [5.494:502]
```
    end
```

Replacement in drawing.lua at line 91 [9.98]

B:BD[8.509] → [2.4712:4867]

    love.graphics.line(Drawing.pixels(p1.x, width)+left,Drawing.pixels(p1.y, width)+top, Drawing.pixels(p2.x, width)+left,Drawing.pixels(p2.y, width)+top)

[8.509]

[10.185]

    love.graphics.line(px(p1.x),py(p1.y), px(p2.x),py(p2.y))

Replacement in drawing.lua at line 103 [9.98]

B:BD[8.1048] → [2.4870:5033]

    love.graphics.line(Drawing.pixels(prev.x, width)+left,Drawing.pixels(prev.y, width)+top, Drawing.pixels(curr.x, width)+left,Drawing.pixels(curr.y, width)+top)

[8.1048]

[11.2614]

    love.graphics.line(px(prev.x),py(prev.y), px(curr.x),py(curr.y))

Deletion in drawing.lua at line 106 [9.98]

B:BD[11.2700] → [2.5034:5126]

    local cx,cy = Drawing.pixels(center.x, width)+left, Drawing.pixels(center.y, width)+top

Resurrecting zombie bytes in drawing.lua at line 106 [9.98]
∅:∅[2.5126] → [11.2778:2818]
B:B[11.2778] → [11.2778:2818]
BD:B[11.2778] → [11.2778:2818]
```
    local p1 = drawing.points[shape.p1]
```
Deletion in drawing.lua at line 107 [9.98]
B:BD[11.2818] → [2.5127:5209]
∅:D[2.5209] → [11.2886:2943]
B:BD[11.2886] → [11.2886:2943]
BD:BD[11.2886] → [11.2886:2943]
B:BD[11.2943] → [2.5211:5211]
B:BD[8.1048] → [3.470:539]
```
    local x,y = Drawing.pixels(p1.x, width)+left, Drawing.pixels(p1.y, width)+top
    Drawing.draw_polygon(shape.num_vertices, cx,cy, x,y)
    love.graphics.line(px(prev.x),py(prev.y), px(curr.x),py(curr.y))
```
Solving an order conflict in drawing.lua at line 107 [9.98]
[11.2818]

Insertion in drawing.lua at line 107 [9.98]

[0.150]

[8.1183]

    Drawing.draw_polygon(shape.num_vertices, px(center.x),py(center.y), px(p1.x),py(p1.y))

Deletion in drawing.lua at line 153 [9.98]
B:BD[8.3081] → [3.1223:1296]
BD:BD[8.3081] → [3.1223:1296]
B:BD[8.3256] → [3.1297:1352]
BD:BD[8.3256] → [3.1297:1352]
```
        love.graphics.line(px(prev.x),py(prev.y), px(curr.x),py(curr.y))
    love.graphics.line(px(prev.x),py(prev.y), pmx,pmy)
```

Replacement in drawing.lua at line 161 [9.98]

B:BD[13.2380] → [2.5282:5950]

    love.graphics.line(Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top, Drawing.pixels(second.x, width)+left,Drawing.pixels(second.y, width)+top)
    love.graphics.line(Drawing.pixels(second.x, width)+left,Drawing.pixels(second.y, width)+top, Drawing.pixels(thirdx, width)+left,Drawing.pixels(thirdy, width)+top)
    love.graphics.line(Drawing.pixels(thirdx, width)+left,Drawing.pixels(thirdy, width)+top, Drawing.pixels(fourthx, width)+left,Drawing.pixels(fourthy, width)+top)
    love.graphics.line(Drawing.pixels(fourthx, width)+left,Drawing.pixels(fourthy, width)+top, Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top)

[13.2380]

[11.2944]

    love.graphics.line(px(first.x),py(first.y), px(second.x),py(second.y))
    love.graphics.line(px(second.x),py(second.y), px(thirdx),py(thirdy))
    love.graphics.line(px(thirdx),py(thirdy), px(fourthx),py(fourthy))
    love.graphics.line(px(fourthx),py(fourthy), px(first.x),py(first.y))

Deletion in drawing.lua at line 167 [9.98]

B:BD[11.3030] → [2.5951:6051]

    local mx,my = Drawing.coord(App.mouse_x()-left, width), Drawing.coord(App.mouse_y()-top, width)

Resurrecting zombie bytes in drawing.lua at line 167 [9.98]
∅:∅[2.6051] → [11.3116:3198]
B:B[11.3116] → [11.3116:3198]
BD:B[11.3116] → [11.3116:3198]
```
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
      return
    end
```

Deletion in drawing.lua at line 170 [9.98]

B:BD[11.3198] → [2.6053:6053]

B:BD[2.6053] → [2.6054:6238]

B:BD[13.2380] → [3.1413:1705]

BD:BD[13.2380] → [3.1413:1705]

B:BD[13.3115] → [3.1706:1765]

BD:BD[13.3115] → [3.1706:1765]

B:BD[13.3457] → [3.1766:2058]

BD:BD[13.3457] → [3.1766:2058]

    local cx,cy = Drawing.pixels(center.x, width)+left, Drawing.pixels(center.y, width)+top
    Drawing.draw_polygon(State.current_drawing_submode, cx,cy, App.mouse_x(),App.mouse_y())
    love.graphics.line(px(first.x),py(first.y), px(second.x),py(second.y))
    love.graphics.line(px(second.x),py(second.y), px(thirdx),py(thirdy))
    love.graphics.line(px(thirdx),py(thirdy), px(fourthx),py(fourthy))
    love.graphics.line(px(fourthx),py(fourthy), px(first.x),py(first.y))
      love.graphics.line(px(first.x),py(first.y), pmx,pmy)
    love.graphics.line(px(first.x),py(first.y), px(second.x),py(second.y))
    love.graphics.line(px(second.x),py(second.y), px(thirdx),py(thirdy))
    love.graphics.line(px(thirdx),py(thirdy), px(fourthx),py(fourthy))
    love.graphics.line(px(fourthx),py(fourthy), px(first.x),py(first.y))

Solving an order conflict in drawing.lua at line 170 [9.98]
[11.3198]

Insertion in drawing.lua at line 170 [9.98]

[0.537]

[8.3372]

    Drawing.draw_polygon(State.current_drawing_submode, px(center.x),py(center.y), pmx,pmy)

Replacement in drawing.lua at line 177 [9.98]

∅:D[3.2104] → [15.2114:2201]

∅:D[12.5163] → [15.2114:2201]

B:BD[8.3715] → [15.2114:2201]

    love.graphics.circle('line', cx,cy, geom.dist(cx,cy, App.mouse_x(),App.mouse_y()))

[3.2104]

[8.3810]

    love.graphics.circle('line', cx,cy, geom.dist(cx,cy, pmx,pmy))

Deletion in drawing.lua at line 220 [9.98]

B:BD[16.422] → [2.6241:6375]

    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width))

Deletion in drawing.lua at line 223 [9.98]

B:BD[2.6432] → [2.6432:6566]

    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width))

Resurrecting zombie bytes in drawing.lua at line 223 [9.98]
B:B[16.740] → [4.286:366]
BD:B[16.740] → [4.286:366]
```
    local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)
```
Solving an order conflict in drawing.lua at line 223 [9.98]
[2.6432]
[4.286]

Replacement in drawing.lua at line 226 [9.98]

B:BD[2.6621] → [2.6621:6755]

    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width))

[2.6621]

[2.6755]

    local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)

Deletion in drawing.lua at line 229 [9.98]

B:BD[16.978] → [2.6866:7000]

    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width))

Deletion in drawing.lua at line 717 [9.98]
B:BD[9.1525] → [2.9576:9576]
B:BD[8.509] → [3.334:395]
BD:BD[8.509] → [3.334:395]
```
    love.graphics.line(px(p1.x),py(p1.y), px(p2.x),py(p2.y))
```
Solving an order conflict in drawing.lua at line 717 [9.98]
[9.1525]

Merge upstream into main

Dependencies

In channels

Change contents

Resurrecting zombie bytes in help.lua at line 77 [6.6622]

Resurrecting zombie bytes in help.lua at line 82 [6.6622]

Replacement in drawing.lua at line 91 [9.98]

Replacement in drawing.lua at line 103 [9.98]

Deletion in drawing.lua at line 106 [9.98]

Resurrecting zombie bytes in drawing.lua at line 106 [9.98]

Deletion in drawing.lua at line 107 [9.98]

Solving an order conflict in drawing.lua at line 107 [9.98]

Insertion in drawing.lua at line 107 [9.98]

Deletion in drawing.lua at line 153 [9.98]

Replacement in drawing.lua at line 161 [9.98]

Deletion in drawing.lua at line 167 [9.98]

Resurrecting zombie bytes in drawing.lua at line 167 [9.98]

Deletion in drawing.lua at line 170 [9.98]

Solving an order conflict in drawing.lua at line 170 [9.98]

Insertion in drawing.lua at line 170 [9.98]

Replacement in drawing.lua at line 177 [9.98]

Deletion in drawing.lua at line 220 [9.98]

Deletion in drawing.lua at line 223 [9.98]

Resurrecting zombie bytes in drawing.lua at line 223 [9.98]

Solving an order conflict in drawing.lua at line 223 [9.98]

Replacement in drawing.lua at line 226 [9.98]

Deletion in drawing.lua at line 229 [9.98]

Deletion in drawing.lua at line 717 [9.98]

Solving an order conflict in drawing.lua at line 717 [9.98]