tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-26 16:54:43 -04:00
Code Issues Projects Releases Wiki Activity

Asset renaming (#225)

Browse source 
* Renamed the Asset folder and subfolders to lowercase

* Fixed font loading issue

Co-authored-by: OverloadedOrama <manoschool@yahoo.com>
This commit is contained in:
Manolis Papadeas 2020-05-05 03:53:58 +03:00 • committed by GitHub
parent a056a87492
commit 1ad1ecb960
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
429 changed files with 2490 additions and 2443 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -181,9 +181,9 @@ func _on_OnionSkinning_pressed() -> void:
theme_type = "Dark"
var texture_button : TextureRect = Global.onion_skinning_button.get_child(0)
if Global.onion_skinning:
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/onion_skinning.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/onion_skinning.png" % theme_type.to_lower())
else:
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/onion_skinning_off.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/onion_skinning_off.png" % theme_type.to_lower())
func _on_OnionSkinningSettings_pressed() -> void:
@ -198,15 +198,15 @@ func _on_LoopAnim_pressed() -> void:
match animation_loop:
0: # Make it loop
animation_loop = 1
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/loop.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/loop.png" % theme_type.to_lower())
Global.loop_animation_button.hint_tooltip = "Cycle loop"
1: # Make it ping-pong
animation_loop = 2
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/loop_pingpong.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/loop_pingpong.png" % theme_type.to_lower())
Global.loop_animation_button.hint_tooltip = "Ping-pong loop"
2: # Make it stop
animation_loop = 0
texture_button.texture = load("res://Assets/Graphics/%s_themes/timeline/loop_none.png" % theme_type.to_lower())
texture_button.texture = load("res://assets/graphics/%s_themes/timeline/loop_none.png" % theme_type.to_lower())
Global.loop_animation_button.hint_tooltip = "No loop"
@ -215,9 +215,9 @@ func _on_PlayForward_toggled(button_pressed : bool) -> void:
if theme_type == "Gold":
theme_type = "Dark"
if button_pressed:
Global.play_forward.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/pause.png" % theme_type.to_lower())
Global.play_forward.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/pause.png" % theme_type.to_lower())
else:
Global.play_forward.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/play.png" % theme_type.to_lower())
Global.play_forward.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/play.png" % theme_type.to_lower())
play_animation(button_pressed, true)
@ -227,9 +227,9 @@ func _on_PlayBackwards_toggled(button_pressed : bool) -> void:
if theme_type == "Gold":
theme_type = "Dark"
if button_pressed:
Global.play_backwards.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/pause.png" % theme_type.to_lower())
Global.play_backwards.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/pause.png" % theme_type.to_lower())
else:
Global.play_backwards.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/play_backwards.png" % theme_type.to_lower())
Global.play_backwards.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/play_backwards.png" % theme_type.to_lower())
play_animation(button_pressed, false)
@ -274,12 +274,12 @@ func play_animation(play : bool, forward_dir : bool) -> void:
if forward_dir:
Global.play_backwards.disconnect("toggled", self, "_on_PlayBackwards_toggled")
Global.play_backwards.pressed = false
Global.play_backwards.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/play_backwards.png" % theme_type.to_lower())
Global.play_backwards.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/play_backwards.png" % theme_type.to_lower())
Global.play_backwards.connect("toggled", self, "_on_PlayBackwards_toggled")
else:
Global.play_forward.disconnect("toggled", self, "_on_PlayForward_toggled")
Global.play_forward.pressed = false
Global.play_forward.get_child(0).texture = load("res://Assets/Graphics/%s_themes/timeline/play.png" % theme_type.to_lower())
Global.play_forward.get_child(0).texture = load("res://assets/graphics/%s_themes/timeline/play.png" % theme_type.to_lower())
Global.play_forward.connect("toggled", self, "_on_PlayForward_toggled")
if Global.canvases.size() == 1:
if forward_dir:

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

@ -1,28 +1,30 @@
[gd_scene load_steps=41 format=2]
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/new_layer.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/delete_layer_disabled.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/move_up_disabled.png" type="Texture" id=4]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/move_down_disabled.png" type="Texture" id=5]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/merge_down_disabled.png" type="Texture" id=6]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/clone_layer.png" type="Texture" id=7]
[ext_resource path="res://assets/graphics/dark_themes/layers/new_layer.png" type="Texture" id=2]
[ext_resource path="res://assets/graphics/dark_themes/layers/delete_layer_disabled.png" type="Texture" id=3]
[ext_resource path="res://assets/graphics/dark_themes/layers/move_up_disabled.png" type="Texture" id=4]
[ext_resource path="res://assets/graphics/dark_themes/layers/move_down_disabled.png" type="Texture" id=5]
[ext_resource path="res://assets/graphics/dark_themes/layers/merge_down_disabled.png" type="Texture" id=6]
[ext_resource path="res://assets/graphics/dark_themes/layers/clone_layer.png" type="Texture" id=7]
[ext_resource path="res://src/UI/Timeline/LayerButton.tscn" type="PackedScene" id=18]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/new_frame.png" type="Texture" id=19]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=20]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/go_to_first_frame.png" type="Texture" id=21]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/play.png" type="Texture" id=22]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/previous_frame.png" type="Texture" id=23]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/play_backwards.png" type="Texture" id=24]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/go_to_last_frame.png" type="Texture" id=25]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/next_frame.png" type="Texture" id=26]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/copy_frame.png" type="Texture" id=27]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/tag.png" type="Texture" id=28]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/onion_skinning_off.png" type="Texture" id=29]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/expandable.png" type="Texture" id=30]
[ext_resource path="res://Assets/Graphics/dark_themes/timeline/loop.png" type="Texture" id=31]
[ext_resource path="res://assets/graphics/dark_themes/timeline/new_frame.png" type="Texture" id=19]
[ext_resource path="res://assets/graphics/dark_themes/timeline/remove_frame.png" type="Texture" id=20]
[ext_resource path="res://assets/graphics/dark_themes/timeline/go_to_first_frame.png" type="Texture" id=21]
[ext_resource path="res://assets/graphics/dark_themes/timeline/play.png" type="Texture" id=22]
[ext_resource path="res://assets/graphics/dark_themes/timeline/previous_frame.png" type="Texture" id=23]
[ext_resource path="res://assets/graphics/dark_themes/timeline/play_backwards.png" type="Texture" id=24]
[ext_resource path="res://assets/graphics/dark_themes/timeline/go_to_last_frame.png" type="Texture" id=25]
[ext_resource path="res://assets/graphics/dark_themes/timeline/next_frame.png" type="Texture" id=26]
[ext_resource path="res://assets/graphics/dark_themes/timeline/copy_frame.png" type="Texture" id=27]
[ext_resource path="res://assets/graphics/dark_themes/timeline/tag.png" type="Texture" id=28]
[ext_resource path="res://assets/graphics/dark_themes/timeline/onion_skinning_off.png" type="Texture" id=29]
[ext_resource path="res://assets/graphics/dark_themes/timeline/expandable.png" type="Texture" id=30]
[ext_resource path="res://assets/graphics/dark_themes/timeline/loop.png" type="Texture" id=31]
[ext_resource path="res://src/UI/Dialogs/FrameTagDialog.tscn" type="PackedScene" id=42]
[sub_resource type="InputEventKey" id=1]
control = true
command = true

