akkartik/pensieve.love - Change 3OTESDW65UJ2W5RIXA6FNKRSD7TBCZTCCCEAYOQMEVGYZ6RCU34QC

move drawing.starty into line cache

Created by Kartik K. Agaram on July 20, 2022

3OTESDW65UJ2W5RIXA6FNKRSD7TBCZTCCCEAYOQMEVGYZ6RCU34QC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 161 [7.413]
∅:D[6.557] → [7.5379:5396]
∅:D[8.3656] → [7.5379:5396]
∅:D[9.99168] → [7.5379:5396]
B:BD[7.5379] → [7.5379:5396]
B:BD[7.5396] → [10.15:47]
```
      line.y = y
      Drawing.draw(State, line)
```
[6.557]
[6.558]
```
      Drawing.draw(State, line_index, y)
```

Replacement in edit.lua at line 226 [7.413]

B:BD[7.8089] → [11.685:754]

      if Drawing.in_drawing(line, x, y, State.left,State.right) then

[7.8089]

[8.5145]

      local line_cache = State.line_cache[line_index]
      if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then

Replacement in edit.lua at line 231 [7.413]

∅:D[2.2295] → [12.15:77]

B:BD[7.8266] → [12.15:77]

        Drawing.mouse_pressed(State, line, x,y, mouse_button)

[2.2295]

[7.8321]

        Drawing.mouse_pressed(State, line_index, x,y, mouse_button)

Replacement in drawing_tests.lua at line 37 [13.15]

B:BD[9.106470] → [6.635:742]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_line/baseline/y')

[9.106470]

[9.106597]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_line/baseline/y')

Replacement in drawing_tests.lua at line 83 [13.15]

B:BD[9.107537] → [6.962:1080]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_horizontal_line/baseline/y')

[9.107537]

[9.107675]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_horizontal_line/baseline/y')

Replacement in drawing_tests.lua at line 112 [13.15]

B:BD[9.108512] → [6.1300:1409]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle/baseline/y')

[9.108512]

[9.108641]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle/baseline/y')

Replacement in drawing_tests.lua at line 142 [13.15]

B:BD[9.109628] → [6.1734:1845]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_cancel_stroke/baseline/y')

[9.109628]

[9.109759]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_cancel_stroke/baseline/y')

Replacement in drawing_tests.lua at line 182 [13.15]

B:BD[9.111061] → [6.2166:2286]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle_mid_stroke/baseline/y')

[9.111061]

[9.111201]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_circle_mid_stroke/baseline/y')

Replacement in drawing_tests.lua at line 211 [13.15]

B:BD[9.112170] → [6.2611:2717]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_arc/baseline/y')

[9.112170]

[9.112296]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_arc/baseline/y')

Replacement in drawing_tests.lua at line 243 [13.15]

B:BD[9.113295] → [6.3038:3148]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_polygon/baseline/y')

[9.113295]

[9.113425]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_polygon/baseline/y')

Replacement in drawing_tests.lua at line 282 [13.15]

B:BD[9.114419] → [6.3450:3562]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle/baseline/y')

[9.114419]

[9.114551]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle/baseline/y')

Replacement in drawing_tests.lua at line 327 [13.15]

B:BD[9.115698] → [6.3947:4072]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle_intermediate/baseline/y')

[9.115698]

[9.115843]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_rectangle_intermediate/baseline/y')

Replacement in drawing_tests.lua at line 364 [13.15]

B:BD[9.116845] → [6.4345:4454]

  check_eq(Editor_state.lines[1].y, Editor_state.top+Drawing_padding_top, 'F - test_draw_square/baseline/y')

[9.116845]

[9.116974]

  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'F - test_draw_square/baseline/y')

Replacement in drawing.lua at line 7 [15.98]

B:BD[14.315] → [10.50:85]

function Drawing.draw(State, line)

[14.315]

[16.1533]

