huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-08 19:39:50 +00:00
Code Issues Wiki Activity
Pixelorama/src/UI/Timeline/AnimationTimeline.gd

703 lines
26 KiB
GDScript3
Raw Normal View History

Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
extends Panel
Keep images unlocked after editing them - Should close #331 Not sure if this actually solves the issue or just makes it more rare, but I haven't been able to reproduce any PoolVector locking issues so far. The problem was that images were remained locked essentially all the time, which seemed to cause issues. Maybe other PoolVectors could not get locked?
2021-07-25 18:49:37 +00:00
var is_animation_running := false
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
You can now resize cels in the timeline by holding `Control` and scrolling with the mouse wheel. Addresses part of #306
2021-01-30 21:57:33 +00:00
var is_mouse_hover := false
var cel_size := 36 setget cel_size_changed
var min_cel_size := 36
var max_cel_size := 144
Merge onion skinning past and future into one script
2021-11-26 01:38:00 +00:00
var past_above_canvas := true
var future_above_canvas := true
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
Move some variables in AnimationTimeline No functional changes
2022-02-07 16:10:29 +00:00
onready var timeline_scroll: ScrollContainer = find_node("TimelineScroll")
onready var tag_scroll_container: ScrollContainer = find_node("TagScroll")
onready var fps_spinbox: SpinBox = find_node("FPSValue")
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
onready var onion_skinning_button: BaseButton = find_node("OnionSkinning")
onready var loop_animation_button: BaseButton = find_node("LoopAnim")
Moved some variables away from Global
2021-11-23 00:36:22 +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:
timeline_scroll.get_h_scrollbar().connect("value_changed", self, "_h_scroll_changed")
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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func _input(event: InputEvent) -> void:
You can now resize cels in the timeline by holding `Control` and scrolling with the mouse wheel. Addresses part of #306
2021-01-30 21:57:33 +00:00
var mouse_pos := get_global_mouse_position()
var timeline_rect := Rect2(rect_global_position, rect_size)
if timeline_rect.has_point(mouse_pos):
if Input.is_key_pressed(KEY_CONTROL):
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
self.cel_size += (
2 * int(event.is_action("zoom_in"))
- 2 * int(event.is_action("zoom_out"))
)
You can now resize cels in the timeline by holding `Control` and scrolling with the mouse wheel. Addresses part of #306
2021-01-30 21:57:33 +00:00
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func _h_scroll_changed(value: float) -> void:
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
# Let the main timeline ScrollContainer affect the tag ScrollContainer too
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
tag_scroll_container.get_child(0).rect_min_size.x = (
timeline_scroll.get_child(0).rect_size.x
- 212
)
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
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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
func cel_size_changed(value: int) -> void:
You can now resize cels in the timeline by holding `Control` and scrolling with the mouse wheel. Addresses part of #306
2021-01-30 21:57:33 +00:00
cel_size = clamp(value, min_cel_size, max_cel_size)
for layer_button in Global.layers_container.get_children():
layer_button.rect_min_size.y = cel_size
layer_button.rect_size.y = cel_size
Fix a memory leak coming from the Layer class Removed the "frame_container" property from Layer.gd, which used to hold a reference to a node, leading to orphan nodes being created and never freed. Memory management seems to be working okay now. Previously, every time the user made a change, memory kept going up and never coming down. Now, data that can never be recovered, like undo data that have been rewritten in history, are also removed from memory.
2021-12-23 17:58:07 +00:00
for container in Global.frames_container.get_children():
for cel_button in container.get_children():
You can now resize cels in the timeline by holding `Control` and scrolling with the mouse wheel. Addresses part of #306
2021-01-30 21:57:33 +00:00
cel_button.rect_min_size.x = cel_size
cel_button.rect_min_size.y = cel_size
cel_button.rect_size.x = cel_size
cel_button.rect_size.y = cel_size
for frame_id in Global.frame_ids.get_children():
frame_id.rect_min_size.x = cel_size
frame_id.rect_size.x = cel_size
for tag_c in Global.tag_container.get_children():
Improvements to Animation Tags (#560) * Animation tag fix (a) fixed tag behavior in "Project.gd" * Animation tag fix (b) fixed tag behavior in "AnimationTimeline.gd" * Animation tag fix (c) fix top part of line not visible * Animation tag fix (d) a fix i forgot about earlier * added a randomizer... ... to auto select colors of new tags * Fix Tag scrolling without cels when scrolled on it * removed randomize() cause it's not needed
2021-11-16 22:21:29 +00:00
var tag_base_size = cel_size + 4
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var tag: AnimationTag = tag_c.tag
# Added 1 to answer to get starting position of next cel
tag_c.rect_position.x = (tag.from - 1) * tag_base_size + 1
var tag_size: int = tag.to - tag.from
# We dont need the 4 pixels at the end of last cel
tag_c.rect_min_size.x = (tag_size + 1) * tag_base_size - 4
# We dont need the 4 pixels at the end of last cel
tag_c.rect_size.x = (tag_size + 1) * tag_base_size - 4
You can now resize cels in the timeline by holding `Control` and scrolling with the mouse wheel. Addresses part of #306
2021-01-30 21:57:33 +00:00
tag_c.get_node("Line2D").points[2] = Vector2(tag_c.rect_min_size.x, 0)
tag_c.get_node("Line2D").points[3] = Vector2(tag_c.rect_min_size.x, 32)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
func add_frame() -> void:
Fixed project not having the correct size if the default image size has been changed in the Preferences Ideally, the new_empty_frame() method should be removed from Canvas and should probably go to Frame or Project.
2021-12-01 18:02:39 +00:00
var project: Project = Global.current_project
Move new_empty_frame() to Project.gd from Canvas.gd This commit also changes the behavior of the fill color. The new cels now only get filled with the Project.fill_color if they are on the bottom layer.
2021-12-01 18:50:50 +00:00
var frame: Frame = project.new_empty_frame()
Fixed project not having the correct size if the default image size has been changed in the Preferences Ideally, the new_empty_frame() method should be removed from Canvas and should probably go to Frame or Project.
2021-12-01 18:02:39 +00:00
var new_frames: Array = project.frames.duplicate()
Fix a memory leak coming from the Layer class Removed the "frame_container" property from Layer.gd, which used to hold a reference to a node, leading to orphan nodes being created and never freed. Memory management seems to be working okay now. Previously, every time the user made a change, memory kept going up and never coming down. Now, data that can never be recovered, like undo data that have been rewritten in history, are also removed from memory.
2021-12-23 17:58:07 +00:00
var new_layers: Array = project.duplicate_layers()
Fixed project not having the correct size if the default image size has been changed in the Preferences Ideally, the new_empty_frame() method should be removed from Canvas and should probably go to Frame or Project.
2021-12-01 18:02:39 +00:00
new_frames.insert(project.current_frame + 1, frame)
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()):
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
if new_layers[l_i].new_cels_linked: # If the link button is pressed
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_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
Fixed project not having the correct size if the default image size has been changed in the Preferences Ideally, the new_empty_frame() method should be removed from Canvas and should probably go to Frame or Project.
2021-12-01 18:02:39 +00:00
project.undos += 1
project.undo_redo.create_action("Add Frame")
Just one method for undo/redo in Global.gd
2021-12-02 00:22:32 +00:00
project.undo_redo.add_do_method(Global, "undo_or_redo", false)
project.undo_redo.add_undo_method(Global, "undo_or_redo", true)
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
Fixed project not having the correct size if the default image size has been changed in the Preferences Ideally, the new_empty_frame() method should be removed from Canvas and should probably go to Frame or Project.
2021-12-01 18:02:39 +00:00
project.undo_redo.add_do_property(project, "frames", new_frames)
project.undo_redo.add_do_property(project, "current_frame", project.current_frame + 1)
project.undo_redo.add_do_property(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
Fixed project not having the correct size if the default image size has been changed in the Preferences Ideally, the new_empty_frame() method should be removed from Canvas and should probably go to Frame or Project.
2021-12-01 18:02:39 +00:00
project.undo_redo.add_undo_property(project, "frames", project.frames)
project.undo_redo.add_undo_property(project, "current_frame", project.current_frame)
project.undo_redo.add_undo_property(project, "layers", project.layers)
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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
delete_frame(frame)
func delete_frame(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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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():
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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
)
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
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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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
Fix a memory leak coming from the Layer class Removed the "frame_container" property from Layer.gd, which used to hold a reference to a node, leading to orphan nodes being created and never freed. Memory management seems to be working okay now. Previously, every time the user made a change, memory kept going up and never coming down. Now, data that can never be recovered, like undo data that have been rewritten in history, are also removed from memory.
2021-12-23 17:58:07 +00:00
var new_layers: Array = Global.current_project.duplicate_layers()
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 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)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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
)
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)
Add a Delete Button and a Copy Button for frames (#202)
2020-04-15 17:59:49 +00:00
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Just one method for undo/redo in Global.gd
2021-12-02 00:22:32 +00:00
Global.current_project.undo_redo.add_do_method(Global, "undo_or_redo", false)
Global.current_project.undo_redo.add_undo_method(Global, "undo_or_redo", true)
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.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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
copy_frame(frame)
func copy_frame(frame := -1) -> void:
Fix content transformation not getting confirmed when changes were done to frames and layers Also fixes issue where frame/layer copying does not copy the transformed data
2021-07-08 17:46:56 +00:00
Global.canvas.selection.transform_content_confirm()
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
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()
Fix a memory leak coming from the Layer class Removed the "frame_container" property from Layer.gd, which used to hold a reference to a node, leading to orphan nodes being created and never freed. Memory management seems to be working okay now. Previously, every time the user made a change, memory kept going up and never coming down. Now, data that can never be recovered, like undo data that have been rewritten in history, are also removed from memory.
2021-12-23 17:58:07 +00:00
var new_layers: Array = Global.current_project.duplicate_layers()
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
Copy frame duration when cloning a frame
2021-12-31 02:05:04 +00:00
var prev_frame: Frame = Global.current_project.frames[frame]
for cel in prev_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)
Made cloning frames create linked cels if the linked cel button is toggled on - suggestion of #402
2021-07-22 00:10:00 +00:00
var sprite_texture := ImageTexture.new()
sprite_texture.create_from_image(sprite, 0)
new_frame.cels.append(Cel.new(sprite, cel.opacity, sprite_texture))
Copy frame duration when cloning a frame
2021-12-31 02:05:04 +00:00
new_frame.duration = prev_frame.duration
Made cloning frames create linked cels if the linked cel button is toggled on - suggestion of #402
2021-07-22 00:10:00 +00:00
for l_i in range(new_layers.size()):
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
if new_layers[l_i].new_cels_linked: # If the link button is pressed
Made cloning frames create linked cels if the linked cel button is toggled on - suggestion of #402
2021-07-22 00:10:00 +00:00
new_layers[l_i].linked_cels.append(new_frame)
new_frame.cels[l_i].image = new_layers[l_i].linked_cels[0].cels[l_i].image
new_frame.cels[l_i].image_texture = new_layers[l_i].linked_cels[0].cels[l_i].image_texture
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():
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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
)
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
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")
Just one method for undo/redo in Global.gd
2021-12-02 00:22:32 +00:00
Global.current_project.undo_redo.add_do_method(Global, "undo_or_redo", false)
Global.current_project.undo_redo.add_undo_method(Global, "undo_or_redo", true)
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)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
Global.current_project.undo_redo.add_do_property(
Global.current_project, "current_frame", frame + 1
)
Made cloning frames create linked cels if the linked cel button is toggled on - suggestion of #402
2021-07-22 00:10:00 +00:00
Global.current_project.undo_redo.add_do_property(Global.current_project, "layers", new_layers)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
Global.current_project.undo_redo.add_do_property(
Global.current_project, "animation_tags", new_animation_tags
)
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, "layers", Global.current_project.layers
)
Global.current_project.undo_redo.add_undo_property(
Global.current_project, "animation_tags", Global.current_project.animation_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
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:
Moved some variables away from Global
2021-11-23 00:36:22 +00:00
find_node("FrameTagDialog").popup_centered()
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
Dragging and dropping individual cels in the timeline to change their position is now possible. Addresses a part of #306
2021-01-29 20:00:48 +00:00
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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var frame: int = Global.current_project.current_frame
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
if frame == 0:
return
Add a right click popup menu on the frame buttons and move most of the frame related options there These options used to be on the right click popup menu of the cel buttons. Now, cel options only contain Link/Unlink Cel, for now.
2021-06-04 23:37:33 +00:00
Global.frame_ids.get_child(frame).change_frame_order(-1)
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
Dragging and dropping individual cels in the timeline to change their position is now possible. Addresses a part of #306
2021-01-29 20:00:48 +00:00
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_MoveRight_pressed() -> void:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var frame: int = Global.current_project.current_frame
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
if frame == last_frame:
return
Add a right click popup menu on the frame buttons and move most of the frame related options there These options used to be on the right click popup menu of the cel buttons. Now, cel options only contain Link/Unlink Cel, for now.
2021-06-04 23:37:33 +00:00
Global.frame_ids.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
Dragging and dropping individual cels in the timeline to change their position is now possible. Addresses a part of #306
2021-01-29 20:00:48 +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
Better Onion Skinning (#600) * better onion part (1/3) changed code and added scripts * better onion part (2/3) added some onion variables * better onion part (3/3) Added to onion dialog * removed whitespace that gave static error
2021-11-26 00:55:08 +00:00
Global.canvas.refresh_onion()
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var texture_button: TextureRect = 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
Dragging and dropping individual cels in the timeline to change their position is now possible. Addresses a part of #306
2021-01-29 20:00:48 +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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
$OnionSkinningSettings.popup(
Rect2(
onion_skinning_button.rect_global_position.x - $OnionSkinningSettings.rect_size.x - 16,
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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var texture_button: TextureRect = loop_animation_button.get_child(0)
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
match animation_loop:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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")
Moved some variables away from Global
2021-11-23 00:36:22 +00:00
loop_animation_button.hint_tooltip = "Cycle loop"
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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")
Moved some variables away from Global
2021-11-23 00:36:22 +00:00
loop_animation_button.hint_tooltip = "Ping-pong loop"
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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")
Moved some variables away from Global
2021-11-23 00:36:22 +00:00
loop_animation_button.hint_tooltip = "No loop"
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Fix content transformation not getting confirmed when changes were done to frames and layers Also fixes issue where frame/layer copying does not copy the transformed data
2021-07-08 17:46:56 +00:00
Global.canvas.selection.transform_content_confirm()
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:
Ability to select multiple cels and edit them all at once A rather significant change, so, while I have tested it, it might still be buggy. Implements a part of #306.
2021-06-11 22:06:13 +00:00
Global.current_project.selected_cels.clear()
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 += 1
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Made AnimationTimeline a scene of its own
2020-01-15 20:01:43 +00:00
else:
match animation_loop:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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()
Keep images unlocked after editing them - Should close #331 Not sure if this actually solves the issue or just makes it more rare, but I haven't been able to reproduce any PoolVector locking issues so far. The problem was that images were remained locked essentially all the time, which seemed to cause issues. Maybe other PoolVectors could not get locked?
2021-07-25 18:49:37 +00:00
is_animation_running = false
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
1: # Cycle loop
Ability to select multiple cels and edit them all at once A rather significant change, so, while I have tested it, it might still be buggy. Implements a part of #306.
2021-06-11 22:06:13 +00:00
Global.current_project.selected_cels.clear()
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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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()
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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:
Ability to select multiple cels and edit them all at once A rather significant change, so, while I have tested it, it might still be buggy. Implements a part of #306.
2021-06-11 22:06:13 +00:00
Global.current_project.selected_cels.clear()
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 -= 1
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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()
Keep images unlocked after editing them - Should close #331 Not sure if this actually solves the issue or just makes it more rare, but I haven't been able to reproduce any PoolVector locking issues so far. The problem was that images were remained locked essentially all the time, which seemed to cause issues. Maybe other PoolVectors could not get locked?
2021-07-25 18:49:37 +00:00
is_animation_running = false
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
1: # Cycle loop
Ability to select multiple cels and edit them all at once A rather significant change, so, while I have tested it, it might still be buggy. Implements a part of #306.
2021-06-11 22:06:13 +00:00
Global.current_project.selected_cels.clear()
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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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()
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
Global.animation_timer.set_one_shot(true) # wait_time can't change correctly if it's 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()
Keep images unlocked after editing them - Should close #331 Not sure if this actually solves the issue or just makes it more rare, but I haven't been able to reproduce any PoolVector locking issues so far. The problem was that images were remained locked essentially all the time, which seemed to cause issues. Maybe other PoolVectors could not get locked?
2021-07-25 18:49:37 +00:00
is_animation_running = play
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_NextFrame_pressed() -> void:
Fix content transformation not getting confirmed when changes were done to frames and layers Also fixes issue where frame/layer copying does not copy the transformed data
2021-07-08 17:46:56 +00:00
Global.canvas.selection.transform_content_confirm()
Ability to select multiple cels and edit them all at once A rather significant change, so, while I have tested it, it might still be buggy. Implements a part of #306.
2021-06-11 22:06:13 +00:00
Global.current_project.selected_cels.clear()
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:
Fix content transformation not getting confirmed when changes were done to frames and layers Also fixes issue where frame/layer copying does not copy the transformed data
2021-07-08 17:46:56 +00:00
Global.canvas.selection.transform_content_confirm()
Ability to select multiple cels and edit them all at once A rather significant change, so, while I have tested it, it might still be buggy. Implements a part of #306.
2021-06-11 22:06:13 +00:00
Global.current_project.selected_cels.clear()
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:
Fix content transformation not getting confirmed when changes were done to frames and layers Also fixes issue where frame/layer copying does not copy the transformed data
2021-07-08 17:46:56 +00:00
Global.canvas.selection.transform_content_confirm()
Ability to select multiple cels and edit them all at once A rather significant change, so, while I have tested it, it might still be buggy. Implements a part of #306.
2021-06-11 22:06:13 +00:00
Global.current_project.selected_cels.clear()
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:
Fix content transformation not getting confirmed when changes were done to frames and layers Also fixes issue where frame/layer copying does not copy the transformed data
2021-07-08 17:46:56 +00:00
Global.canvas.selection.transform_content_confirm()
Ability to select multiple cels and edit them all at once A rather significant change, so, while I have tested it, it might still be buggy. Implements a part of #306.
2021-06-11 22:06:13 +00:00
Global.current_project.selected_cels.clear()
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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
UI changes to the onion skinning settings Also changed the ignore text to the "_io" suffix instead of "ignore_onion", because this is quicker to type.
2021-12-01 00:28:12 +00:00
func _on_PastPlacement_item_selected(index: int) -> void:
Merge onion skinning past and future into one script
2021-11-26 01:38:00 +00:00
past_above_canvas = (index == 0)
Global.canvas.get_node("OnionPast").set("show_behind_parent", !past_above_canvas)
Better Onion Skinning (#600) * better onion part (1/3) changed code and added scripts * better onion part (2/3) added some onion variables * better onion part (3/3) Added to onion dialog * removed whitespace that gave static error
2021-11-26 00:55:08 +00:00
UI changes to the onion skinning settings Also changed the ignore text to the "_io" suffix instead of "ignore_onion", because this is quicker to type.
2021-12-01 00:28:12 +00:00
func _on_FuturePlacement_item_selected(index: int) -> void:
Merge onion skinning past and future into one script
2021-11-26 01:38:00 +00:00
future_above_canvas = (index == 0)
Global.canvas.get_node("OnionFuture").set("show_behind_parent", !future_above_canvas)
Better Onion Skinning (#600) * better onion part (1/3) changed code and added scripts * better onion part (2/3) added some onion variables * better onion part (3/3) Added to onion dialog * removed whitespace that gave static error
2021-11-26 00:55:08 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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 add_layer(is_new := true) -> void:
Fix content transformation not getting confirmed when changes were done to frames and layers Also fixes issue where frame/layer copying does not copy the transformed data
2021-07-08 17:46:56 +00:00
Global.canvas.selection.transform_content_confirm()
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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()
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
if !is_new: # Clone layer
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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
new_layer.create(
Global.current_project.size.x,
Global.current_project.size.y,
false,
Image.FORMAT_RGBA8
)
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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var new_cels: Array = f.cels.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_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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
Global.current_project.undo_redo.add_do_property(
Global.current_project, "current_layer", Global.current_project.layers.size()
)
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)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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
Just one method for undo/redo in Global.gd
2021-12-02 00:22:32 +00:00
Global.current_project.undo_redo.add_undo_method(Global, "undo_or_redo", true)
Global.current_project.undo_redo.add_do_method(Global, "undo_or_redo", false)
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.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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var new_layers: Array = Global.current_project.layers.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_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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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
)
Just one method for undo/redo in Global.gd
2021-12-02 00:22:32 +00:00
Global.current_project.undo_redo.add_do_method(Global, "undo_or_redo", false)
Global.current_project.undo_redo.add_undo_method(Global, "undo_or_redo", true)
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.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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var new_layers: Array = Global.current_project.layers.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 = 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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
Global.current_project.undo_redo.add_do_property(
Global.current_project, "current_layer", change
)
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)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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
Just one method for undo/redo in Global.gd
2021-12-02 00:22:32 +00:00
Global.current_project.undo_redo.add_undo_method(Global, "undo_or_redo", true)
Global.current_project.undo_redo.add_do_method(Global, "undo_or_redo", false)
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.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:
Fix a memory leak coming from the Layer class Removed the "frame_container" property from Layer.gd, which used to hold a reference to a node, leading to orphan nodes being created and never freed. Memory management seems to be working okay now. Previously, every time the user made a change, memory kept going up and never coming down. Now, data that can never be recovered, like undo data that have been rewritten in history, are also removed from memory.
2021-12-23 17:58:07 +00:00
var new_layers: Array = Global.current_project.duplicate_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.undos += 1
Global.current_project.undo_redo.create_action("Merge Layer")
for f in Global.current_project.frames:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var new_cels: Array = f.cels.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
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
Fix #541
2021-09-22 18:54:16 +00:00
selected_layer.lock()
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var pixel_color: Color = selected_layer.get_pixel(xx, yy)
var alpha: float = (
pixel_color.a
* f.cels[Global.current_project.current_layer].opacity
)
selected_layer.set_pixel(
xx, yy, Color(pixel_color.r, pixel_color.g, pixel_color.b, alpha)
)
Fix #541
2021-09-22 18:54:16 +00:00
selected_layer.unlock()
Merging layers works This should be all of the layer functionality restored. Frame functionality will soon follow.
2020-02-29 23:43:48 +00:00
var new_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)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
new_layer.blend_rect(
selected_layer, Rect2(Vector2.ZERO, 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)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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
)
):
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[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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +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)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
Global.current_project.undo_redo.add_do_property(
Global.current_project, "current_layer", Global.current_project.current_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(Global.current_project, "layers", new_layers)
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
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
Just one method for undo/redo in Global.gd
2021-12-02 00:22:32 +00:00
Global.current_project.undo_redo.add_undo_method(Global, "undo_or_redo", true)
Global.current_project.undo_redo.add_do_method(Global, "undo_or_redo", false)
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.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:
Format code and add static checks (#599) * gdformat . * Lint code - Part 1 * Format code - Part 2 * Lint code - Part 2 Trying to fix the max allowed line length errors * Add normal_map_invert_y to the image .import files Because of Godot 3.4 * Do not call private methods outside of the script's scope Lint code - Part 3 * Format code - Part 3 * Fixed more line length exceeded errors - Lint code Part 3 * Export array of licenses - Lint code part 4 * Clean hint_tooltip code from Global Removes a lot of lines of code * Create static-checks.yml * Fix FreeType's license
2021-11-25 12:48:30 +00:00
var current_frame: Frame = Global.current_project.frames[Global.current_project.current_frame]
var cel: Cel = current_frame.cels[Global.current_project.current_layer]
Fix changing cel opacity calling project.frames_changed() It shouldn't happen
2021-07-09 00:38:06 +00:00
cel.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
Global.layer_opacity_spinbox.value = value
Global.canvas.update()
Onion skinning settings have been moved to a popup window You can open the settings from a new button next to the onion settings button.
2020-03-31 16:14:13 +00:00
Basic UI for animation frame tags You can add tags by right clicking on a cel and selecting "Add Frame Tag". No tag modifying and deletion is implemented yet. I'm using a different ScrollContainer for the tags, which gets updated everytime the main timeline ScrollContainer gets updated. I hide its sliders from its theme, wish there was a more straightforward way.
2020-04-02 00:29:14 +00:00
func _on_OnionSkinningSettings_popup_hide() -> void:
Global.can_draw = true
Copy permalink