replace globals with args in a few functions
[?]
Jul 13, 2022, 4:58 AM
KTZQ57HVZU4XGWRPXBA27G4GXZFV74YYKJRXCJCE7UKDS7NGJVBACDependencies
- [2]
65HNIAOSmake freehand drawings smoother - [3]
R3JZDBI2drop heavyweight near check on file load/store - [4]
2Y5GGGJ4correct a mis-named threshold - [5]
NVSWVPW5move - [6]
HOSPP2ANcrisp font rendering - [7]
PJEQCTBLadd state arg to Drawing.update - [8]
C45WCXJ2keep drawings within the line width slider as well - [9]
OMTGHWMAyet another bugfix. But for how long? - [10]
QXVD2RIFadd state arg to Drawing.mouse_released - [11]
M6TH7VSZrip out notion of Line_width - [12]
HYEAFRZ2split mouse_pressed events between Text and Drawing - [13]
DLQAEAC7add state arg to Drawing.mouse_pressed - [14]
KZ5GAYRPthis fixes the immediate regression - [15]
KEPVDTCG. - [16]
LUNH47XXmake text and drawings the same width - [17]
KOYAJWE4extract a couple more methods - [18]
C6QTJYA4keep online help inside of drawing - [19]
OWK3U6VDtests for drawing polygons - [20]
SRVDX4I5local var - [21]
ZZ2B5RPQextract variables for drawing padding - [22]
3OKKTUT4up and down arrow now moving by screen line where possible - [23]
YCDYGEZUinclude drawing index in a few places - [24]
VHQCNMARseveral more modules - [25]
3RGHOJ25DRY some code - [26]
YJGADSGKdelete unused arg - [27]
JFFUF5ALoverride mouse state lookups in tests - [28]
P4376EXKadd state arg to few functions - [29]
Z5HLXU4Padd state arg to a few functions - [30]
F63Q4OV7several bugfixes - [31]
PTT4K4EUuse the provided args everywhere - [32]
BYG5CEMVsupport for naming points - [33]
BLWAYPKVextract a module - [34]
K2X6G75Zstart writing some tests for drawings - [35]
2L5MEZV3experiment: new edit namespace - [36]
LNUHQOGHstart passing in Editor_state explicitly - [37]
QCPXQ2E3add state arg to a few functions - [38]
5DOTWNVMright margin - [39]
UHB4GARJleft/right margin -> left/right coordinates - [40]
242L3OQXbugfix: ensure Cursor_line is always on a text line - [41]
6DE7RBZ6move mouse_released events to Drawing - [42]
XRLJDW3Wcasting about for more helpers to extract.. - [43]
23MA4T3Gadd state arg to Drawing.keychord_pressed - [44]
GSPXUEQO. - [45]
7JH2ZT3Fadd state arg to Drawing.draw - [46]
RT6EV6OPdelegate update events to drawings - [47]
4KC7I3E2make colors easier to edit - [48]
LAW2O3NWextract variable Margin_left - [49]
WTDKUACNrectangle and square shapes - [50]
LF7BWEG4group all editor globals - [51]
DLQMM265scroll past first page - [52]
AH744RFRshow when we're naming a point - [53]
7DPPMI2Uanother integer coordinate - [54]
NYQ7HD4Dmove - [55]
DRFE3B3Zmouse buttons are integers, not strings - [56]
3HVBAZPAadd state arg to a few functions - [57]
XNFTJHC4split keyboard handling between Text and Drawing - [*]
BULPIBEGbeginnings of a module for the text editor
Change contents
- replacement in text.lua at line 366
y = y - State.drawing_padding_height - Drawing.pixels(State.lines[State.screen_top1.line].h)y = y - State.drawing_padding_height - Drawing.pixels(State.lines[State.screen_top1.line].h, State.width) - replacement in text.lua at line 644
y = y + State.drawing_padding_height + Drawing.pixels(State.lines[State.cursor1.line].h)y = y + State.drawing_padding_height + Drawing.pixels(State.lines[State.cursor1.line].h, State.width) - replacement in text.lua at line 680
local h = State.drawing_padding_height + Drawing.pixels(State.lines[top2.line-1].h)local h = State.drawing_padding_height + Drawing.pixels(State.lines[top2.line-1].h, State.width) - replacement in help.lua at line 49
love.graphics.rectangle('fill', State.left,drawing.y, State.width, math.max(Drawing.pixels(drawing.h),y-drawing.y))love.graphics.rectangle('fill', State.left,drawing.y, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-drawing.y)) - replacement in help.lua at line 128
love.graphics.rectangle('fill', State.left,drawing.y, State.width, math.max(Drawing.pixels(drawing.h),y-drawing.y))love.graphics.rectangle('fill', State.left,drawing.y, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-drawing.y)) - replacement in edit.lua at line 161
y = y + Drawing.pixels(line.h) + State.drawing_padding_bottomy = y + Drawing.pixels(line.h, State.width) + State.drawing_padding_bottom - replacement in edit.lua at line 232
if Drawing.in_drawing(line, x, y) thenif Drawing.in_drawing(line, x, y, State.left,State.right) then - replacement in drawing.lua at line 9
if pmx < State.right and pmy > line.y and pmy < line.y+Drawing.pixels(line.h) thenif pmx < State.right and pmy > line.y and pmy < line.y+Drawing.pixels(line.h, State.width) then - replacement in drawing.lua at line 11
love.graphics.rectangle('line', State.left,line.y, State.width,Drawing.pixels(line.h))love.graphics.rectangle('line', State.left,line.y, State.width,Drawing.pixels(line.h, State.width)) - replacement in drawing.lua at line 38
Drawing.draw_shape(State.left,line.y, line, shape)Drawing.draw_shape(line, shape, line.y, State.left,State.right) - replacement in drawing.lua at line 42
if Drawing.near(p, mx,my) thenif Drawing.near(p, mx,my, State.width) then - replacement in drawing.lua at line 44
love.graphics.circle('line', Drawing.pixels(p.x)+State.left,Drawing.pixels(p.y)+line.y, Same_point_distance)love.graphics.circle('line', Drawing.pixels(p.x, State.width)+State.left,Drawing.pixels(p.y, State.width)+line.y, Same_point_distance) - replacement in drawing.lua at line 47
love.graphics.circle('fill', Drawing.pixels(p.x)+State.left,Drawing.pixels(p.y)+line.y, 2)love.graphics.circle('fill', Drawing.pixels(p.x, State.width)+State.left,Drawing.pixels(p.y, State.width)+line.y, 2) - replacement in drawing.lua at line 51
local x,y = Drawing.pixels(p.x)+State.left+5, Drawing.pixels(p.y)+line.y+5local x,y = Drawing.pixels(p.x, State.width)+State.left+5, Drawing.pixels(p.y, State.width)+line.y+5 - replacement in drawing.lua at line 69
Drawing.draw_pending_shape(State.left,line.y, line)Drawing.draw_pending_shape(line, line.y, State.left,State.right) - replacement in drawing.lua at line 72
function Drawing.draw_shape(left,top, drawing, shape)function Drawing.draw_shape(drawing, shape, top, left,right)local width = right-left - replacement in drawing.lua at line 78
love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(point.x)+left,Drawing.pixels(point.y)+top)love.graphics.line(Drawing.pixels(prev.x, width)+left,Drawing.pixels(prev.y, width)+top, Drawing.pixels(point.x, width)+left,Drawing.pixels(point.y, width)+top) - replacement in drawing.lua at line 85
love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(p2.x)+left,Drawing.pixels(p2.y)+top)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) - replacement in drawing.lua at line 91
love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)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) - replacement in drawing.lua at line 97
love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)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) - replacement in drawing.lua at line 101
love.graphics.circle('line', Drawing.pixels(center.x)+left,Drawing.pixels(center.y)+top, Drawing.pixels(shape.radius))love.graphics.circle('line', Drawing.pixels(center.x, width)+left,Drawing.pixels(center.y, width)+top, Drawing.pixels(shape.radius, width)) - replacement in drawing.lua at line 104
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)love.graphics.arc('line', 'open', Drawing.pixels(center.x, width)+left,Drawing.pixels(center.y, width)+top, Drawing.pixels(shape.radius, width), shape.start_angle, shape.end_angle, 360) - replacement in drawing.lua at line 113
function Drawing.draw_pending_shape(left,top, drawing)function Drawing.draw_pending_shape(drawing, top, left,right)local width = right-left - replacement in drawing.lua at line 121
Drawing.draw_shape(left,top, drawing, shape_copy)Drawing.draw_shape(drawing, shape_copy, top, left,right) - replacement in drawing.lua at line 128
love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(mx)+left,Drawing.pixels(my)+top)love.graphics.line(Drawing.pixels(p1.x, width)+left,Drawing.pixels(p1.y, width)+top, Drawing.pixels(mx, width)+left,Drawing.pixels(my, width)+top) - replacement in drawing.lua at line 136
love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(mx)+left,Drawing.pixels(p1.y)+top)love.graphics.line(Drawing.pixels(p1.x, width)+left,Drawing.pixels(p1.y, width)+top, Drawing.pixels(mx, width)+left,Drawing.pixels(p1.y, width)+top) - replacement in drawing.lua at line 138
love.graphics.line(Drawing.pixels(p1.x)+left,Drawing.pixels(p1.y)+top, Drawing.pixels(p1.x)+left,Drawing.pixels(my)+top)love.graphics.line(Drawing.pixels(p1.x, width)+left,Drawing.pixels(p1.y, width)+top, Drawing.pixels(p1.x, width)+left,Drawing.pixels(my, width)+top) - replacement in drawing.lua at line 146
love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, Drawing.pixels(curr.x)+left,Drawing.pixels(curr.y)+top)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) - replacement in drawing.lua at line 150
love.graphics.line(Drawing.pixels(prev.x)+left,Drawing.pixels(prev.y)+top, App.mouse_x(),App.mouse_y())love.graphics.line(Drawing.pixels(prev.x, width)+left,Drawing.pixels(prev.y, width)+top, App.mouse_x(),App.mouse_y()) - replacement in drawing.lua at line 155
love.graphics.line(Drawing.pixels(first.x)+left,Drawing.pixels(first.y)+top, pmx,pmy)love.graphics.line(Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top, pmx,pmy) - replacement in drawing.lua at line 161
love.graphics.line(Drawing.pixels(first.x)+left,Drawing.pixels(first.y)+top, Drawing.pixels(second.x)+left,Drawing.pixels(second.y)+top)love.graphics.line(Drawing.pixels(second.x)+left,Drawing.pixels(second.y)+top, Drawing.pixels(thirdx)+left,Drawing.pixels(thirdy)+top)love.graphics.line(Drawing.pixels(thirdx)+left,Drawing.pixels(thirdy)+top, Drawing.pixels(fourthx)+left,Drawing.pixels(fourthy)+top)love.graphics.line(Drawing.pixels(fourthx)+left,Drawing.pixels(fourthy)+top, Drawing.pixels(first.x)+left,Drawing.pixels(first.y)+top)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) - replacement in drawing.lua at line 169
love.graphics.line(Drawing.pixels(first.x)+left,Drawing.pixels(first.y)+top, pmx,pmy)love.graphics.line(Drawing.pixels(first.x, width)+left,Drawing.pixels(first.y, width)+top, pmx,pmy) - replacement in drawing.lua at line 175
love.graphics.line(Drawing.pixels(first.x)+left,Drawing.pixels(first.y)+top, Drawing.pixels(second.x)+left,Drawing.pixels(second.y)+top)love.graphics.line(Drawing.pixels(second.x)+left,Drawing.pixels(second.y)+top, Drawing.pixels(thirdx)+left,Drawing.pixels(thirdy)+top)love.graphics.line(Drawing.pixels(thirdx)+left,Drawing.pixels(thirdy)+top, Drawing.pixels(fourthx)+left,Drawing.pixels(fourthy)+top)love.graphics.line(Drawing.pixels(fourthx)+left,Drawing.pixels(fourthy)+top, Drawing.pixels(first.x)+left,Drawing.pixels(first.y)+top)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) - replacement in drawing.lua at line 185
local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+toplocal cx,cy = Drawing.pixels(center.x, width)+left, Drawing.pixels(center.y, width)+top - replacement in drawing.lua at line 194
local cx,cy = Drawing.pixels(center.x)+left, Drawing.pixels(center.y)+toplove.graphics.arc('line', 'open', cx,cy, Drawing.pixels(shape.radius), shape.start_angle, shape.end_angle, 360)local cx,cy = Drawing.pixels(center.x, width)+left, Drawing.pixels(center.y, width)+toplove.graphics.arc('line', 'open', cx,cy, Drawing.pixels(shape.radius, width), shape.start_angle, shape.end_angle, 360) - replacement in drawing.lua at line 207
function Drawing.in_drawing(drawing, x,y)function Drawing.in_drawing(drawing, x,y, left,right) - replacement in drawing.lua at line 209
return y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= Editor_state.left and x < Editor_state.rightlocal width = right-leftreturn y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h, width) and x >= left and x < right - replacement in drawing.lua at line 217
local j = Drawing.find_or_insert_point(drawing.points, Drawing.coord(x-State.left), Drawing.coord(y-drawing.y))local j = Drawing.find_or_insert_point(drawing.points, Drawing.coord(x-State.left), Drawing.coord(y-drawing.y), State.width) - replacement in drawing.lua at line 220
local j = Drawing.find_or_insert_point(drawing.points, Drawing.coord(x-State.left), Drawing.coord(y-drawing.y))local j = Drawing.find_or_insert_point(drawing.points, Drawing.coord(x-State.left), Drawing.coord(y-drawing.y), State.width) - replacement in drawing.lua at line 223
local j = Drawing.find_or_insert_point(drawing.points, Drawing.coord(x-State.left), Drawing.coord(y-drawing.y))local j = Drawing.find_or_insert_point(drawing.points, Drawing.coord(x-State.left), Drawing.coord(y-drawing.y), State.width) - replacement in drawing.lua at line 242
if Drawing.in_drawing(drawing, x,y) thenif Drawing.in_drawing(drawing, x,y, State.left,State.right) then - replacement in drawing.lua at line 253
if Drawing.in_drawing(drawing, x, y) thenif Drawing.in_drawing(drawing, x, y, State.left,State.right) then - replacement in drawing.lua at line 302
drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx,my)drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx,my, State.width) - replacement in drawing.lua at line 310
drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx, p1.y)drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, mx, p1.y, State.width) - replacement in drawing.lua at line 312
drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, p1.x, my)drawing.pending.p2 = Drawing.find_or_insert_point(drawing.points, p1.x, my, State.width) - replacement in drawing.lua at line 315
App.mouse_move(State.left+Drawing.pixels(p2.x), drawing.y+Drawing.pixels(p2.y))App.mouse_move(State.left+Drawing.pixels(p2.x, State.width), drawing.y+Drawing.pixels(p2.y, State.width)) - replacement in drawing.lua at line 321
table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, mx,my))table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, mx,my, State.width)) - replacement in drawing.lua at line 332
table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy))table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy))table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width)) - replacement in drawing.lua at line 347
table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy))table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy))table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, thirdx,thirdy, State.width))table.insert(drawing.pending.vertices, Drawing.find_or_insert_point(drawing.points, fourthx,fourthy, State.width)) - replacement in drawing.lua at line 385
drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width) - replacement in drawing.lua at line 398
drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)drawing.pending.p1 = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width) - replacement in drawing.lua at line 415
drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)}drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)} - replacement in drawing.lua at line 432
drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)}drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)} - replacement in drawing.lua at line 449
drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)}drawing.pending.vertices = {Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width)} - replacement in drawing.lua at line 467
local j = Drawing.find_or_insert_point(drawing.points, mx,my)local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width) - replacement in drawing.lua at line 472
local j = Drawing.find_or_insert_point(drawing.points, mx,my)local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width) - replacement in drawing.lua at line 490
drawing.pending.center = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y)drawing.pending.center = Drawing.find_or_insert_point(drawing.points, drawing.pending.points[1].x, drawing.pending.points[1].y, State.width) - replacement in drawing.lua at line 607
if Drawing.in_drawing(drawing, x,y) thenif Drawing.in_drawing(drawing, x,y, State.left,State.right) then - replacement in drawing.lua at line 619
if Drawing.in_drawing(drawing, x,y) thenif Drawing.in_drawing(drawing, x,y, State.left,State.right) then - replacement in drawing.lua at line 636
if Drawing.in_drawing(drawing, x,y) thenif Drawing.in_drawing(drawing, x,y, State.left,State.right) then - replacement in drawing.lua at line 640
if Drawing.near(point, mx,my) thenif Drawing.near(point, mx,my, State.width) then - replacement in drawing.lua at line 653
if Drawing.in_drawing(drawing, x,y) thenif Drawing.in_drawing(drawing, x,y, State.left,State.right) then - replacement in drawing.lua at line 698
function Drawing.find_or_insert_point(points, x,y)function Drawing.find_or_insert_point(points, x,y, width) - replacement in drawing.lua at line 701
if Drawing.near(point, x,y) thenif Drawing.near(point, x,y, width) then - replacement in drawing.lua at line 709
function Drawing.near(point, x,y)local px,py = Drawing.pixels(x),Drawing.pixels(y)local cx,cy = Drawing.pixels(point.x), Drawing.pixels(point.y)function Drawing.near(point, x,y, width)local px,py = Drawing.pixels(x, width),Drawing.pixels(y, width)local cx,cy = Drawing.pixels(point.x, width), Drawing.pixels(point.y, width) - replacement in drawing.lua at line 715
function Drawing.pixels(n) -- parts to pixelsreturn math.floor(n*Editor_state.width/256)function Drawing.pixels(n, width) -- parts to pixelsreturn math.floor(n*width/256)