huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 01:29:49 +00:00
Code Issues Wiki Activity

Delete frames from tags if the frames are deleted

Browse source 
And also move tags if frames before their first frame are deleted. Doesn't work with UndoRedo yet.
This commit is contained in:
OverloadedOrama 2020-04-19 21:00:36 +03:00
parent ba2b8aae91
commit 9cb98a443e
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Scripts/AnimationTimeline.gd
View file

@ -66,6 +66,19 @@ func _on_DeleteFrame_pressed(frame := -1) -> void:
if current_frame > 0 && current_frame == new_canvases.size(): # If it's the last frame if current_frame > 0 && current_frame == new_canvases.size(): # If it's the last frame
current_frame -= 1 current_frame -= 1
# Loop through the tags to see if the frame is in one
for tag in Global.animation_tags:
if frame + 1 >= tag[2] && frame + 1 <= tag[3]:
if tag[3] == tag[2]: # If we're deleting the only frame in the tag
Global.animation_tags.erase(tag)
else:
tag[3] -= 1
elif frame + 1 < tag[2]:
tag[2] -= 1
tag[3] -= 1
Global.animation_tags = Global.animation_tags # To execute animation_tags_changed()
Global.undos += 1 Global.undos += 1
Global.undo_redo.create_action("Remove Frame") Global.undo_redo.create_action("Remove Frame")
@ -187,14 +200,6 @@ func _on_PlayBackwards_toggled(button_pressed : bool) -> void:
func _on_AnimationTimer_timeout() -> void: func _on_AnimationTimer_timeout() -> void:
# var first_frame := 0
# var last_frame := Global.canvases.size() - 1
# if Global.play_only_tags:
# for tag in Global.animation_tags:
# if Global.current_frame + 1 >= tag[2] && Global.current_frame + 1 <= tag[3]:
# first_frame = tag[2] - 1
# last_frame = min(Global.canvases.size() - 1, tag[3] - 1)
if animation_forward: if animation_forward:
if Global.current_frame < last_frame: if Global.current_frame < last_frame:
Global.current_frame += 1 Global.current_frame += 1