akkartik
/
capture.love
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delegate update events to drawings

This commit is contained in:
Kartik K. Agaram 2022-05-17 23:16:08 -07:00
parent 10bc32e2f0
commit c1ba40ac70
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drawing.lua
View File

@ -69,6 +69,31 @@ function Drawing.mouse_pressed(drawing, x,y, button)
Lines.current = drawing
end
-- 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
function Drawing.mouse_released(x,y, button)
if Current_drawing_mode == 'move' then
Current_drawing_mode = Previous_drawing_mode

22
main.lua
View File

@ -126,27 +126,7 @@ function love.draw()
end
function love.update(dt)
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
Drawing.update(dt)
end
function love.mousepressed(x,y, button)