huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 23:49:47 +00:00
Code Issues Wiki Activity
Pixelorama/src/UI/Timeline/AnimationTimeline.gd

502 lines
23 KiB
GDScript3
Raw Normal View History

Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
extends Panel
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var last_frame := 0
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Big UI overhaul - added PanelContainers to group similar elements Removed separators entirely. Also made the AnimationTimeline have a StyleBoxFlat of its own, which we use to expand its margin top to cover the little space left because of the VSplitContainer. We also use a TextureRect as a fake VSplitContainer grabber.
2020-05-05 21:55:17 +00:00
var timeline_scroll : ScrollContainer
var tag_scroll_container : ScrollContainer
Make FPS project-specific and store it in the pxo files
2020-12-17 00:20:47 +00:00
var fps_spinbox : SpinBox
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
Changes to scripts to follow GDScript style guide Please read here for more info: https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/gdscript_styleguide.html This commit does not add/change any new/existing features.
2020-05-01 17:47:10 +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 _ready() -> void:
Big UI overhaul - added PanelContainers to group similar elements Removed separators entirely. Also made the AnimationTimeline have a StyleBoxFlat of its own, which we use to expand its margin top to cover the little space left because of the VSplitContainer. We also use a TextureRect as a fake VSplitContainer grabber.
2020-05-05 21:55:17 +00:00
timeline_scroll = Global.find_node_by_name(self, "TimelineScroll")
tag_scroll_container = Global.find_node_by_name(self, "TagScroll")
Make FPS project-specific and store it in the pxo files
2020-12-17 00:20:47 +00:00
fps_spinbox = find_node("FPSValue")
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
timeline_scroll.get_h_scrollbar().connect("value_changed", self, "_h_scroll_changed")
Fixed FPS not being updated when Pixelorama first runs
2020-12-17 00:52:13 +00:00
yield(get_tree(), "idle_frame")
Make FPS project-specific and store it in the pxo files
2020-12-17 00:20:47 +00:00
Global.animation_timer.wait_time = 1 / Global.current_project.fps
Fixed FPS not being updated when Pixelorama first runs
2020-12-17 00:52:13 +00:00
fps_spinbox.value = Global.current_project.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:
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
var frame : Frame = Global.canvas.new_empty_frame()
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var new_frames : Array = Global.current_project.frames.duplicate()
var new_layers : Array = Global.current_project.layers.duplicate()
Frame properties (#357) * Sync for my local files to my repository * This is frame properties update, it works but I can't be stored while saving or loading and that makes crashes just the beggining :) * I forgot this files :P * Frame Properties update. * Updating frame properties * Update Translations.pot * Changes to CanvasPreview and CelButton change
2020-10-19 14:57:40 +00:00
new_frames.insert(Global.current_project.current_frame + 1, frame)
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
# Loop through the array to create new classes for each element, so that they
# won't be the same as the original array's classes. Needed for undo/redo to work properly.
for i in new_layers.size():
var new_linked_cels = new_layers[i].linked_cels.duplicate()
new_layers[i] = Layer.new(new_layers[i].name, new_layers[i].visible, new_layers[i].locked, new_layers[i].frame_container, new_layers[i].new_cels_linked, new_linked_cels)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
for l_i in range(new_layers.size()):
if new_layers[l_i].new_cels_linked: # If the link button is pressed
new_layers[l_i].linked_cels.append(frame)
frame.cels[l_i].image = new_layers[l_i].linked_cels[0].cels[l_i].image
frame.cels[l_i].image_texture = new_layers[l_i].linked_cels[0].cels[l_i].image_texture
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undos += 1
Global.current_project.undo_redo.create_action("Add Frame")
Global.current_project.undo_redo.add_do_method(Global, "redo")
Global.current_project.undo_redo.add_undo_method(Global, "undo")
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "frames", new_frames)
Frame properties (#357) * Sync for my local files to my repository * This is frame properties update, it works but I can't be stored while saving or loading and that makes crashes just the beggining :) * I forgot this files :P * Frame Properties update. * Updating frame properties * Update Translations.pot * Changes to CanvasPreview and CelButton change
2020-10-19 14:57:40 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "current_frame", Global.current_project.current_frame + 1)
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "layers", new_layers)
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_undo_property(Global.current_project, "frames", Global.current_project.frames)
Frame properties (#357) * Sync for my local files to my repository * This is frame properties update, it works but I can't be stored while saving or loading and that makes crashes just the beggining :) * I forgot this files :P * Frame Properties update. * Updating frame properties * Update Translations.pot * Changes to CanvasPreview and CelButton change
2020-10-19 14:57:40 +00:00
Global.current_project.undo_redo.add_undo_property(Global.current_project, "current_frame", Global.current_project.current_frame )
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_undo_property(Global.current_project, "layers", Global.current_project.layers)
Global.current_project.undo_redo.commit_action()
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +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
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:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
if Global.current_project.frames.size() == 1:
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
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:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
frame = Global.current_project.current_frame
Made pxo saving a bit safer It now first attempts to serialize the project data and turn them to JSON, and then opens the file. This is a lto safer because, if a crash happens in the serialization, the file is not already open, and therefore it does not get corrupt. Earlier, if a crash happened, the file would be empty. This meant that if that file existed previously, all of the data would be lost.
2020-10-20 00:27:38 +00:00
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var frame_to_delete : Frame = Global.current_project.frames[frame]
var new_frames : Array = Global.current_project.frames.duplicate()
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
new_frames.erase(frame_to_delete)
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var current_frame := Global.current_project.current_frame
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
if current_frame > 0 && current_frame == new_frames.size(): # If it's the last frame
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
current_frame -= 1
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var new_animation_tags := Global.current_project.animation_tags.duplicate()
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
# Loop through the tags to create new classes for them, so that they won't be the same
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
# as Global.current_project.animation_tags's classes. Needed for undo/redo to work properly.
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
for i in new_animation_tags.size():
new_animation_tags[i] = AnimationTag.new(new_animation_tags[i].name, new_animation_tags[i].color, new_animation_tags[i].from, new_animation_tags[i].to)
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:
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
if frame + 1 >= tag.from && frame + 1 <= tag.to:
if tag.from == tag.to: # 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:
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
tag.to -= 1
elif frame + 1 < tag.from:
tag.from -= 1
tag.to -= 1
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 linked cels existed when a frame got deleted, they now get removed from memory It basically loops through the layers and, if some cels are linked, they get deleted from the Global.layers array. Closes #218
2020-04-22 22:46:16 +00:00
# Check if one of the cels of the frame is linked
# if they are, unlink them too
# this prevents removed cels being kept in linked memory
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var new_layers : Array = Global.current_project.layers.duplicate()
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
# Loop through the array to create new classes for each element, so that they
# won't be the same as the original array's classes. Needed for undo/redo to work properly.
for i in new_layers.size():
var new_linked_cels = new_layers[i].linked_cels.duplicate()
new_layers[i] = Layer.new(new_layers[i].name, new_layers[i].visible, new_layers[i].locked, new_layers[i].frame_container, new_layers[i].new_cels_linked, new_linked_cels)
If linked cels existed when a frame got deleted, they now get removed from memory It basically loops through the layers and, if some cels are linked, they get deleted from the Global.layers array. Closes #218
2020-04-22 22:46:16 +00:00
for layer in new_layers:
Use a new Layer class to handle layer information This replaces the old Global.layers nested array mess, and makes the code easier to read and to understand.
2020-06-01 13:42:53 +00:00
for linked in layer.linked_cels:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
if linked == Global.current_project.frames[frame]:
Use a new Layer class to handle layer information This replaces the old Global.layers nested array mess, and makes the code easier to read and to understand.
2020-06-01 13:42:53 +00:00
layer.linked_cels.erase(linked)
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undos += 1
Global.current_project.undo_redo.create_action("Remove Frame")
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "frames", new_frames)
Global.current_project.undo_redo.add_do_property(Global.current_project, "current_frame", current_frame)
Global.current_project.undo_redo.add_do_property(Global.current_project, "animation_tags", new_animation_tags)
Global.current_project.undo_redo.add_do_property(Global.current_project, "layers", new_layers)
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_undo_property(Global.current_project, "frames", Global.current_project.frames)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "current_frame", Global.current_project.current_frame)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "animation_tags", Global.current_project.animation_tags)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "layers", Global.current_project.layers)
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_method(Global, "redo")
Global.current_project.undo_redo.add_undo_method(Global, "undo")
Global.current_project.undo_redo.commit_action()
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +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
func _on_CopyFrame_pressed(frame := -1) -> void:
if frame == -1:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
frame = Global.current_project.current_frame
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
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
var new_frame := Frame.new()
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var new_frames := Global.current_project.frames.duplicate()
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
new_frames.insert(frame + 1, new_frame)
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
for cel in Global.current_project.frames[frame].cels: # Copy every cel
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
var sprite := Image.new()
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
sprite.copy_from(cel.image)
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
sprite.lock()
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
new_frame.cels.append(Cel.new(sprite, cel.opacity))
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var new_animation_tags := Global.current_project.animation_tags.duplicate()
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
# Loop through the tags to create new classes for them, so that they won't be the same
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
# as Global.current_project.animation_tags's classes. Needed for undo/redo to work properly.
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
for i in new_animation_tags.size():
new_animation_tags[i] = AnimationTag.new(new_animation_tags[i].name, new_animation_tags[i].color, new_animation_tags[i].from, new_animation_tags[i].to)
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:
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
if frame + 1 >= tag.from && frame + 1 <= tag.to:
tag.to += 1
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undos += 1
Global.current_project.undo_redo.create_action("Add Frame")
Global.current_project.undo_redo.add_do_method(Global, "redo")
Global.current_project.undo_redo.add_undo_method(Global, "undo")
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "frames", new_frames)
Global.current_project.undo_redo.add_do_property(Global.current_project, "current_frame", frame + 1)
Global.current_project.undo_redo.add_do_property(Global.current_project, "animation_tags", new_animation_tags)
for i in range(Global.current_project.layers.size()):
for child in Global.current_project.layers[i].frame_container.get_children():
Global.current_project.undo_redo.add_do_property(child, "pressed", false)
Global.current_project.undo_redo.add_undo_property(child, "pressed", child.pressed)
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_undo_property(Global.current_project, "frames", Global.current_project.frames)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "current_frame", frame)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "animation_tags", Global.current_project.animation_tags)
Global.current_project.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
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()
Add buttons for moving the current frame left or right (#344) Add dark theme sprite Add light theme sprite Co-authored-by: Laurenz Reinthaler <reinthalerlaurenz@gmail.com>
2020-10-03 19:46:24 +00:00
func _on_MoveLeft_pressed() -> void:
var frame : int = Global.current_project.current_frame
if frame == 0:
return
Global.current_project.layers[Global.current_project.current_layer].frame_container.get_child(frame).change_frame_order(-1)
func _on_MoveRight_pressed() -> void:
var frame : int = Global.current_project.current_frame
if frame == last_frame:
return
Global.current_project.layers[Global.current_project.current_layer].frame_container.get_child(frame).change_frame_order(1)
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
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()
Attempting to fix the mess created by renaming files
2020-04-30 14:14:31 +00:00
var texture_button : TextureRect = Global.onion_skinning_button.get_child(0)
Added texture for the onion skinning button for when it's disabled
2020-04-03 12:34:16 +00:00
if Global.onion_skinning:
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(texture_button, "onion_skinning.png")
Added texture for the onion skinning button for when it's disabled
2020-04-03 12:34:16 +00:00
else:
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(texture_button, "onion_skinning_off.png")
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 Onion Skinning Settings dialog bigger - Fixes #220
2020-04-23 20:25:12 +00:00
$OnionSkinningSettings.popup(Rect2(Global.onion_skinning_button.rect_global_position.x - $OnionSkinningSettings.rect_size.x - 16, 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:
Attempting to fix the mess created by renaming files
2020-04-30 14:14:31 +00:00
var texture_button : TextureRect = Global.loop_animation_button.get_child(0)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
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
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(texture_button, "loop.png")
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
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(texture_button, "loop_pingpong.png")
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
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(texture_button, "loop_none.png")
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:
Attempting to fix the mess created by renaming files
2020-04-30 14:14:31 +00:00
if button_pressed:
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(Global.play_forward.get_child(0), "pause.png")
Attempting to fix the mess created by renaming files
2020-04-30 14:14:31 +00:00
else:
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(Global.play_forward.get_child(0), "play.png")
Attempting to fix the mess created by renaming files
2020-04-30 14:14:31 +00:00
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:
Attempting to fix the mess created by renaming files
2020-04-30 14:14:31 +00:00
if button_pressed:
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(Global.play_backwards.get_child(0), "pause.png")
Attempting to fix the mess created by renaming files
2020-04-30 14:14:31 +00:00
else:
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(Global.play_backwards.get_child(0), "play_backwards.png")
Attempting to fix the mess created by renaming files
2020-04-30 14:14:31 +00:00
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:
Fixed stack overflow crash when the user set the loop mode to ping-pong and played the animation on a single frame with its own tag The crash only occured when it was one frame in that tag, but there were also more frames in general. A very rare scenario.
2020-05-09 18:38:28 +00:00
if first_frame == last_frame:
$AnimationTimer.stop()
return
Make FPS project-specific and store it in the pxo files
2020-12-17 00:20:47 +00:00
var fps = Global.current_project.fps
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
if animation_forward:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
if Global.current_project.current_frame < last_frame:
Global.current_project.current_frame += 1
Put frame duration as a member of the Frame class Instead of having a frame_duration[] array in the Project class. This makes the code much more readable and understandable, using less lines of code and, by avoiding an extra array, we also avoid potential out-of-bound array crashes. The functionality for the user has not changed, and by testing so far I didn't find any issues.
2020-12-16 20:54:08 +00:00
Global.animation_timer.wait_time = Global.current_project.frames[Global.current_project.current_frame].duration * (1/fps)
Global.animation_timer.start() # Change the frame, change the wait time and start a cycle, this is the best way to do it
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.current_frame = first_frame
Put frame duration as a member of the Frame class Instead of having a frame_duration[] array in the Project class. This makes the code much more readable and understandable, using less lines of code and, by avoiding an extra array, we also avoid potential out-of-bound array crashes. The functionality for the user has not changed, and by testing so far I didn't find any issues.
2020-12-16 20:54:08 +00:00
Global.animation_timer.wait_time = Global.current_project.frames[Global.current_project.current_frame].duration * (1/fps)
Frame properties (#357) * Sync for my local files to my repository * This is frame properties update, it works but I can't be stored while saving or loading and that makes crashes just the beggining :) * I forgot this files :P * Frame Properties update. * Updating frame properties * Update Translations.pot * Changes to CanvasPreview and CelButton change
2020-10-19 14:57:40 +00:00
Global.animation_timer.start()
[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:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
if Global.current_project.current_frame > first_frame:
Global.current_project.current_frame -= 1
Put frame duration as a member of the Frame class Instead of having a frame_duration[] array in the Project class. This makes the code much more readable and understandable, using less lines of code and, by avoiding an extra array, we also avoid potential out-of-bound array crashes. The functionality for the user has not changed, and by testing so far I didn't find any issues.
2020-12-16 20:54:08 +00:00
Global.animation_timer.wait_time = Global.current_project.frames[Global.current_project.current_frame].duration * (1/fps)
Frame properties (#357) * Sync for my local files to my repository * This is frame properties update, it works but I can't be stored while saving or loading and that makes crashes just the beggining :) * I forgot this files :P * Frame Properties update. * Updating frame properties * Update Translations.pot * Changes to CanvasPreview and CelButton change
2020-10-19 14:57:40 +00:00
Global.animation_timer.start()
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.current_frame = last_frame
Put frame duration as a member of the Frame class Instead of having a frame_duration[] array in the Project class. This makes the code much more readable and understandable, using less lines of code and, by avoiding an extra array, we also avoid potential out-of-bound array crashes. The functionality for the user has not changed, and by testing so far I didn't find any issues.
2020-12-16 20:54:08 +00:00
Global.animation_timer.wait_time = Global.current_project.frames[Global.current_project.current_frame].duration * (1/fps)
Frame properties (#357) * Sync for my local files to my repository * This is frame properties update, it works but I can't be stored while saving or loading and that makes crashes just the beggining :) * I forgot this files :P * Frame Properties update. * Updating frame properties * Update Translations.pot * Changes to CanvasPreview and CelButton change
2020-10-19 14:57:40 +00:00
Global.animation_timer.start()
[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:
Fixed stack overflow crash when the user set the loop mode to ping-pong and played the animation on a single frame with its own tag The crash only occured when it was one frame in that tag, but there were also more frames in general. A very rare scenario.
2020-05-09 18:38:28 +00:00
first_frame = 0
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
last_frame = Global.current_project.frames.size() - 1
Fixed stack overflow crash when the user set the loop mode to ping-pong and played the animation on a single frame with its own tag The crash only occured when it was one frame in that tag, but there were also more frames in general. A very rare scenario.
2020-05-09 18:38:28 +00:00
if Global.play_only_tags:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
for tag in Global.current_project.animation_tags:
if Global.current_project.current_frame + 1 >= tag.from && Global.current_project.current_frame + 1 <= tag.to:
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
first_frame = tag.from - 1
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
last_frame = min(Global.current_project.frames.size() - 1, tag.to - 1)
Fixed stack overflow crash when the user set the loop mode to ping-pong and played the animation on a single frame with its own tag The crash only occured when it was one frame in that tag, but there were also more frames in general. A very rare scenario.
2020-05-09 18:38:28 +00:00
if first_frame == last_frame:
if forward_dir:
Global.play_forward.pressed = false
else:
Global.play_backwards.pressed = false
return
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
if forward_dir:
On play_animation(), disconnect the other button's toggled signal temporarily - This fixes #219
2020-04-23 21:10:21 +00:00
Global.play_backwards.disconnect("toggled", self, "_on_PlayBackwards_toggled")
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
Global.play_backwards.pressed = false
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(Global.play_backwards.get_child(0), "play_backwards.png")
On play_animation(), disconnect the other button's toggled signal temporarily - This fixes #219
2020-04-23 21:10:21 +00:00
Global.play_backwards.connect("toggled", self, "_on_PlayBackwards_toggled")
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
else:
On play_animation(), disconnect the other button's toggled signal temporarily - This fixes #219
2020-04-23 21:10:21 +00:00
Global.play_forward.disconnect("toggled", self, "_on_PlayForward_toggled")
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
Global.play_forward.pressed = false
Changing a button's texturerect child no longer requires the theme in its file path Instead, it automatically finds its path, adds the new file name and loads the new texture.
2020-05-06 12:19:53 +00:00
Global.change_button_texturerect(Global.play_forward.get_child(0), "play.png")
On play_animation(), disconnect the other button's toggled signal temporarily - This fixes #219
2020-04-23 21:10:21 +00:00
Global.play_forward.connect("toggled", self, "_on_PlayForward_toggled")
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
if play:
Put frame duration as a member of the Frame class Instead of having a frame_duration[] array in the Project class. This makes the code much more readable and understandable, using less lines of code and, by avoiding an extra array, we also avoid potential out-of-bound array crashes. The functionality for the user has not changed, and by testing so far I didn't find any issues.
2020-12-16 20:54:08 +00:00
Global.animation_timer.set_one_shot(true) # The wait_time can't change correctly if it is playing
var duration : float = Global.current_project.frames[Global.current_project.current_frame].duration
Make FPS project-specific and store it in the pxo files
2020-12-17 00:20:47 +00:00
var fps = Global.current_project.fps
Put frame duration as a member of the Frame class Instead of having a frame_duration[] array in the Project class. This makes the code much more readable and understandable, using less lines of code and, by avoiding an extra array, we also avoid potential out-of-bound array crashes. The functionality for the user has not changed, and by testing so far I didn't find any issues.
2020-12-16 20:54:08 +00:00
Global.animation_timer.wait_time = duration * (1 / fps)
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
Global.animation_timer.start()
animation_forward = forward_dir
else:
Global.animation_timer.stop()
func _on_NextFrame_pressed() -> void:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
if Global.current_project.current_frame < Global.current_project.frames.size() - 1:
Global.current_project.current_frame += 1
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 _on_PreviousFrame_pressed() -> void:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
if Global.current_project.current_frame > 0:
Global.current_project.current_frame -= 1
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 _on_LastFrame_pressed() -> void:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.current_frame = Global.current_project.frames.size() - 1
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 _on_FirstFrame_pressed() -> void:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.current_frame = 0
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
Changes to scripts to follow GDScript style guide Please read here for more info: https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/gdscript_styleguide.html This commit does not add/change any new/existing features.
2020-05-01 17:47:10 +00:00
func _on_FPSValue_value_changed(value : float) -> void:
Make FPS project-specific and store it in the pxo files
2020-12-17 00:20:47 +00:00
Global.current_project.fps = float(value)
Global.animation_timer.wait_time = 1 / Global.current_project.fps
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Changes to scripts to follow GDScript style guide Please read here for more info: https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/gdscript_styleguide.html This commit does not add/change any new/existing features.
2020-05-01 17:47:10 +00:00
func _on_PastOnionSkinning_value_changed(value : float) -> void:
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.onion_skinning_past_rate = int(value)
Global.canvas.update()
Changes to scripts to follow GDScript style guide Please read here for more info: https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/gdscript_styleguide.html This commit does not add/change any new/existing features.
2020-05-01 17:47:10 +00:00
func _on_FutureOnionSkinning_value_changed(value : float) -> void:
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Global.onion_skinning_future_rate = int(value)
Global.canvas.update()
Changes to scripts to follow GDScript style guide Please read here for more info: https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/gdscript_styleguide.html This commit does not add/change any new/existing features.
2020-05-01 17:47:10 +00:00
func _on_BlueRedMode_toggled(button_pressed : bool) -> void:
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
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
Changes to scripts to follow GDScript style guide Please read here for more info: https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/gdscript_styleguide.html This commit does not add/change any new/existing features.
2020-05-01 17:47:10 +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
# Layer buttons
func add_layer(is_new := true) -> void:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var new_layers : Array = Global.current_project.layers.duplicate()
Use a new Layer class to handle layer information This replaces the old Global.layers nested array mess, and makes the code easier to read and to understand.
2020-06-01 13:42:53 +00:00
var l := Layer.new()
if !is_new: # Clone layer
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
l.name = Global.current_project.layers[Global.current_project.current_layer].name + " (" + tr("copy") + ")"
Use a new Layer class to handle layer information This replaces the old Global.layers nested array mess, and makes the code easier to read and to understand.
2020-06-01 13:42:53 +00:00
new_layers.append(l)
[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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undos += 1
Global.current_project.undo_redo.create_action("Add 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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
for f in Global.current_project.frames:
Layer images are now unique to each frame
2020-02-20 00:14:15 +00:00
var new_layer := Image.new()
if is_new:
Moved size variable from Canvas.gd to Project.gd
2020-06-04 20:20:20 +00:00
new_layer.create(Global.current_project.size.x, Global.current_project.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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
new_layer.copy_from(f.cels[Global.current_project.current_layer].image)
Layer images are now unique to each frame
2020-02-20 00:14:15 +00:00
new_layer.lock()
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
var new_cels : Array = f.cels.duplicate()
new_cels.append(Cel.new(new_layer, 1))
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(f, "cels", new_cels)
Global.current_project.undo_redo.add_undo_property(f, "cels", f.cels)
[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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "current_layer", Global.current_project.current_layer + 1)
Global.current_project.undo_redo.add_do_property(Global.current_project, "layers", new_layers)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "current_layer", Global.current_project.current_layer)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "layers", Global.current_project.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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_undo_method(Global, "undo")
Global.current_project.undo_redo.add_do_method(Global, "redo")
Global.current_project.undo_redo.commit_action()
[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
Changes to scripts to follow GDScript style guide Please read here for more info: https://docs.godotengine.org/en/latest/getting_started/scripting/gdscript/gdscript_styleguide.html This commit does not add/change any new/existing features.
2020-05-01 17:47:10 +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_RemoveLayer_pressed() -> void:
Change canvas and timeline when a tab is being pressed
2020-06-05 01:30:31 +00:00
if Global.current_project.layers.size() == 1:
return
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var new_layers : Array = Global.current_project.layers.duplicate()
new_layers.remove(Global.current_project.current_layer)
Global.current_project.undos += 1
Global.current_project.undo_redo.create_action("Remove Layer")
if Global.current_project.current_layer > 0:
Global.current_project.undo_redo.add_do_property(Global.current_project, "current_layer", Global.current_project.current_layer - 1)
Fixed crash when removing the first layer Global.current_layer was being set to -1
2020-03-08 19:25:09 +00:00
else:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "current_layer", Global.current_project.current_layer)
Implemented Remove Layer - Doesn't work properly yet
2020-02-22 15:00:39 +00:00
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
for f in Global.current_project.frames:
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
var new_cels : Array = f.cels.duplicate()
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
new_cels.remove(Global.current_project.current_layer)
Global.current_project.undo_redo.add_do_property(f, "cels", new_cels)
Global.current_project.undo_redo.add_undo_property(f, "cels", f.cels)
[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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "layers", new_layers)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "current_layer", Global.current_project.current_layer)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "layers", Global.current_project.layers)
Global.current_project.undo_redo.add_do_method(Global, "redo")
Global.current_project.undo_redo.add_undo_method(Global, "undo")
Global.current_project.undo_redo.commit_action()
[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
On merge layer, linked cels on the bottom layer will become unlinked if the top cels have content Works with UndoRedo too
2020-04-22 13:56:03 +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 change_layer_order(rate : int) -> void:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var change = Global.current_project.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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var new_layers : Array = Global.current_project.layers.duplicate()
var temp = new_layers[Global.current_project.current_layer]
new_layers[Global.current_project.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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.create_action("Change Layer Order")
for f in Global.current_project.frames:
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
var new_cels : Array = f.cels.duplicate()
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var temp_canvas = new_cels[Global.current_project.current_layer]
new_cels[Global.current_project.current_layer] = new_cels[change]
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
new_cels[change] = temp_canvas
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(f, "cels", new_cels)
Global.current_project.undo_redo.add_undo_property(f, "cels", f.cels)
Changing layer order works again Started using a setter method for Global.current_layer
2020-02-29 22:57:47 +00:00
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "current_layer", change)
Global.current_project.undo_redo.add_do_property(Global.current_project, "layers", new_layers)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "layers", Global.current_project.layers)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "current_layer", Global.current_project.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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_undo_method(Global, "undo")
Global.current_project.undo_redo.add_do_method(Global, "redo")
Global.current_project.undo_redo.commit_action()
[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
On merge layer, linked cels on the bottom layer will become unlinked if the top cels have content Works with UndoRedo too
2020-04-22 13:56:03 +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_MergeDownLayer_pressed() -> void:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var new_layers : Array = Global.current_project.layers.duplicate()
Added AnimationTag class Replaces nested Global.animation_tags arrays. Also replaced array.duplicate(true) with looping through the array and creating a new class for each array element, because duplicate(true) does not create new classes, unfortunately, which was causing issues with undo/redo.
2020-06-02 02:14:05 +00:00
# Loop through the array to create new classes for each element, so that they
# won't be the same as the original array's classes. Needed for undo/redo to work properly.
for i in new_layers.size():
var new_linked_cels = new_layers[i].linked_cels.duplicate()
new_layers[i] = Layer.new(new_layers[i].name, new_layers[i].visible, new_layers[i].locked, new_layers[i].frame_container, new_layers[i].new_cels_linked, new_linked_cels)
[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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undos += 1
Global.current_project.undo_redo.create_action("Merge Layer")
for f in Global.current_project.frames:
Made a Frame class, no longer use multiple Canvases for multiple frames The Canvas is now single node, instead of having multiple canvases for each frame. This should also be a performance optimization, since there are less canvas nodes, so there are less _input() calls. It should also fix a rare Undo/Redo issue with motion drawing and making lines. Could be unstable, needs more testing. As a side effect, the guides are now the same for all frames, so this should also close #246.
2020-06-02 23:14:24 +00:00
var new_cels : Array = f.cels.duplicate()
for i in new_cels.size():
new_cels[i] = Cel.new(new_cels[i].image, new_cels[i].opacity)
Fixed issues with merging layers
2020-03-28 13:56:01 +00:00
var selected_layer := Image.new()
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
selected_layer.copy_from(new_cels[Global.current_project.current_layer].image)
Fixed issues with merging layers
2020-03-28 13:56:01 +00:00
selected_layer.lock()
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
if f.cels[Global.current_project.current_layer].opacity < 1: # If we have layer transparency
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 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)
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
var alpha : float = pixel_color.a * f.cels[Global.current_project.current_layer].opacity
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()
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
new_layer.copy_from(f.cels[Global.current_project.current_layer - 1].image)
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
new_layer.lock()
Removed custom blend_rect() method from DrawingAlgos
2020-06-30 12:07:09 +00:00
new_layer.blend_rect(selected_layer, Rect2(Global.canvas.location, Global.current_project.size), Vector2.ZERO)
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
new_cels.remove(Global.current_project.current_layer)
if !selected_layer.is_invisible() and Global.current_project.layers[Global.current_project.current_layer - 1].linked_cels.size() > 1 and (f in Global.current_project.layers[Global.current_project.current_layer - 1].linked_cels):
new_layers[Global.current_project.current_layer - 1].linked_cels.erase(f)
new_cels[Global.current_project.current_layer - 1].image = new_layer
On merge layer, linked cels on the bottom layer will become unlinked if the top cels have content Works with UndoRedo too
2020-04-22 13:56:03 +00:00
else:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(f.cels[Global.current_project.current_layer - 1].image, "data", new_layer.data)
Global.current_project.undo_redo.add_undo_property(f.cels[Global.current_project.current_layer - 1].image, "data", f.cels[Global.current_project.current_layer - 1].image.data)
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_do_property(f, "cels", new_cels)
Global.current_project.undo_redo.add_undo_property(f, "cels", f.cels)
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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
new_layers.remove(Global.current_project.current_layer)
Global.current_project.undo_redo.add_do_property(Global.current_project, "current_layer", Global.current_project.current_layer - 1)
Global.current_project.undo_redo.add_do_property(Global.current_project, "layers", new_layers)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "layers", Global.current_project.layers)
Global.current_project.undo_redo.add_undo_property(Global.current_project, "current_layer", Global.current_project.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
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.undo_redo.add_undo_method(Global, "undo")
Global.current_project.undo_redo.add_do_method(Global, "redo")
Global.current_project.undo_redo.commit_action()
[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 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:
Created a Projects class A Project class contains project-specific data like name, undo_redo, frames, layers, tags and brushes. These variables have been moved from Global. This is the first step towards multiple tab support, where each tab will be a different Project.
2020-06-04 18:05:36 +00:00
Global.current_project.frames[Global.current_project.current_frame].cels[Global.current_project.current_layer].opacity = 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
Add buttons for moving the current frame left or right (#344) Add dark theme sprite Add light theme sprite Co-authored-by: Laurenz Reinthaler <reinthalerlaurenz@gmail.com>
2020-10-03 19:46:24 +00:00
Copy permalink