akkartik/sokoban.love - Change 6DE7RBZ6RHNEICJ7EUMCTROK43LW4LYINULIF2QEQOKCXWLUYUXAC

move mouse_released events to Drawing

Created by Kartik K. Agaram on May 18, 2022

6DE7RBZ6RHNEICJ7EUMCTROK43LW4LYINULIF2QEQOKCXWLUYUXAC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 173 [6.2]

B:BD[4.1626] → [5.1723:1845]

∅:D[5.1845] → [7.570:687]

∅:D[8.2692] → [7.570:687]

B:BD[9.301] → [7.570:687]

∅:D[7.687] → [4.1739:1800]

B:BD[4.1739] → [4.1739:1800]

B:BD[4.1800] → [7.688:809]

B:BD[7.809] → [5.1846:1922]

∅:D[5.1922] → [7.869:943]

B:BD[7.869] → [7.869:943]

B:BD[7.943] → [5.1923:1993]

∅:D[5.1993] → [7.1005:1112]

B:BD[7.1005] → [7.1005:1112]

∅:D[7.1112] → [10.440:452]

B:BD[10.440] → [10.440:452]

B:BD[10.452] → [7.1113:1239]

B:BD[7.1239] → [5.1994:2070]

∅:D[5.2070] → [7.1299:1373]

B:BD[7.1299] → [7.1299:1373]

∅:D[7.1373] → [10.527:583]

B:BD[10.527] → [10.527:583]

B:BD[10.583] → [5.2071:2146]

∅:D[5.2146] → [7.1441:1482]

B:BD[7.1441] → [7.1441:1482]

∅:D[7.1482] → [10.691:706]

B:BD[10.691] → [10.691:706]

B:BD[10.706] → [5.2147:2222]

∅:D[5.2222] → [7.1550:1591]

B:BD[7.1550] → [7.1550:1591]

∅:D[7.1591] → [10.814:828]

B:BD[10.814] → [10.814:828]

B:BD[10.828] → [7.1592:1660]

B:BD[7.1660] → [5.2223:2319]

∅:D[5.2319] → [7.1740:1808]

B:BD[7.1740] → [7.1740:1808]

∅:D[10.1044] → [11.464:476]

∅:D[7.1808] → [11.464:476]

B:BD[11.464] → [11.464:476]

B:BD[11.476] → [7.1809:1867]

B:BD[7.1867] → [5.2320:2396]

∅:D[5.2396] → [7.1927:2001]

B:BD[7.1927] → [7.1927:2001]

B:BD[7.2001] → [5.2397:2467]

∅:D[5.2467] → [7.2063:2131]

B:BD[7.2063] → [7.2063:2131]

∅:D[7.2131] → [12.325:337]

B:BD[12.325] → [12.325:337]

B:BD[12.337] → [7.2132:2255]

B:BD[7.2255] → [5.2468:2544]

∅:D[5.2544] → [7.2315:2610]

B:BD[7.2315] → [7.2315:2610]

∅:D[7.2610] → [13.415:427]

B:BD[13.415] → [13.415:427]

B:BD[13.427] → [7.2611:2665]

B:BD[7.2665] → [5.2545:2621]

∅:D[5.2621] → [7.2725:2875]

B:BD[7.2725] → [7.2725:2875]

B:BD[7.2875] → [5.2622:2746]

∅:D[5.2746] → [7.2994:3062]

B:BD[7.2994] → [7.2994:3062]

∅:D[7.3062] → [14.454:466]

B:BD[14.454] → [14.454:466]

∅:D[12.403] → [4.1962:1972]

∅:D[13.427] → [4.1962:1972]

∅:D[14.466] → [4.1962:1972]

∅:D[11.620] → [4.1962:1972]

∅:D[15.630] → [4.1962:1972]

B:BD[4.1962] → [4.1962:1972]

B:BD[4.1972] → [7.3063:3122]

∅:D[7.3122] → [4.2095:2103]

B:BD[4.2095] → [4.2095:2103]

∅:D[16.107] → [4.3110:3116]

∅:D[11.1180] → [4.3110:3116]

∅:D[13.1205] → [4.3110:3116]

∅:D[14.1239] → [4.3110:3116]

∅:D[15.1441] → [4.3110:3116]

∅:D[12.1535] → [4.3110:3116]

B:BD[4.3110] → [4.3110:3116]

