{"header":{"message":"move","description":null,"timestamp":"2022-05-18T14:21:50Z","authors":[{"email":"vc@akkartik.com","name":"Kartik K. Agaram"}]},"hash":"NYQ7HD4D5L44UORK52TH7CAEXYN5CE4ZUVLCWMY6XXPYHXVBTGHAC","authors":[],"deps":{"hashes":[["NYQ7HD4D5L44UORK52TH7CAEXYN5CE4ZUVLCWMY6XXPYHXVBTGHAC","move"],["AA",null],["XNFTJHC4QSHNSIWNN7K6QZEZ37GTQYKHS4EPNSVPQCUSWREROGIQC","split keyboard handling between Text and Drawing"],["HYEAFRZ2UEKDYTAE2GDQLHEJBPQASP2NDLMXB7F6MTVK2BKOXKEAC","split mouse_pressed events between Text and Drawing"],["3RGHOJ25MCTQ5CRQADFIVJ53QZWRSIQOFGXLFGKQ765QABJ5S54AC","DRY some code"],["BLWAYPKV3MLDZ4ALXLUJ25AIR6PCIL4RFYNRYLB26GFVC2KQBYBAC","extract a module"],["VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","several more modules"]],"deps":["XNFTJHC4QSHNSIWNN7K6QZEZ37GTQYKHS4EPNSVPQCUSWREROGIQC","HYEAFRZ2UEKDYTAE2GDQLHEJBPQASP2NDLMXB7F6MTVK2BKOXKEAC"],"known":["BLWAYPKV3MLDZ4ALXLUJ25AIR6PCIL4RFYNRYLB26GFVC2KQBYBAC","VHQCNMARPMNBSIUFLJG7HVK4QGDNPCGNVFLHS3I4IGNVSV5MRLYQC","3RGHOJ25MCTQ5CRQADFIVJ53QZWRSIQOFGXLFGKQ765QABJ5S54AC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":98},"path":"drawing.lua","line":50,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":19072}],"down_context":[{"change":3,"pos":641}],"flag":"BLOCK","start":10,"end":4358,"inode":{"change":4,"pos":98}}},"contents":[{"Add":"end"},{"Add":""},{"Add":"function Drawing.draw_shape(left,top, drawing, shape)"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" local prev = nil"},{"Add":" for _,point in ipairs(shape.points) do"},{"Add":" if prev then"},{"Add":" love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(point.x)+left,Drawing.pixels(point.y)+top)"},{"Add":" end"},{"Add":" prev = point"},{"Add":" end"},{"Add":" elseif shape.mode == 'line' or shape.mode == 'manhattan' then"},{"Add":" local p1 = drawing.points[shape.p1]"},{"Add":" local p2 = drawing.points[shape.p2]"},{"Add":" love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(p2.x)+left,Drawing.pixels(p2.y)+top)"},{"Add":" elseif shape.mode == 'polygon' then"},{"Add":" local prev = nil"},{"Add":" for _,point in ipairs(shape.vertices) do"},{"Add":" local curr = drawing.points[point]"},{"Add":" if prev then"},{"Add":" love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)"},{"Add":" end"},{"Add":" prev = curr"},{"Add":" end"},{"Add":" -- close the loop"},{"Add":" local curr = drawing.points[shape.vertices[1]]"},{"Add":" love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)"},{"Add":" elseif shape.mode == 'circle' then"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" love.graphics.circle('line', Drawing.pixels(center.x)+left,Drawing.pixels(center.y)+top, Drawing.pixels(shape.radius))"},{"Add":" elseif shape.mode == 'arc' then"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" love.graphics.arc('line', 'open', Drawing.pixels(center.x)+left,Drawing.pixels(center.y)+top, Drawing.pixels(shape.radius), shape.start_angle, shape.end_angle, 360)"},{"Add":" elseif shape.mode == 'deleted' then"},{"Add":" else"},{"Add":" print(shape.mode)"},{"Add":" assert(false)"},{"Add":" end"},{"Add":"end"},{"Add":""},{"Add":"function Drawing.draw_pending_shape(left,top, drawing)"},{"Add":" local shape = drawing.pending"},{"Add":" if shape.mode == 'freehand' then"},{"Add":" Drawing.draw_shape(left,top, drawing, shape)"},{"Add":" elseif shape.mode == 'line' then"},{"Add":" local p1 = drawing.points[shape.p1]"},{"Add":" local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)"},{"Add":" if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then"},{"Add":" return"},{"Add":" end"},{"Add":" love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(mx)+left,Drawing.pixels(my)+top)"},{"Add":" elseif shape.mode == 'manhattan' then"},{"Add":" local p1 = drawing.points[shape.p1]"},{"Add":" local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)"},{"Add":" if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then"},{"Add":" return"},{"Add":" end"},{"Add":" if math.abs(mx-p1.x) > math.abs(my-p1.y) then"},{"Add":" love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(mx)+left,Drawing.pixels(p1.y)+top)"},{"Add":" else"},{"Add":" love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(p1.x)+left,Drawing.pixels(my)+top)"},{"Add":" end"},{"Add":" elseif shape.mode == 'polygon' then"},{"Add":" -- don't close the loop on a pending polygon"},{"Add":" local prev = nil"},{"Add":" for _,point in ipairs(shape.vertices) do"},{"Add":" local curr = drawing.points[point]"},{"Add":" if prev then"},{"Add":" love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)"},{"Add":" end"},{"Add":" prev = curr"},{"Add":" end"},{"Add":" love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, love.mouse.getX(),love.mouse.getY())"},{"Add":" elseif shape.mode == 'circle' then"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)"},{"Add":" if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then"},{"Add":" return"},{"Add":" end"},{"Add":" local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top"},{"Add":" love.graphics.circle('line', cx,cy, geom.dist(cx,cy, love.mouse.getX(),love.mouse.getY()))"},{"Add":" elseif shape.mode == 'arc' then"},{"Add":" local center = drawing.points[shape.center]"},{"Add":" local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)"},{"Add":" if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then"},{"Add":" return"},{"Add":" end"},{"Add":" shape.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, shape.end_angle)"},{"Add":" local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top"},{"Add":" love.graphics.arc('line', 'open', cx,cy, Drawing.pixels(shape.radius), shape.start_angle, shape.end_angle, 360)"},{"Add":" end"}]}},{"Edit":{"inode":{"change":4,"pos":98},"path":"drawing.lua","line":143,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":646}],"down_context":[{"change":3,"pos":646}],"flag":"BLOCK","start":4359,"end":4360,"inode":{"change":4,"pos":98}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":98},"path":"drawing.lua","line":532,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":23113},"to":{"change":4,"start":23113,"end":24958},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":24958},"to":{"change":2,"start":11798,"end":11847},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":11847},"to":{"change":4,"start":24999,"end":26805},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":24999},"to":{"change":4,"start":24999,"end":26805},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":26805},"to":{"change":2,"start":11848,"end":11943},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":11943},"to":{"change":4,"start":26900,"end":27453},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":26900},"to":{"change":4,"start":26900,"end":27453},"introduced_by":4}],"inode":{"change":4,"pos":98}}},"contents":[{"Del":"function Drawing.draw_shape(left,top, drawing, shape)\n if shape.mode == 'freehand' then\n local prev = nil\n for _,point in ipairs(shape.points) do\n if prev then\n love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(point.x)+left,Drawing.pixels(point.y)+top)\n end\n prev = point\n end\n elseif shape.mode == 'line' or shape.mode == 'manhattan' then\n local p1 = drawing.points[shape.p1]\n local p2 = drawing.points[shape.p2]\n love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(p2.x)+left,Drawing.pixels(p2.y)+top)\n elseif shape.mode == 'polygon' then\n local prev = nil\n for _,point in ipairs(shape.vertices) do\n local curr = drawing.points[point]\n if prev then\n love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)\n end\n prev = curr\n end\n -- close the loop\n local curr = drawing.points[shape.vertices[1]]\n love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)\n elseif shape.mode == 'circle' then\n local center = drawing.points[shape.center]\n love.graphics.circle('line', Drawing.pixels(center.x)+left,Drawing.pixels(center.y)+top, Drawing.pixels(shape.radius))\n elseif shape.mode == 'arc' then\n local center = drawing.points[shape.center]\n love.graphics.arc('line', 'open', Drawing.pixels(center.x)+left,Drawing.pixels(center.y)+top, Drawing.pixels(shape.radius), shape.start_angle, shape.end_angle, 360)\n elseif shape.mode == 'deleted' then\n else\n print(shape.mode)\n assert(false)\n end\nend\n\nfunction Drawing.draw_pending_shape(left,top, drawing)\n local shape = drawing.pending\n if shape.mode == 'freehand' then\n"},{"Del":" Drawing.draw_shape(left,top, drawing, shape)\n"},{"Del":" elseif shape.mode == 'line' then\n local p1 = drawing.points[shape.p1]\n local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)\n if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then\n return\n end\n love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(mx)+left,Drawing.pixels(my)+top)\n elseif shape.mode == 'manhattan' then\n local p1 = drawing.points[shape.p1]\n local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)\n if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then\n return\n end\n if math.abs(mx-p1.x) > math.abs(my-p1.y) then\n love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(mx)+left,Drawing.pixels(p1.y)+top)\n else\n love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(p1.x)+left,Drawing.pixels(my)+top)\n end\n elseif shape.mode == 'polygon' then\n -- don't close the loop on a pending polygon\n local prev = nil\n for _,point in ipairs(shape.vertices) do\n local curr = drawing.points[point]\n if prev then\n love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)\n end\n prev = curr\n end\n love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, love.mouse.getX(),love.mouse.getY())\n elseif shape.mode == 'circle' then\n local center = drawing.points[shape.center]\n local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)\n if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then\n return\n end\n local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top\n"},{"Del":" love.graphics.circle('line', cx,cy, geom.dist(cx,cy, love.mouse.getX(),love.mouse.getY()))\n"},{"Del":" elseif shape.mode == 'arc' then\n local center = drawing.points[shape.center]\n local mx,my = Drawing.coord(love.mouse.getX()-16), Drawing.coord(love.mouse.getY()-drawing.y)\n if mx < 0 or mx >= 256 or my < 0 or my >= drawing.h then\n return\n end\n shape.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, shape.end_angle)\n local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+top\n love.graphics.arc('line', 'open', cx,cy, Drawing.pixels(shape.radius), shape.start_angle, shape.end_angle, 360)\n end\nend\n\n"}]}}],"owner":"akkartik","repo":"sum-grid.love","token":"qGFYQtft314KYN02UuvrxvxD2AyXH8UsJclCyMTyV+0=","login":null}

…

Dependencies

Change contents