12
src/UI/Timeline/LayerButton.gd
View file

@ -20,23 +20,23 @@ func _ready() -> void:
theme_type = "Dark"
if Global.layers[i][1]:
visibility_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/layer_visible.png" % theme_type.to_lower())
visibility_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/layer_visible.png" % theme_type.to_lower())
visibility_button.get_child(0).rect_size = Vector2(24, 14)
visibility_button.get_child(0).rect_position = Vector2(4, 9)
else:
visibility_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/layer_invisible.png" % theme_type.to_lower())
visibility_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/layer_invisible.png" % theme_type.to_lower())
visibility_button.get_child(0).rect_size = Vector2(24, 8)
visibility_button.get_child(0).rect_position = Vector2(4, 12)
if Global.layers[i][2]:
lock_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/lock.png" % theme_type.to_lower())
lock_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/lock.png" % theme_type.to_lower())
else:
lock_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/unlock.png" % theme_type.to_lower())
lock_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/unlock.png" % theme_type.to_lower())
if Global.layers[i][4]: # If new layers will be linked
linked_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/linked_layer.png" % theme_type.to_lower())
linked_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/linked_layer.png" % theme_type.to_lower())
else:
linked_button.get_child(0).texture = load("res://Assets/Graphics/%s_themes/layers/unlinked_layer.png" % theme_type.to_lower())
linked_button.get_child(0).texture = load("res://assets/graphics/%s_themes/layers/unlinked_layer.png" % theme_type.to_lower())
func _input(event : InputEvent) -> void:

8
src/UI/Timeline/LayerButton.tscn
View file

@ -1,9 +1,11 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://src/UI/Timeline/LayerButton.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/layer_visible.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/unlock.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/dark_themes/layers/unlinked_layer.png" type="Texture" id=4]
[ext_resource path="res://assets/graphics/dark_themes/layers/layer_visible.png" type="Texture" id=2]
[ext_resource path="res://assets/graphics/dark_themes/layers/unlock.png" type="Texture" id=3]
[ext_resource path="res://assets/graphics/dark_themes/layers/unlinked_layer.png" type="Texture" id=4]
[node name="LayerContainer" type="Button"]
margin_right = 210.0