function Drawing.draw(State, line_index, y)
  local line = State.lines[line_index]
  local line_cache = State.line_cache[line_index]
  line_cache.starty = y

Replacement in drawing.lua at line 12 [15.98]

B:BD[16.1580] → [11.757:855]

  if pmx < State.right and pmy > line.y and pmy < line.y+Drawing.pixels(line.h, State.width) then

[16.1580]

[17.1026]

  if pmx < State.right and pmy > line_cache.starty and pmy < line_cache.starty+Drawing.pixels(line.h, State.width) then

Replacement in drawing.lua at line 14 [15.98]

B:BD[17.1052] → [11.856:960]

    love.graphics.rectangle('line', State.left,line.y, State.width,Drawing.pixels(line.h, State.width))

[17.1052]

[10.318]

    love.graphics.rectangle('line', State.left,line_cache.starty, State.width,Drawing.pixels(line.h, State.width))

Replacement in drawing.lua at line 16 [15.98]

B:BD[10.363] → [18.36823:36888]

      icon[State.current_drawing_mode](State.right-22, line.y+4)

[10.363]

[15.523]

      icon[State.current_drawing_mode](State.right-22, line_cache.starty+4)

Replacement in drawing.lua at line 18 [15.98]

B:BD[15.532] → [18.36889:36955]

      icon[State.previous_drawing_mode](State.right-22, line.y+4)

[15.532]

[15.589]

      icon[State.previous_drawing_mode](State.right-22, line_cache.starty+4)

Replacement in drawing.lua at line 33 [15.98]

B:BD[19.73] → [19.73:125]

  local my = Drawing.coord(pmy-line.y, State.width)

[19.73]

[15.894]

  local my = Drawing.coord(pmy-line_cache.starty, State.width)

Replacement in drawing.lua at line 42 [15.98]

B:BD[15.1083] → [11.961:1029]

    Drawing.draw_shape(line, shape, line.y, State.left,State.right)

[15.1083]

[15.1122]

    Drawing.draw_shape(line, shape, line_cache.starty, State.left,State.right)

Replacement in drawing.lua at line 46 [15.98]

B:BD[3.93] → [3.93:165]

  local function py(y) return Drawing.pixels(y, State.width)+line.y end

[3.93]

[20.10]

  local function py(y) return Drawing.pixels(y, State.width)+line_cache.starty end

Replacement in drawing.lua at line 76 [15.98]

B:BD[17.1279] → [11.1461:1528]

  Drawing.draw_pending_shape(line, line.y, State.left,State.right)

[17.1279]

[21.10]

  Drawing.draw_pending_shape(line, line_cache.starty, State.left,State.right)

Replacement in drawing.lua at line 212 [15.98]

B:BD[21.4360] → [11.5380:5434]

∅:D[11.5434] → [22.2202:2271]

B:BD[23.688] → [22.2202:2271]

function Drawing.in_drawing(drawing, x,y, left,right)
  if drawing.y == nil then return false end  -- outside current page

[23.646]

[11.5435]

function Drawing.in_drawing(drawing, line_cache, x,y, left,right)
  if line_cache.starty == nil then return false end  -- outside current page

Replacement in drawing.lua at line 215 [15.98]

B:BD[11.5462] → [11.5462:5567]

  return y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h, width) and x >= left and x < right

[11.5462]

[23.795]

  return y >= line_cache.starty and y < line_cache.starty + Drawing.pixels(drawing.h, width) and x >= left and x < right

Replacement in drawing.lua at line 218 [15.98]

B:BD[23.800] → [12.80:140]

function Drawing.mouse_pressed(State, drawing, x,y, button)

[23.800]

[4.17]

function Drawing.mouse_pressed(State, drawing_index, x,y, button)
  local drawing = State.lines[drawing_index]
  local line_cache = State.line_cache[drawing_index]

Replacement in drawing.lua at line 222 [15.98]

