Frame merge (#4)

* Added frame merging

* Update pain.lua

* Update pain.lua

* Update pain.lua
This commit is contained in:
LDDestroier 2018-11-08 20:53:16 -05:00 committed by GitHub
parent ebff92f93c
commit 30e4fafc51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 2 deletions

View File

@ -2961,8 +2961,33 @@ local getInput = function() --gotta catch them all
saveToUndoBuffer()
end
end
end
if not keysDown[keys.leftAlt] then
elseif keysDown[keys.leftShift] then
if #paintEncoded > 1 then
if key == keys.equals and paintEncoded[frame+1] then --basically plus
for a = 1, #paintEncoded[frame] do
paintEncoded[frame+1][#paintEncoded[frame+1] + 1] = paintEncoded[frame][a]
end
table.remove(paintEncoded, frame)
paintEncoded = clearAllRedundant(paintEncoded)
barmsg = "Merged next frame."
doRender = true
changedImage = true
saveToUndoBuffer()
end
if key == keys.minus and paintEncoded[frame-1] then
for a = 1, #paintEncoded[frame] do
paintEncoded[frame-1][#paintEncoded[frame-1] + 1] = paintEncoded[frame][a]
end
table.remove(paintEncoded, frame)
frame = frame - 1
paintEncoded = clearAllRedundant(paintEncoded)
barmsg = "Merged previous frame."
doRender = true
changedImage = true
saveToUndoBuffer()
end
end
else
if key == keys.equals then --basically 'plus'
if renderBlittle then
frame = frame + 1