Merge lines.love

[?]

May 30, 2023, 7:15 AM

JDZVBFEIBB5JVB7PJJMKFO4Z52NCEKFFFQ4B4QECCBRPEJ4EPGDQC

Dependencies

[2] ZLJYLPOT Merge lines.love
[3] KKHSOUW4 bugfix: drawings in source editor
[4] ORKN6EOB Merge lines.love
[5] A4BSGS2C Merge lines.love
[6] RSZD5A7G forgot to add json.lua
[7] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[8] VXORMHME delete experimental REPL
[9] 73OCE2MC after much struggle, a brute-force undo
[10] OGUV4HSA remove some memory leaks from rendered fragments
[11] 2JBAEQHU Merge lines.love
[12] 2344TV56 Merge lines.love
[13] 4SR3Z4Y3 document the version of LÖVE I've been using
[14] 2XLZCWZC bugfix: rectangles and squares are now saved
[15] K2X6G75Z start writing some tests for drawings
[16] 66X36NZN a little more prose describing manual_tests
[17] 2CTN2IEF Merge lines.love
[18] UN7L3DNN avoid some string concatenations
[19] T4FRZSYL delete an ancient, unused file
[20] 3PSFWAIL Merge lines.love
[21] K74U4BAU Merge lines.love
[22] N2NUGNN4 include a brief reference enabling many useful apps
[23] RAXUQQ6Z Merge lines.love
[24] TVCPXAAU rename
[25] VHQCNMAR several more modules
[26] 4YDBYBA4 clean up memory leak experiments
[27] 2K2YDMFH ignore 'deleted' shapes when saving to disk
[28] VP5KC4XZ Merge lines.love
[29] KMSL74GA support selections in the source editor
[30] KKMFQDR4 editing source code from within the app
[31] 2L5MEZV3 experiment: new edit namespace
[32] 6LJZN727 handle chords
[33] D2GCFTTT clean up repl functionality
[34] 3QNOKBFM beginnings of a test harness
[35] TLOAPLBJ add a license
[36] AVTNUQYR basic test-enabled framework
[37] JOPVPUSA editing source code from within the app
[38] R5QXEHUI somebody stop me
[39] XX7G2FFJ intermingle freehand line drawings with text
[40] FS2ITYYH record a known issue
[41] BLWAYPKV extract a module
[42] CE4LZV4T drop last couple of manual tests
[43] ZTZOO2OQ Merge lines.love
[44] BULPIBEG beginnings of a module for the text editor
[45] MD3W5IRA new fork: rip out drawing support
[46] LXTTOB33 extract a couple of files
[47] VHUNJHXB Merge lines.love
[48] OTIBCAUJ love2d scaffold
[49] OI4FPFIN support drawings in the source editor
[*] QYIFOHW3 first test!

Change contents

file deletion: source_file.lua (----------)source_file.lua (----------)

[4.2]→[4.152399:152438](∅→∅),[4.2]→[4.152399:152438](∅→∅),[4.152438]→[4.150241:150241](∅→∅)

outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}))
outfile:write('\n')
elseif shape.mode == 'deleted' then
-- ignore
else
print(shape.mode)
assert(false)
end
end
outfile:write('```\n')
outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}))
outfile:write('\n')
elseif shape.mode == 'arc' then
outfile:write(line)
outfile:write('\n')
elseif shape.mode == 'circle' then
outfile:write(line)
outfile:write('\n')
elseif shape.mode == 'polygon' or shape.mode == 'rectangle' or shape.mode == 'square' then
local obj = {mode=shape.mode, vertices={}}
for _,p in ipairs(shape.vertices) do
table.insert(obj.vertices, drawing.points[p])
end
local line = json.encode(obj)
outfile:write(json.encode(shape))
outfile:write('\n')
elseif shape.mode == 'line' or shape.mode == 'manhattan' then
local line = json.encode({mode=shape.mode, p1=drawing.points[shape.p1], p2=drawing.points[shape.p2]})
replacement in source_file.lua at line 96

[4.13023]→[4.13023:13069](∅→∅)

outfile:write(json.encode(shape), '\n')

[4.13023]

[4.13069]

outfile:write(json.encode(shape))
outfile:write('\n')
replacement in source_file.lua at line 100

[4.13243]→[4.13243:13275](∅→∅)

outfile:write(line, '\n')

[4.13243]

[4.13275]

outfile:write(line)
outfile:write('\n')
replacement in source_file.lua at line 108

[4.13562]→[4.13562:13594](∅→∅)

outfile:write(line, '\n')

[4.13562]

[4.13594]

outfile:write(line)
outfile:write('\n')
replacement in source_file.lua at line 111

[4.13633]→[4.13633:13749](∅→∅)

outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}), '\n')

[4.13633]

[4.13749]

outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}))
outfile:write('\n')
replacement in source_file.lua at line 114

[4.13785]→[4.13785:13959](∅→∅)

outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}), '\n')

[4.13785]

[4.13959]

outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}))
outfile:write('\n')
edit in file.lua at line 60

[4.17287]→[3.531:597](∅→∅),[4.17287]→[3.531:597](∅→∅),[4.17507]→[3.598:650](∅→∅),[4.17507]→[3.598:650](∅→∅),[4.17771]→[3.651:703](∅→∅),[4.17771]→[3.651:703](∅→∅),[4.17842]→[3.704:840](∅→∅),[4.17842]→[3.704:840](∅→∅),[4.17994]→[3.841:1035](∅→∅),[4.17994]→[3.841:1035](∅→∅)

outfile:write(json.encode(shape))
outfile:write('\n')
outfile:write(line)
outfile:write('\n')
outfile:write(line)
outfile:write('\n')
outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}))
outfile:write('\n')
outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}))
outfile:write('\n')
resolve order conflict in file.lua at line 60

[51.1910]

[4.18207]