mirror of
https://github.com/LDDestroier/CC/
synced 2025-01-19 05:32:51 +00:00
Frame merge (#4)
* Added frame merging * Update pain.lua * Update pain.lua * Update pain.lua
This commit is contained in:
parent
ebff92f93c
commit
30e4fafc51
27
pain.lua
27
pain.lua
@ -2961,8 +2961,33 @@ local getInput = function() --gotta catch them all
|
|||||||
saveToUndoBuffer()
|
saveToUndoBuffer()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
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
|
end
|
||||||
if not keysDown[keys.leftAlt] then
|
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 key == keys.equals then --basically 'plus'
|
||||||
if renderBlittle then
|
if renderBlittle then
|
||||||
frame = frame + 1
|
frame = frame + 1
|
||||||
|
Loading…
Reference in New Issue
Block a user