huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 15:39:49 +00:00
Code Issues Wiki Activity

Improvements to Animation Tags (#560)

Browse source 
* 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
This commit is contained in:
Variable 2021-11-17 03:21:29 +05:00 committed by GitHub
parent 969aed8070
commit 3e88efc118
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Classes/Project.gd
View file

@ -579,7 +579,7 @@ func animation_tags_changed(value : Array) -> void:
child.queue_free() child.queue_free()
for tag in animation_tags: for tag in animation_tags:
var tag_base_size = Global.animation_timeline.cel_size + 3 var tag_base_size = Global.animation_timeline.cel_size + 4
var tag_c : Container = animation_tag_node.instance() var tag_c : Container = animation_tag_node.instance()
Global.tag_container.add_child(tag_c) Global.tag_container.add_child(tag_c)
tag_c.tag = tag tag_c.tag = tag
@ -589,9 +589,10 @@ func animation_tags_changed(value : Array) -> void:
tag_c.get_node("Label").modulate = tag.color tag_c.get_node("Label").modulate = tag.color
tag_c.get_node("Line2D").default_color = tag.color tag_c.get_node("Line2D").default_color = tag.color
tag_c.rect_position.x = (tag.from - 1) * tag_base_size + tag.from tag_c.rect_position.x = (tag.from - 1) * tag_base_size + 1 # Added 1 to answer to get starting position of next cel
var tag_size : int = tag.to - tag.from var tag_size : int = tag.to - tag.from
tag_c.rect_min_size.x = (tag_size + 1) * tag_base_size 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_position.y = 1 # To make top line of tag visible
tag_c.get_node("Line2D").points[2] = Vector2(tag_c.rect_min_size.x, 0) 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) tag_c.get_node("Line2D").points[3] = Vector2(tag_c.rect_min_size.x, 32)

8
src/UI/Timeline/AnimationTimeline.gd
View file

@ -56,12 +56,12 @@ func cel_size_changed(value : int) -> void:
frame_id.rect_size.x = cel_size frame_id.rect_size.x = cel_size
for tag_c in Global.tag_container.get_children(): for tag_c in Global.tag_container.get_children():
var tag_base_size = cel_size + 3 var tag_base_size = cel_size + 4
var tag : AnimationTag = tag_c.tag var tag : AnimationTag = tag_c.tag
tag_c.rect_position.x = (tag.from - 1) * tag_base_size + tag.from tag_c.rect_position.x = (tag.from - 1) * tag_base_size + 1 # Added 1 to answer to get starting position of next cel
var tag_size : int = tag.to - tag.from var tag_size : int = tag.to - tag.from
tag_c.rect_min_size.x = (tag_size + 1) * tag_base_size 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 tag_c.rect_size.x = (tag_size + 1) * tag_base_size - 4 # We dont need the 4 pixels at the end of last cel
tag_c.get_node("Line2D").points[2] = Vector2(tag_c.rect_min_size.x, 0) 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) tag_c.get_node("Line2D").points[3] = Vector2(tag_c.rect_min_size.x, 32)

85
src/UI/Timeline/AnimationTimeline.tscn
View file