B:BD[4.3116] → [2.3:35]

  if Current_drawing_mode == 'move' then
    Current_drawing_mode = Previous_drawing_mode
    Previous_drawing_mode = nil
  elseif Lines.current then
    if Lines.current.pending then
      if Lines.current.pending.mode == 'freehand' then
        -- the last point added during update is good enough
        table.insert(Lines.current.shapes, Lines.current.pending)
      elseif Lines.current.pending.mode == 'line' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          local j = Drawing.insert_point(Lines.current.points, mx,my)
          Lines.current.pending.p2 = j
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
      elseif Lines.current.pending.mode == 'manhattan' then
        local p1 = Lines.current.points[Lines.current.pending.p1]
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          if math.abs(mx-p1.x) > math.abs(my-p1.y) then
            local j = Drawing.insert_point(Lines.current.points, mx, p1.y)
            Lines.current.pending.p2 = j
          else
            local j = Drawing.insert_point(Lines.current.points, p1.x, my)
            Lines.current.pending.p2 = j
          end
          local p2 = Lines.current.points[Lines.current.pending.p2]
          love.mouse.setPosition(16+Drawing.pixels(p2.x), Lines.current.y+Drawing.pixels(p2.y))
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
      elseif Lines.current.pending.mode == 'polygon' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          local j = Drawing.insert_point(Lines.current.points, mx,my)
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
        table.insert(Lines.current.shapes, Lines.current.pending)
      elseif Lines.current.pending.mode == 'circle' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          local center = Lines.current.points[Lines.current.pending.center]
          Lines.current.pending.radius = math.dist(center.x,center.y, mx,my)
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
      elseif Lines.current.pending.mode == 'arc' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          local center = Lines.current.points[Lines.current.pending.center]
          Lines.current.pending.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, Lines.current.pending.end_angle)
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
      end
      Lines.current.pending = {}
      Lines.current = nil
    end
  end
  save_to_disk(Lines, Filename)

[4.1626]

[4.3116]

  Drawing.mouse_released(x,y, button)

Insertion in drawing.lua at line 70 [17.98]

[3.1703]

[5.19072]

end
function Drawing.mouse_released(x,y, button)
  if Current_drawing_mode == 'move' then
    Current_drawing_mode = Previous_drawing_mode
    Previous_drawing_mode = nil
  elseif Lines.current then
    if Lines.current.pending then
      if Lines.current.pending.mode == 'freehand' then
        -- the last point added during update is good enough
        table.insert(Lines.current.shapes, Lines.current.pending)
      elseif Lines.current.pending.mode == 'line' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          local j = Drawing.insert_point(Lines.current.points, mx,my)
          Lines.current.pending.p2 = j
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
      elseif Lines.current.pending.mode == 'manhattan' then
        local p1 = Lines.current.points[Lines.current.pending.p1]
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          if math.abs(mx-p1.x) > math.abs(my-p1.y) then
            local j = Drawing.insert_point(Lines.current.points, mx, p1.y)
            Lines.current.pending.p2 = j
          else
            local j = Drawing.insert_point(Lines.current.points, p1.x, my)
            Lines.current.pending.p2 = j
          end
          local p2 = Lines.current.points[Lines.current.pending.p2]
          love.mouse.setPosition(16+Drawing.pixels(p2.x), Lines.current.y+Drawing.pixels(p2.y))
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
      elseif Lines.current.pending.mode == 'polygon' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          local j = Drawing.insert_point(Lines.current.points, mx,my)
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
        table.insert(Lines.current.shapes, Lines.current.pending)
      elseif Lines.current.pending.mode == 'circle' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          local center = Lines.current.points[Lines.current.pending.center]
          Lines.current.pending.radius = geom.dist(center.x,center.y, mx,my)
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
      elseif Lines.current.pending.mode == 'arc' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-Lines.current.y)
        if mx >= 0 and mx < 256 and my >= 0 and my < Lines.current.h then
          local center = Lines.current.points[Lines.current.pending.center]
          Lines.current.pending.end_angle = geom.angle_with_hint(center.x,center.y, mx,my, Lines.current.pending.end_angle)
          table.insert(Lines.current.shapes, Lines.current.pending)
        end
      end
      Lines.current.pending = {}
      Lines.current = nil
    end
  end
  save_to_disk(Lines, Filename)