diff --git a/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off.png b/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off.png new file mode 100644 index 000000000..da3f39deb Binary files /dev/null and b/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off.png differ diff --git a/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off.png.import b/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off.png.import new file mode 100644 index 000000000..1bfba95f3 --- /dev/null +++ b/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Onion_Skinning_Off.png-44f6d168808bd3a953b10c86bdbe33fb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off.png" +dest_files=[ "res://.import/Onion_Skinning_Off.png-44f6d168808bd3a953b10c86bdbe33fb.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off_Hover.png b/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off_Hover.png new file mode 100644 index 000000000..2bec4a91c Binary files /dev/null and b/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off_Hover.png differ diff --git a/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off_Hover.png.import b/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off_Hover.png.import new file mode 100644 index 000000000..831e3520b --- /dev/null +++ b/Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off_Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Onion_Skinning_Off_Hover.png-9f743ab03826ccec17e8123f0da4b1d7.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off_Hover.png" +dest_files=[ "res://.import/Onion_Skinning_Off_Hover.png-9f743ab03826ccec17e8123f0da4b1d7.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off.png b/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off.png new file mode 100644 index 000000000..2365dc48a Binary files /dev/null and b/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off.png differ diff --git a/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off.png.import b/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off.png.import new file mode 100644 index 000000000..ec93e3214 --- /dev/null +++ b/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Onion_Skinning_Off.png-bff5e06f0089ec01fdfb240955de6f6d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off.png" +dest_files=[ "res://.import/Onion_Skinning_Off.png-bff5e06f0089ec01fdfb240955de6f6d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off_Hover.png b/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off_Hover.png new file mode 100644 index 000000000..0ece42b69 Binary files /dev/null and b/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off_Hover.png differ diff --git a/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off_Hover.png.import b/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off_Hover.png.import new file mode 100644 index 000000000..c99bee5f1 --- /dev/null +++ b/Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off_Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Onion_Skinning_Off_Hover.png-53339cf054bbc8f4c9a248d9eb420e13.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Gold Themes/Timeline/Onion_Skinning_Off_Hover.png" +dest_files=[ "res://.import/Onion_Skinning_Off_Hover.png-53339cf054bbc8f4c9a248d9eb420e13.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off.png b/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off.png new file mode 100644 index 000000000..6a5d19608 Binary files /dev/null and b/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off.png.import b/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off.png.import new file mode 100644 index 000000000..35be5e6a9 --- /dev/null +++ b/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Onion_Skinning_Off.png-715f04ca2cc673ef6a6d3c7b618ed073.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off.png" +dest_files=[ "res://.import/Onion_Skinning_Off.png-715f04ca2cc673ef6a6d3c7b618ed073.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off_Hover.png b/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off_Hover.png new file mode 100644 index 000000000..e906dab28 Binary files /dev/null and b/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off_Hover.png differ diff --git a/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off_Hover.png.import b/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off_Hover.png.import new file mode 100644 index 000000000..b6695728e --- /dev/null +++ b/Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off_Hover.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Onion_Skinning_Off_Hover.png-448230dc1fa15595ab52c002077353a9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Light Themes/Timeline/Onion_Skinning_Off_Hover.png" +dest_files=[ "res://.import/Onion_Skinning_Off_Hover.png-448230dc1fa15595ab52c002077353a9.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Prefabs/AnimationTimeline.tscn b/Prefabs/AnimationTimeline.tscn index 9b01fe51b..31edec44e 100644 --- a/Prefabs/AnimationTimeline.tscn +++ b/Prefabs/AnimationTimeline.tscn @@ -34,8 +34,8 @@ [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Go_To_Last_Frame.png" type="Texture" id=32] [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Go_To_Last_Frame_Hover.png" type="Texture" id=33] [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Loop_Hover.png" type="Texture" id=34] -[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Onion_Skinning.png" type="Texture" id=35] -[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Hover.png" type="Texture" id=36] +[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off.png" type="Texture" id=35] +[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Onion_Skinning_Off_Hover.png" type="Texture" id=36] [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Loop.png" type="Texture" id=37] [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Expandable.png" type="Texture" id=38] [ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/Expandable_Hover.png" type="Texture" id=39] diff --git a/Scripts/AnimationTimeline.gd b/Scripts/AnimationTimeline.gd index a80449347..4d982ae4f 100644 --- a/Scripts/AnimationTimeline.gd +++ b/Scripts/AnimationTimeline.gd @@ -57,6 +57,12 @@ func add_frame() -> void: func _on_OnionSkinning_pressed() -> void: Global.onion_skinning = !Global.onion_skinning Global.canvas.update() + if Global.onion_skinning: + Global.onion_skinning_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Onion_Skinning.png" % Global.theme_type) + Global.onion_skinning_button.texture_hover = load("res://Assets/Graphics/%s Themes/Timeline/Onion_Skinning_Hover.png" % Global.theme_type) + else: + Global.onion_skinning_button.texture_normal = load("res://Assets/Graphics/%s Themes/Timeline/Onion_Skinning_Off.png" % Global.theme_type) + Global.onion_skinning_button.texture_hover = load("res://Assets/Graphics/%s Themes/Timeline/Onion_Skinning_Off_Hover.png" % Global.theme_type) func _on_OnionSkinningSettings_pressed() -> void: diff --git a/Scripts/Global.gd b/Scripts/Global.gd index 50957ce3c..966900bd3 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -227,6 +227,7 @@ var animation_timeline : Panel var animation_timer : Timer var frame_ids : HBoxContainer var current_frame_label : Label +var onion_skinning_button : BaseButton var loop_animation_button : BaseButton var play_forward : BaseButton var play_backwards : BaseButton @@ -346,6 +347,7 @@ func _ready() -> void: animation_timer = find_node_by_name(animation_timeline, "AnimationTimer") frame_ids = find_node_by_name(animation_timeline, "FrameIDs") current_frame_label = find_node_by_name(animation_timeline, "CurrentFrame") + onion_skinning_button = find_node_by_name(animation_timeline, "OnionSkinning") loop_animation_button = find_node_by_name(animation_timeline, "LoopAnim") play_forward = find_node_by_name(animation_timeline, "PlayForward") play_backwards = find_node_by_name(animation_timeline, "PlayBackwards")