@ -158,9 +158,7 @@ margin_bottom = 25.0
size_flags_vertical = 0 size_flags_vertical = 0
custom_constants/separation = 9 custom_constants/separation = 9
[node name="AddLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ [node name="AddLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_right = 22.0 margin_right = 22.0
margin_bottom = 22.0 margin_bottom = 22.0
rect_min_size = Vector2( 22, 22 ) rect_min_size = Vector2( 22, 22 )
@ -184,9 +182,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="RemoveLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ [node name="RemoveLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 31.0 margin_left = 31.0
margin_right = 53.0 margin_right = 53.0
margin_bottom = 22.0 margin_bottom = 22.0
@ -212,9 +208,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="MoveUpLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ [node name="MoveUpLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 62.0 margin_left = 62.0
margin_right = 84.0 margin_right = 84.0
margin_bottom = 22.0 margin_bottom = 22.0
@ -240,9 +234,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="MoveDownLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ [node name="MoveDownLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 93.0 margin_left = 93.0
margin_right = 115.0 margin_right = 115.0
margin_bottom = 22.0 margin_bottom = 22.0
@ -268,9 +260,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="CloneLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ [node name="CloneLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 124.0 margin_left = 124.0
margin_right = 146.0 margin_right = 146.0
margin_bottom = 22.0 margin_bottom = 22.0
@ -295,9 +285,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="MergeDownLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=[ [node name="MergeDownLayer" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/LayerButtonPanelContainer/LayerButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 155.0 margin_left = 155.0
margin_right = 177.0 margin_right = 177.0
margin_bottom = 22.0 margin_bottom = 22.0
@ -348,9 +336,7 @@ alignment = 2
margin_right = 140.0 margin_right = 140.0
margin_bottom = 24.0 margin_bottom = 24.0
[node name="AddFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ [node name="AddFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_top = 2.0 margin_top = 2.0
margin_right = 20.0 margin_right = 20.0
margin_bottom = 22.0 margin_bottom = 22.0
@ -375,9 +361,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="DeleteFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ [node name="DeleteFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 24.0 margin_left = 24.0
margin_top = 2.0 margin_top = 2.0
margin_right = 44.0 margin_right = 44.0
@ -405,9 +389,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="CopyFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ [node name="CopyFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 48.0 margin_left = 48.0
margin_top = 2.0 margin_top = 2.0
margin_right = 68.0 margin_right = 68.0
@ -433,9 +415,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="FrameTagButton" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ [node name="FrameTagButton" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 72.0 margin_left = 72.0
margin_top = 2.0 margin_top = 2.0
margin_right = 92.0 margin_right = 92.0
@ -461,9 +441,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="MoveLeft" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ [node name="MoveLeft" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 96.0 margin_left = 96.0
margin_top = 2.0 margin_top = 2.0
margin_right = 116.0 margin_right = 116.0
@ -490,9 +468,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="MoveRight" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=[ [node name="MoveRight" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/FrameButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 120.0 margin_left = 120.0
margin_top = 2.0 margin_top = 2.0
margin_right = 140.0 margin_right = 140.0
@ -523,9 +499,7 @@ margin_left = 180.0
margin_right = 320.0 margin_right = 320.0
margin_bottom = 24.0 margin_bottom = 24.0
[node name="FirstFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ [node name="FirstFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_top = 2.0 margin_top = 2.0
margin_right = 20.0 margin_right = 20.0
margin_bottom = 22.0 margin_bottom = 22.0
@ -551,9 +525,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="PreviousFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ [node name="PreviousFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 24.0 margin_left = 24.0
margin_top = 2.0 margin_top = 2.0
margin_right = 44.0 margin_right = 44.0
@ -580,9 +552,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="PlayBackwards" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ [node name="PlayBackwards" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 48.0 margin_left = 48.0
margin_top = 2.0 margin_top = 2.0
margin_right = 68.0 margin_right = 68.0
@ -610,9 +580,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="PlayForward" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ [node name="PlayForward" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 72.0 margin_left = 72.0
margin_top = 2.0 margin_top = 2.0
margin_right = 92.0 margin_right = 92.0
@ -641,9 +609,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="NextFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ [node name="NextFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 96.0 margin_left = 96.0
margin_top = 2.0 margin_top = 2.0
margin_right = 116.0 margin_right = 116.0
@ -670,9 +636,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="LastFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=[ [node name="LastFrame" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/PlaybackButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 120.0 margin_left = 120.0
margin_top = 2.0 margin_top = 2.0
margin_right = 140.0 margin_right = 140.0
@ -704,9 +668,7 @@ margin_left = 360.0
margin_right = 498.0 margin_right = 498.0
margin_bottom = 24.0 margin_bottom = 24.0
[node name="OnionSkinningSettings" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=[ [node name="OnionSkinningSettings" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_top = 2.0 margin_top = 2.0
margin_right = 12.0 margin_right = 12.0
margin_bottom = 22.0 margin_bottom = 22.0
@ -732,9 +694,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="OnionSkinning" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=[ [node name="OnionSkinning" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 16.0 margin_left = 16.0
margin_top = 2.0 margin_top = 2.0
margin_right = 36.0 margin_right = 36.0
@ -761,9 +721,7 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="LoopAnim" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=[ [node name="LoopAnim" type="Button" parent="MarginContainer/AnimationContainer/TimelineContainer/TimelineButtons/PanelContainer/AnimationButtons/LoopButtons" groups=["UIButtons"]]
"UIButtons",
]]
margin_left = 40.0 margin_left = 40.0
margin_top = 2.0 margin_top = 2.0
margin_right = 60.0 margin_right = 60.0
@ -859,6 +817,7 @@ margin_left = 219.0
margin_right = 902.0 margin_right = 902.0
margin_bottom = 32.0 margin_bottom = 32.0
rect_min_size = Vector2( 0, 32 ) rect_min_size = Vector2( 0, 32 )
mouse_filter = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
theme = SubResource( 20 ) theme = SubResource( 20 )
scroll_vertical_enabled = false scroll_vertical_enabled = false

1
src/UI/Timeline/FrameTagDialog.gd
View file

@ -65,6 +65,7 @@ func _on_AddTag_pressed() -> void:
current_tag_id = Global.current_project.animation_tags.size() current_tag_id = Global.current_project.animation_tags.size()
options_dialog.get_node("GridContainer/FromSpinBox").value = Global.current_project.current_frame + 1 options_dialog.get_node("GridContainer/FromSpinBox").value = Global.current_project.current_frame + 1
options_dialog.get_node("GridContainer/ToSpinBox").value = Global.current_project.current_frame + 1 options_dialog.get_node("GridContainer/ToSpinBox").value = Global.current_project.current_frame + 1
options_dialog.get_node("GridContainer/ColorPickerButton").color = Color(randf(),randf(),randf())
func _on_EditButton_pressed(_tag_id : int) -> void: func _on_EditButton_pressed(_tag_id : int) -> void: