pijul nest
guest › [sign in] [explore]

Merge upstream into main

[?]
Jul 13, 2022, 3:48 PM
2RO7JXUCFMVAELFDKZ3KNUXI5JZO4YRVUHG7CIGBI2PGMENTK27QC

Dependencies

  • [2] 7CEOB56D Merge upstream into main
  • [3] R3XGABER chunk up some long lines
  • [4] QFC3WRDZ chunking by simple local variable
  • [5] KTZQ57HV replace globals with args in a few functions
  • [6] LF7BWEG4 group all editor globals
  • [7] W7JMT5V2 rip out most support for polygons
  • [8] 27DROQW2 Merge upstream into main
  • [9] DDXXXXBR new mode for polygons
  • [10] XNFTJHC4 split keyboard handling between Text and Drawing
  • [11] GXEM6FP6 typos
  • [12] WDMPH4AN drop support for squares
  • [13] BLWAYPKV extract a module
  • [14] 4CTZOJPC stop pretending globals are local
  • [15] UHB4GARJ left/right margin -> left/right coordinates
  • [16] WTDKUACN rectangle and square shapes
  • [17] R3JZDBI2 drop heavyweight near check on file load/store
  • [18] JFFUF5AL override mouse state lookups in tests
  • [19] DLQAEAC7 add state arg to Drawing.mouse_pressed
  • [20] VHQCNMAR several more modules
  • [21] NYQ7HD4D move
  • [22] P5QNVXSN drop final mention of state global beyond main.lua

Change contents

  • resurrect zombie in help.lua at line 77
    [2.2946]→[5.222:231](∅→∅),[5.222]→[5.222:231](∅→∅),[5.222]→[5.222:231](∅→∅)
    else
  • resurrect zombie in help.lua at line 82
    [2.3220]→[5.494:502](∅→∅),[5.494]→[5.494:502](∅→∅),[5.494]→[5.494:502](∅→∅)
    end
  • replacement in drawing.lua at line 91
    [5.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)
    [5.509]
    [5.185]
    love.graphics.line(px(p1.x),py(p1.y), px(p2.x),py(p2.y))
  • replacement in drawing.lua at line 103
    [5.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)
    [5.1048]
    [5.2614]
    love.graphics.line(px(prev.x),py(prev.y), px(curr.x),py(curr.y))
  • edit in drawing.lua at line 106
    [5.2700]→[2.5034:5126](∅→∅)
    local cx,cy = Drawing.pixels(center.x, width)+left, Drawing.pixels(center.y, width)+top
  • resurrect zombie in drawing.lua at line 106
    [2.5126]→[5.2778:2818](∅→∅),[5.2778]→[5.2778:2818](∅→∅),[5.2778]→[5.2778:2818](∅→∅)
    local p1 = drawing.points[shape.p1]
  • edit in drawing.lua at line 107
    [5.2818]→[2.5127:5209](∅→∅),[2.5209]→[5.2886:2943](∅→∅),[5.2886]→[5.2886:2943](∅→∅),[5.2886]→[5.2886:2943](∅→∅),[5.2943]→[2.5211:5211](∅→∅),[5.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))
  • resolve order conflict in drawing.lua at line 107
    [5.2818]
  • edit in drawing.lua at line 107
    [0.150]
    [5.1183]
    Drawing.draw_polygon(shape.num_vertices, px(center.x),py(center.y), px(p1.x),py(p1.y))
  • edit in drawing.lua at line 153
    [5.3081]→[3.1223:1296](∅→∅),[5.3081]→[3.1223:1296](∅→∅),[5.3256]→[3.1297:1352](∅→∅),[5.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
    [5.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)
    [5.2380]
    [5.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))
  • edit in drawing.lua at line 167
    [5.3030]→[2.5951:6051](∅→∅)
    local mx,my = Drawing.coord(App.mouse_x()-left, width), Drawing.coord(App.mouse_y()-top, width)
  • resurrect zombie in drawing.lua at line 167
    [2.6051]→[5.3116:3198](∅→∅),[5.3116]→[5.3116:3198](∅→∅),[5.3116]→[5.3116:3198](∅→∅)
    if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then
    return
    end
  • edit in drawing.lua at line 170
    [5.3198]→[2.6053:6053](∅→∅),[2.6053]→[2.6054:6238](∅→∅),[5.2380]→[3.1413:1705](∅→∅),[5.2380]→[3.1413:1705](∅→∅),[5.3115]→[3.1706:1765](∅→∅),[5.3115]→[3.1706:1765](∅→∅),[5.3457]→[3.1766:2058](∅→∅),[5.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))
  • resolve order conflict in drawing.lua at line 170
    [5.3198]
  • edit in drawing.lua at line 170
    [0.537]
    [5.3372]
    Drawing.draw_polygon(State.current_drawing_submode, px(center.x),py(center.y), pmx,pmy)
  • replacement in drawing.lua at line 177
    [3.2104]→[5.2114:2201](∅→∅),[5.5163]→[5.2114:2201](∅→∅),[5.3715]→[5.2114:2201](∅→∅)
    love.graphics.circle('line', cx,cy, geom.dist(cx,cy, App.mouse_x(),App.mouse_y()))
    [3.2104]
    [5.3810]
    love.graphics.circle('line', cx,cy, geom.dist(cx,cy, pmx,pmy))
  • edit in drawing.lua at line 220
    [5.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))
  • edit in drawing.lua at line 223
    [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))
  • resurrect zombie in drawing.lua at line 223
    [5.740]→[4.286:366](∅→∅),[5.740]→[4.286:366](∅→∅)
    local j = Drawing.find_or_insert_point(drawing.points, cx, cy, State.width)
  • resolve order conflict in drawing.lua at line 223
    [2.6432]
    [4.286]
  • replacement in drawing.lua at line 226
    [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)
  • edit in drawing.lua at line 229
    [5.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))
  • edit in drawing.lua at line 717
    [5.1525]→[2.9576:9576](∅→∅),[5.509]→[3.334:395](∅→∅),[5.509]→[3.334:395](∅→∅)
    love.graphics.line(px(p1.x),py(p1.y), px(p2.x),py(p2.y))
  • resolve order conflict in drawing.lua at line 717
    [5.1525]