B:BD[4.71] → [4.71:124]

  local cy = Drawing.coord(y-drawing.y, State.width)

[4.71]

[12.140]

  local cy = Drawing.coord(y-line_cache.starty, State.width)

Insertion in drawing.lua at line 248 [15.98]

[24.179]

[25.218]

  local line_cache = State.line_cache[State.lines.current_drawing_index]

Replacement in drawing.lua at line 252 [15.98]

B:BD[5.134] → [5.134:189]

  local my = Drawing.coord(pmy-drawing.y, State.width)

[5.134]

[26.1585]

  local my = Drawing.coord(pmy-line_cache.starty, State.width)

Replacement in drawing.lua at line 254 [15.98]

B:BD[26.1613] → [27.66:139]

    if Drawing.in_drawing(drawing, pmx,pmy, State.left,State.right) then

[26.1613]

[25.384]

    if Drawing.in_drawing(drawing, line_cache, pmx,pmy, State.left,State.right) then

Replacement in drawing.lua at line 264 [15.98]

B:BD[24.457] → [27.249:323]

    if Drawing.in_drawing(drawing, pmx, pmy, State.left,State.right) then

[24.457]

[25.949]

    if Drawing.in_drawing(drawing, line_cache, pmx, pmy, State.left,State.right) then

Insertion in drawing.lua at line 302 [15.98]

[28.487]

[29.46]

    local line_cache = State.line_cache[State.lines.current_drawing_index]

Replacement in drawing.lua at line 311 [15.98]

B:BD[29.227] → [30.1673:1777]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

[29.227]

[29.297]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

Replacement in drawing.lua at line 318 [15.98]

B:BD[29.627] → [30.1778:1882]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

[29.627]

[29.697]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

Replacement in drawing.lua at line 326 [15.98]

B:BD[29.1032] → [11.6400:6516]

          App.mouse_move(State.left+Drawing.pixels(p2.x, State.width), drawing.y+Drawing.pixels(p2.y, State.width))

[29.1032]

[29.1122]

          App.mouse_move(State.left+Drawing.pixels(p2.x, State.width), line_cache.starty+Drawing.pixels(p2.y, State.width))

Replacement in drawing.lua at line 330 [15.98]

B:BD[29.1231] → [30.1883:1987]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

[29.1231]

[29.1301]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

Replacement in drawing.lua at line 338 [15.98]

B:BD[29.1668] → [30.1988:2094]

          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

[29.1668]

[29.1740]

          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

Replacement in drawing.lua at line 353 [15.98]

B:BD[29.2366] → [30.2095:2201]

          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

[29.2366]

[29.2438]

          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

Replacement in drawing.lua at line 364 [15.98]

B:BD[29.2970] → [30.2202:2306]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

[29.2970]

[29.3040]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

Replacement in drawing.lua at line 371 [15.98]

B:BD[29.3348] → [30.2307:2411]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

[29.3348]

[29.3418]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

Replacement in drawing.lua at line 476 [15.98]

B:BD[31.690] → [32.360:413]

B:BD[32.413] → [30.2412:2536]

    local _,drawing = Drawing.current_drawing(State)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-drawing.y, State.width)

[31.690]

[11.7883]

    local _,drawing,line_cache = Drawing.current_drawing(State)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-line_cache.starty, State.width)

Replacement in drawing.lua at line 481 [15.98]

B:BD[31.936] → [32.414:467]

B:BD[32.467] → [30.2537:2661]

    local _,drawing = Drawing.current_drawing(State)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-drawing.y, State.width)

[31.936]

[11.7963]

    local _,drawing,line_cache = Drawing.current_drawing(State)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-line_cache.starty, State.width)

Replacement in drawing.lua at line 491 [15.98]

B:BD[31.1177] → [32.468:521]

    local _,drawing = Drawing.current_drawing(State)

[31.1177]

[33.7225]

    local _,drawing,line_cache = Drawing.current_drawing(State)

