huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-22 13:33:13 +00:00
Code Issues Wiki Activity
Pixelorama/Scripts/FrameButton.gd

114 lines
4.1 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-10 01:57:46 +03: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 21:06:47 +02: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-11 00:06:24 +02: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 23:23:43 +02:00
onready var popup_menu := $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-10 01:57:46 +03:00
Use setter method for layers to update the UI Instead of updating it in undo and redo methods
2020-02-28 03:27:22 +02: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 20:10:07 +03:00
hint_tooltip = "Frame: %s, Layer: %s" % [frame + 1, layer]
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 02:57:23 +02:00
if Global.canvases[frame] in Global.layers[layer][5]:
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 02:02:41 +02:00
get_node("LinkedIndicator").visible = true
Removed "Add Frame Tag" from framebutton's popupmenu
2020-04-08 00:46:45 +03:00
popup_menu.set_item_disabled(4, false) # 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 02:57:23 +02:00
else:
get_node("LinkedIndicator").visible = false
Removed "Add Frame Tag" from framebutton's popupmenu
2020-04-08 00:46:45 +03:00
popup_menu.set_item_disabled(4, true) # Unlink cel
Use setter method for layers to update the UI Instead of updating it in undo and redo methods
2020-02-28 03:27:22 +02:00
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-10 01:57:46 +03:00
func _on_FrameButton_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 23:23:43 +02: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 21:06:47 +02:00
Global.current_layer = layer
Remove frames with middle click
2019-12-21 04:20:55 +02: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 23:23:43 +02: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
Remove custom brushes with the middle mouse button And made the "X" button on the custom brushes a little smaller. Partially addresses #132
2020-01-28 00:19:55 +02:00
else: # Middle mouse click
Remove frames with middle click
2019-12-21 04:20:55 +02:00
pressed = !pressed
if Global.canvases.size() > 1:
remove_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 23:23:43 +02:00
func _on_PopupMenu_id_pressed(ID : int) -> void:
match ID:
Implemented Remove Layer - Doesn't work properly yet
2020-02-22 17:00:39 +02:00
0: # Remove Frame
Remove frames with middle click
2019-12-21 04:20:55 +02:00
remove_frame()
Cloning frames works
2020-03-03 03:05:48 +02: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 04:25:08 +03:00
Global.animation_timeline._on_CopyFrame_pressed(frame)
Cloning frames works
2020-03-03 03:05:48 +02: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 23:23:43 +02:00
change_frame_order(-1)
Cloning frames works
2020-03-03 03:05:48 +02: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 23:23:43 +02:00
change_frame_order(1)
Removed "Add Frame Tag" from framebutton's popupmenu
2020-04-08 00:46:45 +03:00
4: # Unlink Cel
Cel unlinking now works properly Undo/redo can have some weird behavior right now
2020-03-21 22:55:36 +02:00
var cel_index : int = Global.layers[layer][5].find(Global.canvases[frame])
Global.layers[layer][5].remove(cel_index)
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 02:57:23 +02:00
_ready()
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 23:23:43 +02:00
Cel unlinking now works properly Undo/redo can have some weird behavior right now
2020-03-21 22:55:36 +02:00
var sprite := Image.new()
sprite.copy_from(Global.canvases[frame].layers[layer][0])
sprite.lock()
Global.canvases[frame].layers[layer][0] = sprite
var tex := ImageTexture.new()
tex.create_from_image(sprite, 0)
Global.canvases[frame].layers[layer][1] = tex
Update frame when unlinking it
2020-03-22 00:30:10 +02:00
Global.canvases[frame].update()
Cel unlinking now works properly Undo/redo can have some weird behavior right now
2020-03-21 22:55:36 +02:00
Remove frames with middle click
2019-12-21 04:20:55 +02:00
func remove_frame() -> void:
var canvas : Canvas = Global.canvases[frame]
var new_canvases := Global.canvases.duplicate()
new_canvases.erase(canvas)
var current_frame := Global.current_frame
Fixed spacing between some comments
2020-03-09 02:17:49 +02:00
if current_frame > 0 && current_frame == new_canvases.size(): # If it's the last frame
Remove frames with middle click
2019-12-21 04:20:55 +02:00
current_frame -= 1
Global.undos += 1
Global.undo_redo.create_action("Remove Frame")
Global.undo_redo.add_do_property(Global, "canvases", new_canvases)
Global.undo_redo.add_do_property(Global, "canvas", new_canvases[current_frame])
Global.undo_redo.add_do_property(Global, "current_frame", current_frame)
for i in range(frame, new_canvases.size()):
var c : Canvas = new_canvases[i]
Global.undo_redo.add_do_property(c, "frame", i)
Global.undo_redo.add_undo_property(c, "frame", c.frame)
Global.undo_redo.add_undo_property(Global, "canvases", Global.canvases)
Global.undo_redo.add_undo_property(Global, "canvas", canvas)
Global.undo_redo.add_undo_property(Global, "current_frame", Global.current_frame)
Global.undo_redo.add_do_method(Global, "redo", [canvas])
Global.undo_redo.add_undo_method(Global, "undo", [canvas])
Global.undo_redo.commit_action()
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 23:23:43 +02:00
func change_frame_order(rate : int) -> void:
var change = frame + rate
var new_canvases := Global.canvases.duplicate()
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 22:44:48 +02: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 23:23:43 +02: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 14:42:52 +02:00
Global.undo_redo.commit_action()
Copy permalink