huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 09:39:48 +00:00
Code Issues Wiki Activity
Pixelorama/Scripts/AnimationTimeline.gd

441 lines
17 KiB
GDScript3
Raw Normal View History

Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
extends Panel
var fps := 6.0
Animation loops by default, icon changes Changed the icon when animation is not looping, and added hover textures.
2020-03-31 15:53:26 +00:00
var animation_loop := 1 # 0 is no loop, 1 is cycle loop, 2 is ping-pong loop
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
var animation_forward := true
Changes on how animation plays on frame tags If the animation starts playing on a frame outside a tag, the animation will not limit itself to the tags later on as it plays. The animation will play only on a tag, if it started on a frame which has that tag. I also made it react to frame and tag changes, if they happen while the animation is running. I also added a play_animation() method in AnimationTimeline.gd, to reduce duplicate code found in _on_PlayForward_toggled() and _on_PlayBackwards_toggled()
2020-04-19 17:39:08 +00:00
var first_frame := 0
var last_frame := Global.canvases.size() - 1
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Basic UI for animation frame tags You can add tags by right clicking on a cel and selecting "Add Frame Tag". No tag modifying and deletion is implemented yet. I'm using a different ScrollContainer for the tags, which gets updated everytime the main timeline ScrollContainer gets updated. I hide its sliders from its theme, wish there was a more straightforward way.
2020-04-02 00:29:14 +00:00
onready var timeline_scroll : ScrollContainer = $AnimationContainer/TimelineContainer/TimelineScroll
onready var tag_scroll_container : ScrollContainer = $AnimationContainer/TimelineContainer/OpacityAndTagContainer/TagScroll
func _ready() -> void:
timeline_scroll.get_h_scrollbar().connect("value_changed", self, "_h_scroll_changed")
Add gif export plugin and extend export dialog with GIF animation support.
2020-04-06 16:51:47 +00:00
Global.animation_timer.wait_time = 1 / fps
Basic UI for animation frame tags You can add tags by right clicking on a cel and selecting "Add Frame Tag". No tag modifying and deletion is implemented yet. I'm using a different ScrollContainer for the tags, which gets updated everytime the main timeline ScrollContainer gets updated. I hide its sliders from its theme, wish there was a more straightforward way.
2020-04-02 00:29:14 +00:00
When cloning a frame, the clone appears next to the cloned Removed some code from FrameButton.gd since it's used in AnimationTimeline.gd, and removed the Global.hidden_canvases array, as... it did nothing? I don't remember what I made it for, I think it was for UndoRedo purposes but it's seems to be working fine without it.
2020-04-17 01:25:08 +00:00
Basic UI for animation frame tags You can add tags by right clicking on a cel and selecting "Add Frame Tag". No tag modifying and deletion is implemented yet. I'm using a different ScrollContainer for the tags, which gets updated everytime the main timeline ScrollContainer gets updated. I hide its sliders from its theme, wish there was a more straightforward way.
2020-04-02 00:29:14 +00:00
func _h_scroll_changed(value : float) -> void:
# Let the main timeline ScrollContainer affect the tag ScrollContainer too
tag_scroll_container.get_child(0).rect_min_size.x = timeline_scroll.get_child(0).rect_size.x - 212
tag_scroll_container.scroll_horizontal = value
Onion skinning settings have been moved to a popup window You can open the settings from a new button next to the onion settings button.
2020-03-31 16:14:13 +00:00
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
func add_frame() -> void:
var new_canvas : Canvas = load("res://Prefabs/Canvas.tscn").instance()
new_canvas.size = Global.canvas.size
new_canvas.frame = Global.canvases.size()
var new_canvases: Array = Global.canvases.duplicate()
new_canvases.append(new_canvas)
Global.undos += 1
Global.undo_redo.create_action("Add Frame")
Global.undo_redo.add_do_method(Global, "redo", [new_canvas])
Global.undo_redo.add_undo_method(Global, "undo", [new_canvas])
Global.undo_redo.add_do_property(Global, "canvases", new_canvases)
Global.undo_redo.add_do_property(Global, "canvas", new_canvas)
Global.undo_redo.add_do_property(Global, "current_frame", new_canvases.size() - 1)
The selected cel (?) is now pressed, based on current layer and frame All the other buttons are pressed = false. Also removed some legacy code.
2020-03-04 23:53:48 +00:00
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
for c in Global.canvases:
Global.undo_redo.add_do_property(c, "visible", false)
Global.undo_redo.add_undo_property(c, "visible", c.visible)
Append new linked cells to Global.layers[i][5] Append the Canvas nodes instead of frame ints
2020-03-18 00:56:29 +00:00
for l_i in range(Global.layers.size()):
if Global.layers[l_i][4]: # If the link button is pressed
# var new_layers : Array = Global.layers.duplicate()
# new_layers[l_i][5].append(new_canvas)
Global.layers[l_i][5].append(new_canvas)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases)
Global.undo_redo.add_undo_property(Global, "canvas", Global.canvas)
Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame)
Global.undo_redo.commit_action()
When cloning a frame, the clone appears next to the cloned Removed some code from FrameButton.gd since it's used in AnimationTimeline.gd, and removed the Global.hidden_canvases array, as... it did nothing? I don't remember what I made it for, I think it was for UndoRedo purposes but it's seems to be working fine without it.
2020-04-17 01:25:08 +00:00
Removed remove_frame() from FrameButton.gd Use _on_DeleteFrame_pressed() on AnimationTimeline.gd instead
2020-04-17 21:35:42 +00:00
func _on_DeleteFrame_pressed(frame := -1) -> void:
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
if Global.canvases.size() == 1:
return
Removed remove_frame() from FrameButton.gd Use _on_DeleteFrame_pressed() on AnimationTimeline.gd instead
2020-04-17 21:35:42 +00:00
if frame == -1:
frame = Global.current_frame
var canvas : Canvas = Global.canvases[frame]
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
var new_canvases := Global.canvases.duplicate()
new_canvases.erase(canvas)
var current_frame := Global.current_frame
if current_frame > 0 && current_frame == new_canvases.size(): # If it's the last frame
current_frame -= 1
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
var new_animation_tags := Global.animation_tags.duplicate(true)
Delete frames from tags if the frames are deleted And also move tags if frames before their first frame are deleted. Doesn't work with UndoRedo yet.
2020-04-19 18:00:36 +00:00
# Loop through the tags to see if the frame is in one
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
for tag in new_animation_tags:
Delete frames from tags if the frames are deleted And also move tags if frames before their first frame are deleted. Doesn't work with UndoRedo yet.
2020-04-19 18:00:36 +00:00
if frame + 1 >= tag[2] && frame + 1 <= tag[3]:
if tag[3] == tag[2]: # If we're deleting the only frame in the tag
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
new_animation_tags.erase(tag)
Delete frames from tags if the frames are deleted And also move tags if frames before their first frame are deleted. Doesn't work with UndoRedo yet.
2020-04-19 18:00:36 +00:00
else:
tag[3] -= 1
elif frame + 1 < tag[2]:
tag[2] -= 1
tag[3] -= 1
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Global.undos += 1
Global.undo_redo.create_action("Remove Frame")
Global.undo_redo.add_do_property(Global, "canvases", new_canvases)
Global.undo_redo.add_do_property(Global, "canvas", new_canvases[current_frame])
Global.undo_redo.add_do_property(Global, "current_frame", current_frame)
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
Global.undo_redo.add_do_property(Global, "animation_tags", new_animation_tags)
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Removed remove_frame() from FrameButton.gd Use _on_DeleteFrame_pressed() on AnimationTimeline.gd instead
2020-04-17 21:35:42 +00:00
for i in range(frame, new_canvases.size()):
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
var c : Canvas = new_canvases[i]
Global.undo_redo.add_do_property(c, "frame", i)
Global.undo_redo.add_undo_property(c, "frame", c.frame)
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases)
Global.undo_redo.add_undo_property(Global, "canvas", canvas)
Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame)
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
Global.undo_redo.add_undo_property(Global, "animation_tags", Global.animation_tags)
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Global.undo_redo.add_do_method(Global, "redo", [canvas])
Global.undo_redo.add_undo_method(Global, "undo", [canvas])
Global.undo_redo.commit_action()
When cloning a frame, the clone appears next to the cloned Removed some code from FrameButton.gd since it's used in AnimationTimeline.gd, and removed the Global.hidden_canvases array, as... it did nothing? I don't remember what I made it for, I think it was for UndoRedo purposes but it's seems to be working fine without it.
2020-04-17 01:25:08 +00:00
func _on_CopyFrame_pressed(frame := -1) -> void:
if frame == -1:
frame = Global.current_frame
var canvas : Canvas = Global.canvases[frame]
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
var new_canvas : Canvas = load("res://Prefabs/Canvas.tscn").instance()
new_canvas.size = Global.canvas.size
new_canvas.frame = Global.canvases.size()
Don't let tag_to be larger than Global.canvases.size(), and smaller than tag_from Also, when adding an new tag, the starting and ending frame values become the current frame.
2020-04-16 00:00:40 +00:00
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
var new_canvases := Global.canvases.duplicate()
When cloning a frame, the clone appears next to the cloned Removed some code from FrameButton.gd since it's used in AnimationTimeline.gd, and removed the Global.hidden_canvases array, as... it did nothing? I don't remember what I made it for, I think it was for UndoRedo purposes but it's seems to be working fine without it.
2020-04-17 01:25:08 +00:00
new_canvases.insert(frame + 1, new_canvas)
Don't let tag_to be larger than Global.canvases.size(), and smaller than tag_from Also, when adding an new tag, the starting and ending frame values become the current frame.
2020-04-16 00:00:40 +00:00
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
for layer in canvas.layers: # Copy every layer
var sprite := Image.new()
sprite.copy_from(layer[0])
sprite.lock()
var tex := ImageTexture.new()
tex.create_from_image(sprite, 0)
new_canvas.layers.append([sprite, tex, layer[2]])
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
var new_animation_tags := Global.animation_tags.duplicate(true)
Cloned frames are now automatically part of the tag The tags don't work with UndoRedo yet, so this is not final behavior
2020-04-17 01:59:23 +00:00
# Loop through the tags to see if the frame is in one
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
for tag in new_animation_tags:
Cloned frames are now automatically part of the tag The tags don't work with UndoRedo yet, so this is not final behavior
2020-04-17 01:59:23 +00:00
if frame + 1 >= tag[2] && frame + 1 <= tag[3]:
tag[3] += 1
When cloning a frame, the clone appears next to the cloned Removed some code from FrameButton.gd since it's used in AnimationTimeline.gd, and removed the Global.hidden_canvases array, as... it did nothing? I don't remember what I made it for, I think it was for UndoRedo purposes but it's seems to be working fine without it.
2020-04-17 01:25:08 +00:00
Global.undos += 1
Global.undo_redo.create_action("Add Frame")
Global.undo_redo.add_do_method(Global, "redo", [new_canvas])
Global.undo_redo.add_undo_method(Global, "undo", [new_canvas])
Global.undo_redo.add_do_property(Global, "canvases", new_canvases)
Global.undo_redo.add_do_property(Global, "canvas", new_canvas)
Global.undo_redo.add_do_property(Global, "current_frame", frame + 1)
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
Global.undo_redo.add_do_property(Global, "animation_tags", new_animation_tags)
When cloning a frame, the clone appears next to the cloned Removed some code from FrameButton.gd since it's used in AnimationTimeline.gd, and removed the Global.hidden_canvases array, as... it did nothing? I don't remember what I made it for, I think it was for UndoRedo purposes but it's seems to be working fine without it.
2020-04-17 01:25:08 +00:00
for i in range(Global.layers.size()):
for child in Global.layers[i][3].get_children():
Global.undo_redo.add_do_property(child, "pressed", false)
Global.undo_redo.add_undo_property(child, "pressed", child.pressed)
for c in Global.canvases:
Global.undo_redo.add_do_property(c, "visible", false)
Global.undo_redo.add_undo_property(c, "visible", c.visible)
for i in range(frame, new_canvases.size()):
var c : Canvas = new_canvases[i]
Global.undo_redo.add_do_property(c, "frame", i)
Global.undo_redo.add_undo_property(c, "frame", c.frame)
Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases)
Global.undo_redo.add_undo_property(Global, "canvas", Global.canvas)
Global.undo_redo.add_undo_property(Global, "current_frame", frame)
Frame tags now work with UndoRedo
2020-04-19 21:09:48 +00:00
Global.undo_redo.add_undo_property(Global, "animation_tags", Global.animation_tags)
When cloning a frame, the clone appears next to the cloned Removed some code from FrameButton.gd since it's used in AnimationTimeline.gd, and removed the Global.hidden_canvases array, as... it did nothing? I don't remember what I made it for, I think it was for UndoRedo purposes but it's seems to be working fine without it.
2020-04-17 01:25:08 +00:00
Global.undo_redo.commit_action()
Timeline UI changes The onion skinning button replaces the old onion skinning area of the timeline, but there's no way right now to change the settings. This will be added in a future commit. More UI changes will soon follow.
2020-03-26 18:56:30 +00:00
Added a tag button in the timeline Creates a new frame tag for now, it will be changed to manage all tags
2020-04-04 21:35:11 +00:00
func _on_FrameTagButton_pressed() -> void:
Global.tag_dialog.popup_centered()
Timeline UI changes The onion skinning button replaces the old onion skinning area of the timeline, but there's no way right now to change the settings. This will be added in a future commit. More UI changes will soon follow.
2020-03-26 18:56:30 +00:00
func _on_OnionSkinning_pressed() -> void:
Global.onion_skinning = !Global.onion_skinning
Global.canvas.update()
Added texture for the onion skinning button for when it's disabled
2020-04-03 12:34:16 +00:00
if Global.onion_skinning:
Global.onion_skinning_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Onion_Skinning.png" % Global.theme_type)
Global.onion_skinning_button.texture_hover = load("res://Assets/Graphics/%s Themes/Timeline/Onion_Skinning_Hover.png" % Global.theme_type)
else:
Global.onion_skinning_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Onion_Skinning_Off.png" % Global.theme_type)
Global.onion_skinning_button.texture_hover = load("res://Assets/Graphics/%s Themes/Timeline/Onion_Skinning_Off_Hover.png" % Global.theme_type)
Timeline UI changes The onion skinning button replaces the old onion skinning area of the timeline, but there's no way right now to change the settings. This will be added in a future commit. More UI changes will soon follow.
2020-03-26 18:56:30 +00:00
Onion skinning settings have been moved to a popup window You can open the settings from a new button next to the onion settings button.
2020-03-31 16:14:13 +00:00
func _on_OnionSkinningSettings_pressed() -> void:
Made the onion skinning settings popup appear next to the "expand" button
2020-04-03 12:52:34 +00:00
$OnionSkinningSettings.popup(Rect2(Global.onion_skinning_button.rect_global_position.x - 152, Global.onion_skinning_button.rect_global_position.y - 106, 136, 126))
Onion skinning settings have been moved to a popup window You can open the settings from a new button next to the onion settings button.
2020-03-31 16:14:13 +00:00
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
func _on_LoopAnim_pressed() -> void:
match animation_loop:
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
0: # Make it loop
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
animation_loop = 1
Global.loop_animation_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Loop.png" % Global.theme_type)
Animation loops by default, icon changes Changed the icon when animation is not looping, and added hover textures.
2020-03-31 15:53:26 +00:00
Global.loop_animation_button.texture_hover = load("res://Assets/Graphics/%s Themes/Timeline/Loop_Hover.png" % Global.theme_type)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.loop_animation_button.hint_tooltip = "Cycle loop"
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
1: # Make it ping-pong
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
animation_loop = 2
Global.loop_animation_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Loop_PingPong.png" % Global.theme_type)
Animation loops by default, icon changes Changed the icon when animation is not looping, and added hover textures.
2020-03-31 15:53:26 +00:00
Global.loop_animation_button.texture_hover = load("res://Assets/Graphics/%s Themes/Timeline/Loop_PingPong_Hover.png" % Global.theme_type)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.loop_animation_button.hint_tooltip = "Ping-pong loop"
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
2: # Make it stop
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
animation_loop = 0
Global.loop_animation_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Loop_None.png" % Global.theme_type)
Animation loops by default, icon changes Changed the icon when animation is not looping, and added hover textures.
2020-03-31 15:53:26 +00:00
Global.loop_animation_button.texture_hover = load("res://Assets/Graphics/%s Themes/Timeline/Loop_None_Hover.png" % Global.theme_type)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.loop_animation_button.hint_tooltip = "No loop"
Changes on how animation plays on frame tags If the animation starts playing on a frame outside a tag, the animation will not limit itself to the tags later on as it plays. The animation will play only on a tag, if it started on a frame which has that tag. I also made it react to frame and tag changes, if they happen while the animation is running. I also added a play_animation() method in AnimationTimeline.gd, to reduce duplicate code found in _on_PlayForward_toggled() and _on_PlayBackwards_toggled()
2020-04-19 17:39:08 +00:00
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
func _on_PlayForward_toggled(button_pressed : bool) -> void:
Changes on how animation plays on frame tags If the animation starts playing on a frame outside a tag, the animation will not limit itself to the tags later on as it plays. The animation will play only on a tag, if it started on a frame which has that tag. I also made it react to frame and tag changes, if they happen while the animation is running. I also added a play_animation() method in AnimationTimeline.gd, to reduce duplicate code found in _on_PlayForward_toggled() and _on_PlayBackwards_toggled()
2020-04-19 17:39:08 +00:00
play_animation(button_pressed, true)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
func _on_PlayBackwards_toggled(button_pressed : bool) -> void:
Changes on how animation plays on frame tags If the animation starts playing on a frame outside a tag, the animation will not limit itself to the tags later on as it plays. The animation will play only on a tag, if it started on a frame which has that tag. I also made it react to frame and tag changes, if they happen while the animation is running. I also added a play_animation() method in AnimationTimeline.gd, to reduce duplicate code found in _on_PlayForward_toggled() and _on_PlayBackwards_toggled()
2020-04-19 17:39:08 +00:00
play_animation(button_pressed, false)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
func _on_AnimationTimer_timeout() -> void:
if animation_forward:
Animation only plays on frames of the same tag If there are no tags, the animation plays on all frames, as before. Currently no front-end way of toggling this behavior.
2020-04-11 17:10:07 +00:00
if Global.current_frame < last_frame:
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.current_frame += 1
else:
match animation_loop:
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
0: # No loop
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.play_forward.pressed = false
Global.play_backwards.pressed = false
Global.animation_timer.stop()
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
1: # Cycle loop
Animation only plays on frames of the same tag If there are no tags, the animation plays on all frames, as before. Currently no front-end way of toggling this behavior.
2020-04-11 17:10:07 +00:00
Global.current_frame = first_frame
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
2: # Ping pong loop
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
animation_forward = false
_on_AnimationTimer_timeout()
else:
Animation only plays on frames of the same tag If there are no tags, the animation plays on all frames, as before. Currently no front-end way of toggling this behavior.
2020-04-11 17:10:07 +00:00
if Global.current_frame > first_frame:
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.current_frame -= 1
else:
match animation_loop:
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
0: # No loop
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.play_backwards.pressed = false
Global.play_forward.pressed = false
Global.animation_timer.stop()
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
1: # Cycle loop
Animation only plays on frames of the same tag If there are no tags, the animation plays on all frames, as before. Currently no front-end way of toggling this behavior.
2020-04-11 17:10:07 +00:00
Global.current_frame = last_frame
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
2: # Ping pong loop
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
animation_forward = true
_on_AnimationTimer_timeout()
Changes on how animation plays on frame tags If the animation starts playing on a frame outside a tag, the animation will not limit itself to the tags later on as it plays. The animation will play only on a tag, if it started on a frame which has that tag. I also made it react to frame and tag changes, if they happen while the animation is running. I also added a play_animation() method in AnimationTimeline.gd, to reduce duplicate code found in _on_PlayForward_toggled() and _on_PlayBackwards_toggled()
2020-04-19 17:39:08 +00:00
func play_animation(play : bool, forward_dir : bool) -> void:
if forward_dir:
Global.play_backwards.pressed = false
else:
Global.play_forward.pressed = false
if Global.canvases.size() == 1:
if forward_dir:
Global.play_forward.pressed = false
else:
Global.play_backwards.pressed = false
return
first_frame = 0
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 play:
Global.animation_timer.wait_time = 1 / fps
Global.animation_timer.start()
animation_forward = forward_dir
else:
Global.animation_timer.stop()
func _on_NextFrame_pressed() -> void:
if Global.current_frame < Global.canvases.size() - 1:
Global.current_frame += 1
func _on_PreviousFrame_pressed() -> void:
if Global.current_frame > 0:
Global.current_frame -= 1
func _on_LastFrame_pressed() -> void:
Global.current_frame = Global.canvases.size() - 1
func _on_FirstFrame_pressed() -> void:
Global.current_frame = 0
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
func _on_FPSValue_value_changed(value) -> void:
fps = float(value)
Global.animation_timer.wait_time = 1 / fps
func _on_PastOnionSkinning_value_changed(value) -> void:
Global.onion_skinning_past_rate = int(value)
Global.canvas.update()
func _on_FutureOnionSkinning_value_changed(value) -> void:
Global.onion_skinning_future_rate = int(value)
Global.canvas.update()
func _on_BlueRedMode_toggled(button_pressed) -> void:
Global.onion_skinning_blue_red = button_pressed
Global.canvas.update()
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
# Layer buttons
func add_layer(is_new := true) -> void:
var layer_name = null
Fixed spacing between some comments
2020-03-09 00:17:49 +00:00
if !is_new: # Clone layer
Clone layer is now functional
2020-02-28 23:31:16 +00:00
layer_name = Global.layers[Global.current_layer][0] + " (" + tr("copy") + ")"
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
var new_layers : Array = Global.layers.duplicate()
Added a boolean to check if new frames will be linked and an array of linked frames to Global.layers This doesn't add any new functionality right now
2020-03-14 19:40:10 +00:00
# Store [Layer name (0), Layer visibility boolean (1), Layer lock boolean (2), Frame container (3),
# will new frames be linked boolean (4), Array of linked frames (5)]
new_layers.append([layer_name, true, false, HBoxContainer.new(), false, []])
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.undos += 1
Global.undo_redo.create_action("Add Layer")
for c in Global.canvases:
Layer images are now unique to each frame
2020-02-20 00:14:15 +00:00
var new_layer := Image.new()
if is_new:
new_layer.create(c.size.x, c.size.y, false, Image.FORMAT_RGBA8)
Implemented locking/unlocking layers When a layer is locked, no changes can be made to it.
2020-03-09 01:26:13 +00:00
else: # Clone layer
Layer images are now unique to each frame
2020-02-20 00:14:15 +00:00
new_layer.copy_from(c.layers[Global.current_layer][0])
new_layer.lock()
var new_layer_tex := ImageTexture.new()
new_layer_tex.create_from_image(new_layer, 0)
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
var new_canvas_layers : Array = c.layers.duplicate()
Store layer visibility on Global.layers instead This way, toggling visibility in a layers works for all frames in that layer.
2020-01-19 18:03:32 +00:00
# Store [Image, ImageTexture, Opacity]
new_canvas_layers.append([new_layer, new_layer_tex, 1])
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.undo_redo.add_do_property(c, "layers", new_canvas_layers)
Global.undo_redo.add_undo_property(c, "layers", c.layers)
Changing layer order works again Started using a setter method for Global.current_layer
2020-02-29 22:57:47 +00:00
Global.undo_redo.add_do_property(Global, "current_layer", Global.current_layer + 1)
Global.undo_redo.add_do_property(Global, "layers", new_layers)
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.undo_redo.add_undo_property(Global, "current_layer", Global.current_layer)
Global.undo_redo.add_undo_property(Global, "layers", Global.layers)
Global.undo_redo.add_undo_method(Global, "undo", [Global.canvas])
Global.undo_redo.add_do_method(Global, "redo", [Global.canvas])
Global.undo_redo.commit_action()
func _on_RemoveLayer_pressed() -> void:
Implemented Remove Layer - Doesn't work properly yet
2020-02-22 15:00:39 +00:00
var new_layers : Array = Global.layers.duplicate()
new_layers.remove(Global.current_layer)
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.undos += 1
Global.undo_redo.create_action("Remove Layer")
Fixed crash when removing the first layer Global.current_layer was being set to -1
2020-03-08 19:25:09 +00:00
if Global.current_layer > 0:
Global.undo_redo.add_do_property(Global, "current_layer", Global.current_layer - 1)
else:
Global.undo_redo.add_do_property(Global, "current_layer", Global.current_layer)
Implemented Remove Layer - Doesn't work properly yet
2020-02-22 15:00:39 +00:00
for c in Global.canvases:
var new_canvas_layers : Array = c.layers.duplicate()
new_canvas_layers.remove(Global.current_layer)
Global.undo_redo.add_do_property(c, "layers", new_canvas_layers)
Global.undo_redo.add_undo_property(c, "layers", c.layers)
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Changing layer order works again Started using a setter method for Global.current_layer
2020-02-29 22:57:47 +00:00
Global.undo_redo.add_do_property(Global, "layers", new_layers)
Implemented Remove Layer - Doesn't work properly yet
2020-02-22 15:00:39 +00:00
Global.undo_redo.add_undo_property(Global, "current_layer", Global.current_layer)
Use setter method for layers to update the UI Instead of updating it in undo and redo methods
2020-02-28 01:27:22 +00:00
Global.undo_redo.add_undo_property(Global, "layers", Global.layers)
Global.undo_redo.add_do_method(Global, "redo", [Global.canvas])
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.undo_redo.add_undo_method(Global, "undo", [Global.canvas])
Global.undo_redo.commit_action()
func change_layer_order(rate : int) -> void:
Changing layer order works again Started using a setter method for Global.current_layer
2020-02-29 22:57:47 +00:00
var change = Global.current_layer + rate
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Changing layer order works again Started using a setter method for Global.current_layer
2020-02-29 22:57:47 +00:00
var new_layers : Array = Global.layers.duplicate()
var temp = new_layers[Global.current_layer]
new_layers[Global.current_layer] = new_layers[change]
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
new_layers[change] = temp
Global.undo_redo.create_action("Change Layer Order")
Changing layer order works again Started using a setter method for Global.current_layer
2020-02-29 22:57:47 +00:00
for c in Global.canvases:
var new_layers_canvas : Array = c.layers.duplicate()
var temp_canvas = new_layers_canvas[Global.current_layer]
new_layers_canvas[Global.current_layer] = new_layers_canvas[change]
new_layers_canvas[change] = temp_canvas
Global.undo_redo.add_do_property(c, "layers", new_layers_canvas)
Global.undo_redo.add_undo_property(c, "layers", c.layers)
Global.undo_redo.add_do_property(Global, "current_layer", change)
Global.undo_redo.add_do_property(Global, "layers", new_layers)
Global.undo_redo.add_undo_property(Global, "layers", Global.layers)
Global.undo_redo.add_undo_property(Global, "current_layer", Global.current_layer)
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.undo_redo.add_undo_method(Global, "undo", [Global.canvas])
Global.undo_redo.add_do_method(Global, "redo", [Global.canvas])
Global.undo_redo.commit_action()
func _on_MergeDownLayer_pressed() -> void:
Merging layers works This should be all of the layer functionality restored. Frame functionality will soon follow.
2020-02-29 23:43:48 +00:00
var new_layers : Array = Global.layers.duplicate()
Changing layer order works again Started using a setter method for Global.current_layer
2020-02-29 22:57:47 +00:00
new_layers.remove(Global.current_layer)
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.undos += 1
Global.undo_redo.create_action("Merge Layer")
Merging layers works This should be all of the layer functionality restored. Frame functionality will soon follow.
2020-02-29 23:43:48 +00:00
for c in Global.canvases:
var new_layers_canvas : Array = c.layers.duplicate()
Fixed issues with merging layers
2020-03-28 13:56:01 +00:00
var selected_layer := Image.new()
selected_layer.copy_from(new_layers_canvas[Global.current_layer][0])
selected_layer.lock()
Merging layers works This should be all of the layer functionality restored. Frame functionality will soon follow.
2020-02-29 23:43:48 +00:00
if c.layers[Global.current_layer][2] < 1: # If we have layer transparency
for xx in selected_layer.get_size().x:
for yy in selected_layer.get_size().y:
var pixel_color : Color = selected_layer.get_pixel(xx, yy)
Fixed issues with merging layers
2020-03-28 13:56:01 +00:00
var alpha : float = pixel_color.a * c.layers[Global.current_layer][2]
Merging layers works This should be all of the layer functionality restored. Frame functionality will soon follow.
2020-02-29 23:43:48 +00:00
selected_layer.set_pixel(xx, yy, Color(pixel_color.r, pixel_color.g, pixel_color.b, alpha))
var new_layer := Image.new()
new_layer.copy_from(c.layers[Global.current_layer - 1][0])
new_layer.lock()
c.blend_rect(new_layer, selected_layer, Rect2(c.position, c.size), Vector2.ZERO)
Fixed issues with merging layers
2020-03-28 13:56:01 +00:00
new_layers_canvas.remove(Global.current_layer)
Merging layers works This should be all of the layer functionality restored. Frame functionality will soon follow.
2020-02-29 23:43:48 +00:00
Global.undo_redo.add_do_property(c, "layers", new_layers_canvas)
Global.undo_redo.add_do_property(c.layers[Global.current_layer - 1][0], "data", new_layer.data)
Global.undo_redo.add_undo_property(c, "layers", c.layers)
Global.undo_redo.add_undo_property(c.layers[Global.current_layer - 1][0], "data", c.layers[Global.current_layer - 1][0].data)
Global.undo_redo.add_do_property(Global, "current_layer", Global.current_layer - 1)
Global.undo_redo.add_do_property(Global, "layers", new_layers)
Global.undo_redo.add_undo_property(Global, "layers", Global.layers)
Global.undo_redo.add_undo_property(Global, "current_layer", Global.current_layer)
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Fixed issue with merging layers & undoing, and then drawing again
2020-03-22 00:38:39 +00:00
Global.undo_redo.add_undo_method(Global, "undo", Global.canvases)
Global.undo_redo.add_do_method(Global, "redo", Global.canvases)
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.undo_redo.commit_action()
Fixed crash when creating a new image and a layer had opacity less than 100% Caused in CreateNewImage.gd, Global.current_layer = 0 should be under Global.canvas gets set to a new canvas, and after its _ready() method gets executed. The crash occurred when a layer above 0 had transparency less than 100, and a new image was created. _on_OpacitySlider_value_changed() in AnimationTimeline.gd was executed on the old canvas right before it was destroyed, while Global.layers had been cleared. Also removed _on_OpacitySlider_value_changed() from Main.gd, it served no purpose there.
2020-04-11 02:36:51 +00:00
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
func _on_OpacitySlider_value_changed(value) -> void:
Store layer visibility on Global.layers instead This way, toggling visibility in a layers works for all frames in that layer.
2020-01-19 18:03:32 +00:00
Global.canvas.layers[Global.current_layer][2] = value / 100
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.layer_opacity_slider.value = value
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Global.layer_opacity_slider.value = value
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.layer_opacity_spinbox.value = value
Global.canvas.update()
Onion skinning settings have been moved to a popup window You can open the settings from a new button next to the onion settings button.
2020-03-31 16:14:13 +00:00
Basic UI for animation frame tags You can add tags by right clicking on a cel and selecting "Add Frame Tag". No tag modifying and deletion is implemented yet. I'm using a different ScrollContainer for the tags, which gets updated everytime the main timeline ScrollContainer gets updated. I hide its sliders from its theme, wish there was a more straightforward way.
2020-04-02 00:29:14 +00:00
func _on_OnionSkinningSettings_popup_hide() -> void:
Global.can_draw = true
Copy permalink