Replacement in drawing.lua at line 493 [15.98]

B:BD[33.7258] → [30.2662:2786]

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

[33.7258]

[33.7414]

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

Replacement in drawing.lua at line 509 [15.98]

B:BD[26.2665] → [32.576:651]

    local drawing_index,drawing,i,p = Drawing.select_point_at_mouse(State)

[26.2665]

[33.10152]

    local drawing_index,drawing,line_cache,i,p = Drawing.select_point_at_mouse(State)

Replacement in drawing.lua at line 520 [15.98]

B:BD[26.2771] → [32.652:737]

    local drawing_index,drawing,point_index,p = Drawing.select_point_at_mouse(State)

[26.2771]

[34.1952]

    local drawing_index,drawing,line_cache,point_index,p = Drawing.select_point_at_mouse(State)

Replacement in drawing.lua at line 533 [15.98]

B:BD[26.2827] → [32.738:801]

    local _,drawing,i,p = Drawing.select_point_at_mouse(State)

[26.2827]

[33.10804]

    local _,drawing,_,i,p = Drawing.select_point_at_mouse(State)

Replacement in drawing.lua at line 551 [15.98]

B:BD[33.11312] → [32.802:867]

    local drawing,_,shape = Drawing.select_shape_at_mouse(State)

[33.11312]

[33.11372]

    local drawing,_,_,shape = Drawing.select_shape_at_mouse(State)

Replacement in drawing.lua at line 618 [15.98]

B:BD[35.19238] → [11.8191:8262]

∅:D[11.8262] → [36.654:691]

B:BD[37.701] → [36.654:691]

      if Drawing.in_drawing(drawing, x,y, State.left,State.right) then
        return drawing_index,drawing

[35.19238]

[35.19373]

      local line_cache = State.line_cache[drawing_index]
      if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then
        return drawing_index,drawing,line_cache

Replacement in drawing.lua at line 628 [15.98]

B:BD[32.1124] → [32.1124:1166]

  for _,drawing in ipairs(State.lines) do

[32.1124]

[35.19492]

  for drawing_index,drawing in ipairs(State.lines) do

Replacement in drawing.lua at line 631 [15.98]

B:BD[16.4159] → [11.8263:8334]

B:BD[11.8334] → [30.2787:2891]

      if Drawing.in_drawing(drawing, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

[16.4159]

[35.19800]

      local line_cache = State.line_cache[drawing_index]
      if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

Replacement in drawing.lua at line 637 [15.98]

B:BD[35.19928] → [35.19928:19963]

            return drawing,i,shape

[35.19928]

[35.19963]

            return drawing,line_cache,i,shape

Replacement in drawing.lua at line 649 [15.98]

B:BD[16.4208] → [11.8335:8406]

B:BD[11.8406] → [30.2892:2996]

      if Drawing.in_drawing(drawing, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-drawing.y, State.width)

[16.4208]

[35.20403]

      local line_cache = State.line_cache[drawing_index]
      if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

Replacement in drawing.lua at line 655 [15.98]

∅:D[11.8465] → [36.741:790]

B:BD[35.20521] → [36.741:790]

            return drawing_index,drawing,i,point

[11.8465]

[35.20556]

            return drawing_index,drawing,line_cache,i,point

Replacement in drawing.lua at line 664 [15.98]

B:BD[32.1488] → [32.1488:1530]

  for _,drawing in ipairs(State.lines) do

[32.1488]

[35.20690]

  for drawing_index,drawing in ipairs(State.lines) do

Replacement in drawing.lua at line 667 [15.98]

B:BD[16.4257] → [11.8466:8537]

      if Drawing.in_drawing(drawing, x,y, State.left,State.right) then

[16.4257]

[35.20896]

      local line_cache = State.line_cache[drawing_index]
      if Drawing.in_drawing(drawing, line_cache, x,y, State.left,State.right) then