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/CelButton.gd

126 lines
5.3 KiB
GDScript3
Raw Normal View History

v0.2 - Animation Timeline & UI changes! v0.2 of Pixelorama is out! - Added animation timeline. You can add. remove. clone and change order of your frames! - You can now import multiple images as frames. - Ability to save individual frames, all frames as multiple files, or all frames as a single file in the form of a horizontal or vertical spritesheet! - Different frames can have a unique amount of layers and they can be of different sizes. - Image scaling is now functional. - Added hints for UI elements. - A lot of UI changes.
2019-09-09 22:57:46 +00:00
extends Button
var frame := 0
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
var layer := 0
Changes to better follow GDScript style guide Nothing new is being added in this commit, just code re-ordering & re-naming to better follow the recommended GDScript style guide. http://docs.godotengine.org/en/3.2/getting_started/scripting/gdscript/gdscript_styleguide.html And https://www.gdquest.com/docs/guidelines/best-practices/godot-gdscript/
2020-02-10 22:06:24 +00:00
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
onready var popup_menu : PopupMenu = $PopupMenu
v0.2 - Animation Timeline & UI changes! v0.2 of Pixelorama is out! - Added animation timeline. You can add. remove. clone and change order of your frames! - You can now import multiple images as frames. - Ability to save individual frames, all frames as multiple files, or all frames as a single file in the form of a horizontal or vertical spritesheet! - Different frames can have a unique amount of layers and they can be of different sizes. - Image scaling is now functional. - Added hints for UI elements. - A lot of UI changes.
2019-09-09 22:57:46 +00:00
Removed remove_frame() from FrameButton.gd Use _on_DeleteFrame_pressed() on AnimationTimeline.gd instead
2020-04-17 21:35:42 +00:00
Use setter method for layers to update the UI Instead of updating it in undo and redo methods
2020-02-28 01:27:22 +00:00
func _ready() -> void:
Animation only plays on frames of the same tag If there are no tags, the animation plays on all frames, as before. Currently no front-end way of toggling this behavior.
2020-04-11 17:10:07 +00:00
hint_tooltip = "Frame: %s, Layer: %s" % [frame + 1, layer]
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
if Global.canvases[frame] in Global.layers[layer].linked_cels:
Cel buttons have a green outline to indicate that they're linked The first time the link button get pressed, the currently selected cel is being linked. In futue commits, new frames will be linked on layers where the link button is pressed.
2020-03-18 00:02:41 +00:00
get_node("LinkedIndicator").visible = true
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
popup_menu.set_item_text(4, "Unlink Cel")
popup_menu.set_item_metadata(4, "Unlink Cel")
Added "Unlink Cell" to FrameButton's PopupMenu (appears on right click) Behavior may be changed because it's not set to work with UndoRedo. Not sure if it should, yet.
2020-03-18 00:57:23 +00:00
else:
get_node("LinkedIndicator").visible = false
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
popup_menu.set_item_text(4, "Link Cel")
popup_menu.set_item_metadata(4, "Link Cel")
Use setter method for layers to update the UI Instead of updating it in undo and redo methods
2020-02-28 01:27:22 +00:00
Removed remove_frame() from FrameButton.gd Use _on_DeleteFrame_pressed() on AnimationTimeline.gd instead
2020-04-17 21:35:42 +00:00
Merged "Scripts" and "Prefabs" folders into "src" Made a new "src" folder that will contain the source code files, like all the GDScript and scene files. Please read this for more details: https://www.gdquest.com/docs/guidelines/best-practices/godot-gdscript/ It made no sense to keep scenes separate from their scripts. More file organizing will follow soon.
2020-05-01 19:17:05 +00:00
func _on_CelButton_pressed() -> void:
Major UI changes - including new icons! - New UI icons for the tools, layer and frame buttons. - Removed clone, remove and move frame buttons. You can now right click on a frame button to do these actions instead. - Added first, previous, next and last frame buttons to the timeline. - Added rulers for the main canvas viewport. - Window size bumped to 1152x648. - Default FPS is now 6 instead of 1. - Fill tool renamed to Bucket. - Mouse default cursor shape for the canvas is the arrow instead of cross. - Mouse default cursor shape for the mirror and onion skinning buttons is the pointing hand.
2019-11-19 21:23:43 +00:00
if Input.is_action_just_released("left_mouse"):
Global.current_frame = frame
[EXPERIMENTAL] Re-making the timeline Trying to merge layers into the timeline, and eventually add more features like "share layer with all frames", among others. THIS IS NOT FINISHED, IT WILL *NOT* WORK PROPERLY. Once it is finished, this branch will be merged onto master. So far only add layer and add frame work, and even they may have some issues. Undoing also does not work properly yet. The UI is also not finished, as it currently has problems with the scroll containers.
2020-01-18 19:06:47 +00:00
Global.current_layer = layer
Remove frames with middle click
2019-12-21 02:20:55 +00:00
elif Input.is_action_just_released("right_mouse"):
Major UI changes - including new icons! - New UI icons for the tools, layer and frame buttons. - Removed clone, remove and move frame buttons. You can now right click on a frame button to do these actions instead. - Added first, previous, next and last frame buttons to the timeline. - Added rulers for the main canvas viewport. - Window size bumped to 1152x648. - Default FPS is now 6 instead of 1. - Fill tool renamed to Bucket. - Mouse default cursor shape for the canvas is the arrow instead of cross. - Mouse default cursor shape for the mirror and onion skinning buttons is the pointing hand.
2019-11-19 21:23:43 +00:00
if Global.canvases.size() == 1:
popup_menu.set_item_disabled(0, true)
popup_menu.set_item_disabled(2, true)
popup_menu.set_item_disabled(3, true)
else:
popup_menu.set_item_disabled(0, false)
if frame > 0:
popup_menu.set_item_disabled(2, false)
if frame < Global.canvases.size() - 1:
popup_menu.set_item_disabled(3, false)
popup_menu.popup(Rect2(get_global_mouse_position(), Vector2.ONE))
pressed = !pressed
Small UI & translation fixes Made the right panel in Main.tscn and CreateNewImage.tscn a little bigger, changed some labels, translations and some Global.can_draws. Also added a temporary fix for a issue where Space is being treated as a mouse press, for FrameButton.gd
2020-04-18 23:27:23 +00:00
elif Input.is_action_just_released("middle_mouse"): # Middle mouse click
Remove frames with middle click
2019-12-21 02:20:55 +00:00
pressed = !pressed
Removed remove_frame() from FrameButton.gd Use _on_DeleteFrame_pressed() on AnimationTimeline.gd instead
2020-04-17 21:35:42 +00:00
Global.animation_timeline._on_DeleteFrame_pressed(frame)
Small UI & translation fixes Made the right panel in Main.tscn and CreateNewImage.tscn a little bigger, changed some labels, translations and some Global.can_draws. Also added a temporary fix for a issue where Space is being treated as a mouse press, for FrameButton.gd
2020-04-18 23:27:23 +00:00
else: # An example of this would be Space
pressed = !pressed
Removed remove_frame() from FrameButton.gd Use _on_DeleteFrame_pressed() on AnimationTimeline.gd instead
2020-04-17 21:35:42 +00:00
Major UI changes - including new icons! - New UI icons for the tools, layer and frame buttons. - Removed clone, remove and move frame buttons. You can now right click on a frame button to do these actions instead. - Added first, previous, next and last frame buttons to the timeline. - Added rulers for the main canvas viewport. - Window size bumped to 1152x648. - Default FPS is now 6 instead of 1. - Fill tool renamed to Bucket. - Mouse default cursor shape for the canvas is the arrow instead of cross. - Mouse default cursor shape for the mirror and onion skinning buttons is the pointing hand.
2019-11-19 21:23:43 +00:00
func _on_PopupMenu_id_pressed(ID : int) -> void:
match ID:
Implemented Remove Layer - Doesn't work properly yet
2020-02-22 15:00:39 +00:00
0: # Remove Frame
Removed remove_frame() from FrameButton.gd Use _on_DeleteFrame_pressed() on AnimationTimeline.gd instead
2020-04-17 21:35:42 +00:00
Global.animation_timeline._on_DeleteFrame_pressed(frame)
Cloning frames works
2020-03-03 01:05:48 +00:00
1: # Clone 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
Global.animation_timeline._on_CopyFrame_pressed(frame)
Cloning frames works
2020-03-03 01:05:48 +00:00
2: # Move Left
Major UI changes - including new icons! - New UI icons for the tools, layer and frame buttons. - Removed clone, remove and move frame buttons. You can now right click on a frame button to do these actions instead. - Added first, previous, next and last frame buttons to the timeline. - Added rulers for the main canvas viewport. - Window size bumped to 1152x648. - Default FPS is now 6 instead of 1. - Fill tool renamed to Bucket. - Mouse default cursor shape for the canvas is the arrow instead of cross. - Mouse default cursor shape for the mirror and onion skinning buttons is the pointing hand.
2019-11-19 21:23:43 +00:00
change_frame_order(-1)
Cloning frames works
2020-03-03 01:05:48 +00:00
3: # Move Right
Major UI changes - including new icons! - New UI icons for the tools, layer and frame buttons. - Removed clone, remove and move frame buttons. You can now right click on a frame button to do these actions instead. - Added first, previous, next and last frame buttons to the timeline. - Added rulers for the main canvas viewport. - Window size bumped to 1152x648. - Default FPS is now 6 instead of 1. - Fill tool renamed to Bucket. - Mouse default cursor shape for the canvas is the arrow instead of cross. - Mouse default cursor shape for the mirror and onion skinning buttons is the pointing hand.
2019-11-19 21:23:43 +00:00
change_frame_order(1)
Removed "Add Frame Tag" from framebutton's popupmenu
2020-04-07 21:46:45 +00:00
4: # Unlink Cel
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 cel_index : int = Global.layers[layer].linked_cels.find(Global.canvases[frame])
Made Unlink Cel work with UndoRedo
2020-04-21 18:34:45 +00:00
var c = Global.canvases[frame]
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
var new_layers : Array = Global.layers.duplicate()
# Loop through the array to create new classes for each element, so that they
# won't be the same as the original array's classes. Needed for undo/redo to work properly.
for i in new_layers.size():
var new_linked_cels = new_layers[i].linked_cels.duplicate()
new_layers[i] = Layer.new(new_layers[i].name, new_layers[i].visible, new_layers[i].locked, new_layers[i].frame_container, new_layers[i].new_cels_linked, new_linked_cels)
var new_canvas_layers : Array = c.layers.duplicate()
for i in new_canvas_layers.size():
new_canvas_layers[i] = Cel.new(new_canvas_layers[i].image, new_canvas_layers[i].opacity)
Major UI changes - including new icons! - New UI icons for the tools, layer and frame buttons. - Removed clone, remove and move frame buttons. You can now right click on a frame button to do these actions instead. - Added first, previous, next and last frame buttons to the timeline. - Added rulers for the main canvas viewport. - Window size bumped to 1152x648. - Default FPS is now 6 instead of 1. - Fill tool renamed to Bucket. - Mouse default cursor shape for the canvas is the arrow instead of cross. - Mouse default cursor shape for the mirror and onion skinning buttons is the pointing hand.
2019-11-19 21:23:43 +00:00
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
if popup_menu.get_item_metadata(4) == "Unlink Cel":
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[layer].linked_cels.remove(cel_index)
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
var sprite := Image.new()
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
sprite.copy_from(Global.canvases[frame].layers[layer].image)
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
sprite.lock()
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
new_canvas_layers[layer].image = sprite
Made Unlink Cel work with UndoRedo
2020-04-21 18:34:45 +00:00
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
Global.undo_redo.create_action("Unlink Cel")
Global.undo_redo.add_do_property(Global, "layers", new_layers)
Global.undo_redo.add_do_property(c, "layers", new_canvas_layers)
Global.undo_redo.add_undo_property(Global, "layers", Global.layers)
Global.undo_redo.add_undo_property(c, "layers", c.layers)
Made Unlink Cel work with UndoRedo
2020-04-21 18:34:45 +00:00
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
Global.undo_redo.add_undo_method(Global, "undo", [Global.canvases[frame]], layer)
Global.undo_redo.add_do_method(Global, "redo", [Global.canvases[frame]], layer)
Global.undo_redo.commit_action()
elif popup_menu.get_item_metadata(4) == "Link Cel":
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[layer].linked_cels.append(Global.canvases[frame])
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
Global.undo_redo.create_action("Link Cel")
Global.undo_redo.add_do_property(Global, "layers", 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
if new_layers[layer].linked_cels.size() > 1:
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
# If there are already linked cels, set the current cel's image
# to the first linked cel's image
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
new_canvas_layers[layer].image = new_layers[layer].linked_cels[0].layers[layer].image
new_canvas_layers[layer].image_texture = new_layers[layer].linked_cels[0].layers[layer].image_texture
Added a "Link Cel" option when right clicking on a cel, if the cel isn't already linked This should make cel linking be more user friendly.
2020-04-22 16:01:33 +00:00
Global.undo_redo.add_do_property(c, "layers", new_canvas_layers)
Global.undo_redo.add_undo_property(c, "layers", c.layers)
Global.undo_redo.add_undo_property(Global, "layers", Global.layers)
Global.undo_redo.add_undo_method(Global, "undo", [Global.canvases[frame]], layer)
Global.undo_redo.add_do_method(Global, "redo", [Global.canvases[frame]], layer)
Global.undo_redo.commit_action()
Cel unlinking now works properly Undo/redo can have some weird behavior right now
2020-03-21 20:55:36 +00:00
Remove frames with middle click
2019-12-21 02:20:55 +00:00
Major UI changes - including new icons! - New UI icons for the tools, layer and frame buttons. - Removed clone, remove and move frame buttons. You can now right click on a frame button to do these actions instead. - Added first, previous, next and last frame buttons to the timeline. - Added rulers for the main canvas viewport. - Window size bumped to 1152x648. - Default FPS is now 6 instead of 1. - Fill tool renamed to Bucket. - Mouse default cursor shape for the canvas is the arrow instead of cross. - Mouse default cursor shape for the mirror and onion skinning buttons is the pointing hand.
2019-11-19 21:23:43 +00:00
func change_frame_order(rate : int) -> void:
var change = frame + rate
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 new_canvases : Array = Global.canvases.duplicate()
Major UI changes - including new icons! - New UI icons for the tools, layer and frame buttons. - Removed clone, remove and move frame buttons. You can now right click on a frame button to do these actions instead. - Added first, previous, next and last frame buttons to the timeline. - Added rulers for the main canvas viewport. - Window size bumped to 1152x648. - Default FPS is now 6 instead of 1. - Fill tool renamed to Bucket. - Mouse default cursor shape for the canvas is the arrow instead of cross. - Mouse default cursor shape for the mirror and onion skinning buttons is the pointing hand.
2019-11-19 21:23:43 +00:00
var temp = new_canvases[frame]
new_canvases[frame] = new_canvases[change]
new_canvases[change] = temp
Global.undo_redo.create_action("Change Frame Order")
Global.undo_redo.add_do_property(Global, "canvases", new_canvases)
Global.undo_redo.add_do_property(Global.canvases[frame], "frame", change)
Global.undo_redo.add_do_property(Global.canvases[change], "frame", frame)
Fix issue with frame moving and current_frame not changing This bug actually originates from before the timeline remake and can be found in v0.6.2 and potentially earlier versions.
2020-03-06 20:44:48 +00:00
if Global.current_frame == frame:
Global.undo_redo.add_do_property(Global, "current_frame", change)
Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame)
Major UI changes - including new icons! - New UI icons for the tools, layer and frame buttons. - Removed clone, remove and move frame buttons. You can now right click on a frame button to do these actions instead. - Added first, previous, next and last frame buttons to the timeline. - Added rulers for the main canvas viewport. - Window size bumped to 1152x648. - Default FPS is now 6 instead of 1. - Fill tool renamed to Bucket. - Mouse default cursor shape for the canvas is the arrow instead of cross. - Mouse default cursor shape for the mirror and onion skinning buttons is the pointing hand.
2019-11-19 21:23:43 +00:00
Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases)
Global.undo_redo.add_undo_property(Global.canvases[frame], "frame", frame)
Global.undo_redo.add_undo_property(Global.canvases[change], "frame", change)
Global.undo_redo.add_undo_method(Global, "undo", [Global.canvases[frame]])
Global.undo_redo.add_do_method(Global, "redo", [Global.canvases[frame]])
Merge pull request #20 with previous commit
2019-11-20 12:42:52 +00:00
Global.undo_redo.commit_action()
Merged "Scripts" and "Prefabs" folders into "src" Made a new "src" folder that will contain the source code files, like all the GDScript and scene files. Please read this for more details: https://www.gdquest.com/docs/guidelines/best-practices/godot-gdscript/ It made no sense to keep scenes separate from their scripts. More file organizing will follow soon.
2020-05-01 19:17:05 +00:00
Copy permalink