huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

Fixed issue on exporting spritesheet

Browse source 
The spritesheet_rows/column variable wasn't updated when choosing between Columns/Rows. Also updated the GitHub Contributors in the About dialog.
This commit is contained in:
OverloadedOrama 2019-12-30 00:50:58 +02:00
parent 3ae679fe00
commit 2be96f5d53
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Prefabs/Dialogs/AboutDialog.tscn
View file

@ -33,7 +33,6 @@ margin_bottom = 64.0
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="SloganAndLinks" type="CenterContainer" parent="AboutUI/IconsButtons"] [node name="SloganAndLinks" type="CenterContainer" parent="AboutUI/IconsButtons"]
editor/display_folded = true
margin_left = 68.0 margin_left = 68.0
margin_right = 420.0 margin_right = 420.0
margin_bottom = 64.0 margin_bottom = 64.0
@ -60,18 +59,21 @@ margin_bottom = 39.0
[node name="Website" type="Button" parent="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons"] [node name="Website" type="Button" parent="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons"]
margin_right = 65.0 margin_right = 65.0
margin_bottom = 20.0 margin_bottom = 20.0
mouse_default_cursor_shape = 2
text = "Website" text = "Website"
[node name="GitHub" type="Button" parent="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons"] [node name="GitHub" type="Button" parent="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons"]
margin_left = 69.0 margin_left = 69.0
margin_right = 162.0 margin_right = 162.0
margin_bottom = 20.0 margin_bottom = 20.0
mouse_default_cursor_shape = 2
text = "GitHub Repo" text = "GitHub Repo"
[node name="Donate" type="Button" parent="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons"] [node name="Donate" type="Button" parent="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons"]
margin_left = 166.0 margin_left = 166.0
margin_right = 224.0 margin_right = 224.0
margin_bottom = 20.0 margin_bottom = 20.0
mouse_default_cursor_shape = 2
text = "Donate" text = "Donate"
[node name="OramaLogo" type="TextureRect" parent="AboutUI/IconsButtons"] [node name="OramaLogo" type="TextureRect" parent="AboutUI/IconsButtons"]
@ -86,7 +88,6 @@ margin_right = 488.0
margin_bottom = 72.0 margin_bottom = 72.0
[node name="Credits" type="HSplitContainer" parent="AboutUI"] [node name="Credits" type="HSplitContainer" parent="AboutUI"]
editor/display_folded = true
margin_top = 76.0 margin_top = 76.0
margin_right = 488.0 margin_right = 488.0
margin_bottom = 233.0 margin_bottom = 233.0
@ -129,7 +130,7 @@ size_flags_horizontal = 3
[node name="Label" type="Label" parent="AboutUI/Credits/Contributors"] [node name="Label" type="Label" parent="AboutUI/Credits/Contributors"]
margin_right = 242.0 margin_right = 242.0
margin_bottom = 14.0 margin_bottom = 14.0
text = "Contributors" text = "GitHub Contributors"
[node name="ContributorTree" type="Tree" parent="AboutUI/Credits/Contributors"] [node name="ContributorTree" type="Tree" parent="AboutUI/Credits/Contributors"]
margin_top = 18.0 margin_top = 18.0

14
Scripts/Dialogs/AboutDialog.gd
View file

@ -25,16 +25,16 @@ func _ready() -> void:
developers.create_item(dev_root).set_text(0, " John Nikitakis (Erevos) - UI Designer") developers.create_item(dev_root).set_text(0, " John Nikitakis (Erevos) - UI Designer")
var contributor_root := contributors.create_item() var contributor_root := contributors.create_item()
contributors.create_item(contributor_root).set_text(0, " Calinou") contributors.create_item(contributor_root).set_text(0, " Hugo Locurcio")
contributors.create_item(contributor_root).set_text(0, " greusser") contributors.create_item(contributor_root).set_text(0, " CheetoHead")
contributors.create_item(contributor_root).set_text(0, " tiritto") contributors.create_item(contributor_root).set_text(0, " Dawid Niedźwiedzki")
contributors.create_item(contributor_root).set_text(0, " YeldhamDev") contributors.create_item(contributor_root).set_text(0, " Michael Alexsander")
contributors.create_item(contributor_root).set_text(0, " Martin1991zab") contributors.create_item(contributor_root).set_text(0, " Martin Zabinski")
contributors.create_item(contributor_root).set_text(0, " azagaya") contributors.create_item(contributor_root).set_text(0, " azagaya")
contributors.create_item(contributor_root).set_text(0, " Schweini07") contributors.create_item(contributor_root).set_text(0, " Schweini07")
contributors.create_item(contributor_root).set_text(0, " Andreev Andrei")
contributors.create_item(contributor_root).set_text(0, " Subhang Nanduri")
contributors.create_item(contributor_root).set_text(0, " danielnaoexiste") contributors.create_item(contributor_root).set_text(0, " danielnaoexiste")
contributors.create_item(contributor_root).set_text(0, " SbNanduri")
contributors.create_item(contributor_root).set_text(0, " AndreevAndrei")
contributors.create_item(contributor_root).set_text(0, " JunYouIntrovert") contributors.create_item(contributor_root).set_text(0, " JunYouIntrovert")
var donors_root := donors.create_item() var donors_root := donors.create_item()

5
Scripts/Dialogs/ExportSprites.gd
View file

@ -4,11 +4,13 @@ var current_export_path := ""
var export_option := 0 var export_option := 0
var resize := 100 var resize := 100
var interpolation = Image.INTERPOLATE_NEAREST var interpolation = Image.INTERPOLATE_NEAREST
var frames_spinbox : SpinBox
var per_rows := false var per_rows := false
var spritesheet_rows = 1 var spritesheet_rows = 1
var spritesheet_columns = 1 var spritesheet_columns = 1
func _ready() -> void: func _ready() -> void:
frames_spinbox = Global.find_node_by_name(self, "Frames")
var children := [] var children := []
for i in range(get_child_count()): for i in range(get_child_count()):
if i > 7: if i > 7:
@ -34,10 +36,11 @@ func _on_Interpolation_item_selected(ID : int) -> void:
func _on_ColumnsOrRows_item_selected(ID) -> void: func _on_ColumnsOrRows_item_selected(ID) -> void:
per_rows = bool(ID) per_rows = bool(ID)
# Update spritesheet_rows/columns variable
_on_Frames_value_changed(frames_spinbox.value)
func _on_Frames_value_changed(value): func _on_Frames_value_changed(value):
value = min(value, Global.canvases.size()) value = min(value, Global.canvases.size())
var frames_spinbox : SpinBox = Global.find_node_by_name(self, "Frames")
if per_rows: if per_rows:
spritesheet_rows = value spritesheet_rows = value