akkartik/sokoban.love - Change RT6EV6OPUYCXYZOX2PHFXJ7KT77KHNEVINEGQXIQLHQVKPGTN6VQC

delegate update events to drawings

Created by Kartik K. Agaram on May 18, 2022

RT6EV6OPUYCXYZOX2PHFXJ7KT77KHNEVINEGQXIQLHQVKPGTN6VQC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 129 [4.2]

B:BD[4.446] → [3.3:165]

∅:D[3.165] → [5.76:109]

B:BD[4.446] → [5.76:109]

B:BD[5.109] → [3.166:599]

∅:D[3.599] → [6.1659:1677]

B:BD[6.1659] → [6.1659:1677]

B:BD[6.1677] → [7.501:546]

B:BD[7.546] → [3.600:646]

∅:D[3.646] → [7.657:725]

B:BD[7.657] → [7.657:725]

∅:D[7.725] → [8.298:390]

B:BD[8.298] → [8.298:390]

∅:D[8.390] → [6.1677:1683]

B:BD[6.1677] → [6.1677:1683]

  if Lines.current == nil then return end
  local drawing = Lines.current
  assert(drawing.mode == 'drawing')
  local x, y = love.mouse.getX(), love.mouse.getY()
  if love.mouse.isDown('1') then
    if Drawing.in_drawing(drawing, x,y) then
      if drawing.pending.mode == 'freehand' then
        table.insert(drawing.pending.points, {x=Drawing.coord(love.mouse.getX()-16), y=Drawing.coord(love.mouse.getY()-drawing.y)})
      elseif drawing.pending.mode == 'move' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-drawing.y)
        drawing.pending.target_point.x = mx
        drawing.pending.target_point.y = my
      end
    end
  elseif Current_drawing_mode == 'move' then
    if Drawing.in_drawing(drawing, x, y) then
      local mx,my = Drawing.coord(x-16), Drawing.coord(y-drawing.y)
      drawing.pending.target_point.x = mx
      drawing.pending.target_point.y = my
    end
  end

[4.446]

[9.3]

  Drawing.update(dt)

Insertion in drawing.lua at line 72 [10.98]

[2.54]

-- a couple of operations on drawings need to constantly check the state of the mouse
function Drawing.update()
  if Lines.current == nil then return end
  local drawing = Lines.current
  assert(drawing.mode == 'drawing')
  local x, y = love.mouse.getX(), love.mouse.getY()
  if love.mouse.isDown('1') then
    if Drawing.in_drawing(drawing, x,y) then
      if drawing.pending.mode == 'freehand' then
        table.insert(drawing.pending.points, {x=Drawing.coord(love.mouse.getX()-16), y=Drawing.coord(love.mouse.getY()-drawing.y)})
      elseif drawing.pending.mode == 'move' then
        local mx,my = Drawing.coord(x-16), Drawing.coord(y-drawing.y)
        drawing.pending.target_point.x = mx
        drawing.pending.target_point.y = my
      end
    end
  elseif Current_drawing_mode == 'move' then
    if Drawing.in_drawing(drawing, x, y) then
      local mx,my = Drawing.coord(x-16), Drawing.coord(y-drawing.y)
      drawing.pending.target_point.x = mx
      drawing.pending.target_point.y = my
    end
  end
end