From d42648efe1c85e07a19426dfefd5965c7f2a31d1 Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Tue, 31 Dec 2019 18:04:00 +0200 Subject: [PATCH] Added a Splash Screen popup window Re-organized transparent backgrounds, removed the Timer from Canvas nodes. --- .../Transparent Background Dark.png | Bin .../Transparent Background Dark.png.import | 13 ++++ .../Transparent Background Godot.png | Bin .../Transparent Background Godot.png.import | 13 ++++ .../Transparent Background Gold.png | Bin .../Transparent Background Gold.png.import | 13 ++++ .../Transparent Background Gray.png | Bin .../Transparent Background Gray.png.import | 13 ++++ .../Transparent Background Light.png | Bin .../Transparent Background Light.png.import | 13 ++++ Assets/Graphics/Pixelorama Logo.png | Bin 0 -> 779 bytes Assets/Graphics/Pixelorama Logo.png.import | 34 +++++++++ Assets/Graphics/Splash Art.png | Bin 0 -> 18895 bytes Assets/Graphics/Splash Art.png.import | 34 +++++++++ .../Transparent Background Dark.png.import | 13 ---- .../Transparent Background Godot.png.import | 13 ---- .../Transparent Background Gold.png.import | 13 ---- .../Transparent Background Gray.png.import | 13 ---- .../Transparent Background Light.png.import | 13 ---- Main.tscn | 48 +++++++------ Prefabs/Canvas.tscn | 6 -- Prefabs/Dialogs/AboutDialog.tscn | 2 +- Prefabs/Dialogs/SplashDialog.tscn | 68 ++++++++++++++++++ Scripts/Canvas.gd | 5 -- Scripts/Dialogs/PreferencesDialog.gd | 10 +-- Scripts/Dialogs/SplashDialog.gd | 4 ++ Scripts/Global.gd | 2 +- Scripts/Main.gd | 2 + 28 files changed, 241 insertions(+), 104 deletions(-) rename Assets/Graphics/{ => Canvas Backgrounds}/Transparent Background Dark.png (100%) create mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png.import rename Assets/Graphics/{ => Canvas Backgrounds}/Transparent Background Godot.png (100%) create mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png.import rename Assets/Graphics/{ => Canvas Backgrounds}/Transparent Background Gold.png (100%) create mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png.import rename Assets/Graphics/{ => Canvas Backgrounds}/Transparent Background Gray.png (100%) create mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png.import rename Assets/Graphics/{ => Canvas Backgrounds}/Transparent Background Light.png (100%) create mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png.import create mode 100644 Assets/Graphics/Pixelorama Logo.png create mode 100644 Assets/Graphics/Pixelorama Logo.png.import create mode 100644 Assets/Graphics/Splash Art.png create mode 100644 Assets/Graphics/Splash Art.png.import delete mode 100644 Assets/Graphics/Transparent Background Dark.png.import delete mode 100644 Assets/Graphics/Transparent Background Godot.png.import delete mode 100644 Assets/Graphics/Transparent Background Gold.png.import delete mode 100644 Assets/Graphics/Transparent Background Gray.png.import delete mode 100644 Assets/Graphics/Transparent Background Light.png.import create mode 100644 Prefabs/Dialogs/SplashDialog.tscn create mode 100644 Scripts/Dialogs/SplashDialog.gd diff --git a/Assets/Graphics/Transparent Background Dark.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png similarity index 100% rename from Assets/Graphics/Transparent Background Dark.png rename to Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png.import new file mode 100644 index 000000000..e8017cb56 --- /dev/null +++ b/Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png.import @@ -0,0 +1,13 @@ +[remap] + +importer="image" +type="Image" +path="res://.import/Transparent Background Dark.png-76340c38abb38368ba157d6d42537548.image" + +[deps] + +source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png" +dest_files=[ "res://.import/Transparent Background Dark.png-76340c38abb38368ba157d6d42537548.image" ] + +[params] + diff --git a/Assets/Graphics/Transparent Background Godot.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png similarity index 100% rename from Assets/Graphics/Transparent Background Godot.png rename to Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png.import new file mode 100644 index 000000000..191921df3 --- /dev/null +++ b/Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png.import @@ -0,0 +1,13 @@ +[remap] + +importer="image" +type="Image" +path="res://.import/Transparent Background Godot.png-2ddcbcc731f6af7d3e0a5b1ee5b54844.image" + +[deps] + +source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png" +dest_files=[ "res://.import/Transparent Background Godot.png-2ddcbcc731f6af7d3e0a5b1ee5b54844.image" ] + +[params] + diff --git a/Assets/Graphics/Transparent Background Gold.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png similarity index 100% rename from Assets/Graphics/Transparent Background Gold.png rename to Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png.import new file mode 100644 index 000000000..17440251b --- /dev/null +++ b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png.import @@ -0,0 +1,13 @@ +[remap] + +importer="image" +type="Image" +path="res://.import/Transparent Background Gold.png-9883f0ee7852c84e58c30fd7ac89dd4d.image" + +[deps] + +source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png" +dest_files=[ "res://.import/Transparent Background Gold.png-9883f0ee7852c84e58c30fd7ac89dd4d.image" ] + +[params] + diff --git a/Assets/Graphics/Transparent Background Gray.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png similarity index 100% rename from Assets/Graphics/Transparent Background Gray.png rename to Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png.import new file mode 100644 index 000000000..d8bce1ccc --- /dev/null +++ b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png.import @@ -0,0 +1,13 @@ +[remap] + +importer="image" +type="Image" +path="res://.import/Transparent Background Gray.png-eed3c3f748abdb10b7fbc1cb1016c71f.image" + +[deps] + +source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png" +dest_files=[ "res://.import/Transparent Background Gray.png-eed3c3f748abdb10b7fbc1cb1016c71f.image" ] + +[params] + diff --git a/Assets/Graphics/Transparent Background Light.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png similarity index 100% rename from Assets/Graphics/Transparent Background Light.png rename to Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png.import new file mode 100644 index 000000000..c1a18ee35 --- /dev/null +++ b/Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png.import @@ -0,0 +1,13 @@ +[remap] + +importer="image" +type="Image" +path="res://.import/Transparent Background Light.png-c7ac6073a0483aa35eb1dc260c1a8481.image" + +[deps] + +source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png" +dest_files=[ "res://.import/Transparent Background Light.png-c7ac6073a0483aa35eb1dc260c1a8481.image" ] + +[params] + diff --git a/Assets/Graphics/Pixelorama Logo.png b/Assets/Graphics/Pixelorama Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..1213f88838b60dc4ae2045c8718fb883d6f4a30f GIT binary patch literal 779 zcmV+m1N8ifP)npcH+Zm2=&9K4-V1F%Pz5WqBOumDVh1`EJ6h8V-Dpq=Ti zne}ZwV_ZAqHhO@sHvhHx^t0?Y1yW&wV((BWd!`1Pc|JS8#x;9wB-I(E6l*idQI(Dhcmge6irrOT_0l9NkCrQ07<30PjqvSdyq)D~qNxP~xG%q}ve`cMjJemYr_aQo zJDQy}^wK9+K#R!jWg=(?CMD<7V9?Kore3Ind!gmS7#4tO&?Vf7e5yI)6V<$X;&=RP zb~Dz8m&mfA!P@CPds>?|%sp1-;42V%yS=!G?+XnU)M#wsWwi#&dV3j%a2uZUYQxyi?(M>7k)4NP?wpxVMZFx*et8|Uzt7-P-L9+!5L|6c(v0Q`|$zoZM zvz*dv@2Z~}?AxE@+gTm9Dt(_Pf1e+aqQUZEJ;Ppd{w}umHUHXz;X&RVI3U3f$+(&C zO!y<~Rz7qI0ZfAkYY?qnL#KiMe0+(-E5E`#m(zTX&>eh?dVIKz$^9`~Yl@@CZg6i0}(0RR9N_8+PC0B#;UCkg-n002ov JPDHLkV1ny9fM);z literal 0 HcmV?d00001 diff --git a/Assets/Graphics/Pixelorama Logo.png.import b/Assets/Graphics/Pixelorama Logo.png.import new file mode 100644 index 000000000..a3d454881 --- /dev/null +++ b/Assets/Graphics/Pixelorama Logo.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Pixelorama Logo.png-f3146b235a1a694312071ac48f3cbb1a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Pixelorama Logo.png" +dest_files=[ "res://.import/Pixelorama Logo.png-f3146b235a1a694312071ac48f3cbb1a.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/Splash Art.png b/Assets/Graphics/Splash Art.png new file mode 100644 index 0000000000000000000000000000000000000000..0119b4776f142866a037c0044b7d953ce155521c GIT binary patch literal 18895 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 C;+!=A literal 0 HcmV?d00001 diff --git a/Assets/Graphics/Splash Art.png.import b/Assets/Graphics/Splash Art.png.import new file mode 100644 index 000000000..a70696f5d --- /dev/null +++ b/Assets/Graphics/Splash Art.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Splash Art.png-7e9c202d723183977c75371f0834f1d5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Graphics/Splash Art.png" +dest_files=[ "res://.import/Splash Art.png-7e9c202d723183977c75371f0834f1d5.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/Transparent Background Dark.png.import b/Assets/Graphics/Transparent Background Dark.png.import deleted file mode 100644 index fed594b49..000000000 --- a/Assets/Graphics/Transparent Background Dark.png.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="image" -type="Image" -path="res://.import/Transparent Background Dark.png-3390cbd0582c34c8d5e9ea776775a7f5.image" - -[deps] - -source_file="res://Assets/Graphics/Transparent Background Dark.png" -dest_files=[ "res://.import/Transparent Background Dark.png-3390cbd0582c34c8d5e9ea776775a7f5.image" ] - -[params] - diff --git a/Assets/Graphics/Transparent Background Godot.png.import b/Assets/Graphics/Transparent Background Godot.png.import deleted file mode 100644 index 0ce308948..000000000 --- a/Assets/Graphics/Transparent Background Godot.png.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="image" -type="Image" -path="res://.import/Transparent Background Godot.png-d1a39497ccb71eaedecb0ccf98e2bf02.image" - -[deps] - -source_file="res://Assets/Graphics/Transparent Background Godot.png" -dest_files=[ "res://.import/Transparent Background Godot.png-d1a39497ccb71eaedecb0ccf98e2bf02.image" ] - -[params] - diff --git a/Assets/Graphics/Transparent Background Gold.png.import b/Assets/Graphics/Transparent Background Gold.png.import deleted file mode 100644 index e80a0a4c6..000000000 --- a/Assets/Graphics/Transparent Background Gold.png.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="image" -type="Image" -path="res://.import/Transparent Background Gold.png-df3e9b1fb8719f4a7356d4379d2066e3.image" - -[deps] - -source_file="res://Assets/Graphics/Transparent Background Gold.png" -dest_files=[ "res://.import/Transparent Background Gold.png-df3e9b1fb8719f4a7356d4379d2066e3.image" ] - -[params] - diff --git a/Assets/Graphics/Transparent Background Gray.png.import b/Assets/Graphics/Transparent Background Gray.png.import deleted file mode 100644 index 530cfb806..000000000 --- a/Assets/Graphics/Transparent Background Gray.png.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="image" -type="Image" -path="res://.import/Transparent Background Gray.png-0ba67df3c826cdf2e974e693683b6f48.image" - -[deps] - -source_file="res://Assets/Graphics/Transparent Background Gray.png" -dest_files=[ "res://.import/Transparent Background Gray.png-0ba67df3c826cdf2e974e693683b6f48.image" ] - -[params] - diff --git a/Assets/Graphics/Transparent Background Light.png.import b/Assets/Graphics/Transparent Background Light.png.import deleted file mode 100644 index f605a59f4..000000000 --- a/Assets/Graphics/Transparent Background Light.png.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="image" -type="Image" -path="res://.import/Transparent Background Light.png-b8fc15986e017571551750d8790f3518.image" - -[deps] - -source_file="res://Assets/Graphics/Transparent Background Light.png" -dest_files=[ "res://.import/Transparent Background Light.png-b8fc15986e017571551750d8790f3518.image" ] - -[params] - diff --git a/Main.tscn b/Main.tscn index 7080271a8..7f6205ef7 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=91 format=2] +[gd_scene load_steps=92 format=2] [ext_resource path="res://Themes & Styles/Dark Theme/Dark Theme.tres" type="Theme" id=1] [ext_resource path="res://Scripts/Main.gd" type="Script" id=2] @@ -58,16 +58,17 @@ [ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Merge_Down_Hover.png" type="Texture" id=56] [ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Merge_Down_Disabled.png" type="Texture" id=57] [ext_resource path="res://Prefabs/BrushButton.tscn" type="PackedScene" id=58] -[ext_resource path="res://Prefabs/Dialogs/CreateNewImage.tscn" type="PackedScene" id=59] -[ext_resource path="res://Prefabs/Dialogs/ImportSprites.tscn" type="PackedScene" id=60] -[ext_resource path="res://Prefabs/Dialogs/ExportSprites.tscn" type="PackedScene" id=61] -[ext_resource path="res://Prefabs/Dialogs/ScaleImage.tscn" type="PackedScene" id=62] -[ext_resource path="res://Prefabs/Dialogs/PreferencesDialog.tscn" type="PackedScene" id=63] -[ext_resource path="res://Prefabs/Dialogs/OutlineDialog.tscn" type="PackedScene" id=64] -[ext_resource path="res://Prefabs/Dialogs/AboutDialog.tscn" type="PackedScene" id=65] -[ext_resource path="res://Prefabs/EditPalettePopup.tscn" type="PackedScene" id=66] -[ext_resource path="res://Prefabs/NewPaletteDialog.tscn" type="PackedScene" id=67] -[ext_resource path="res://Prefabs/PaletteImportFileDialog.tscn" type="PackedScene" id=68] +[ext_resource path="res://Prefabs/Dialogs/SplashDialog.tscn" type="PackedScene" id=59] +[ext_resource path="res://Prefabs/Dialogs/CreateNewImage.tscn" type="PackedScene" id=60] +[ext_resource path="res://Prefabs/Dialogs/ImportSprites.tscn" type="PackedScene" id=61] +[ext_resource path="res://Prefabs/Dialogs/ExportSprites.tscn" type="PackedScene" id=62] +[ext_resource path="res://Prefabs/Dialogs/ScaleImage.tscn" type="PackedScene" id=63] +[ext_resource path="res://Prefabs/Dialogs/PreferencesDialog.tscn" type="PackedScene" id=64] +[ext_resource path="res://Prefabs/Dialogs/OutlineDialog.tscn" type="PackedScene" id=65] +[ext_resource path="res://Prefabs/Dialogs/AboutDialog.tscn" type="PackedScene" id=66] +[ext_resource path="res://Prefabs/EditPalettePopup.tscn" type="PackedScene" id=67] +[ext_resource path="res://Prefabs/NewPaletteDialog.tscn" type="PackedScene" id=68] +[ext_resource path="res://Prefabs/PaletteImportFileDialog.tscn" type="PackedScene" id=69] [sub_resource type="InputEventKey" id=1] scancode = 88 @@ -1534,6 +1535,7 @@ rect_min_size = Vector2( 106, 0 ) mouse_default_cursor_shape = 2 size_flags_vertical = 1 value = 100.0 +ticks_on_borders = true [node name="OpacitySpinBox" type="SpinBox" parent="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/OpacityCenter/OpacityContainer"] margin_left = 158.0 @@ -1619,7 +1621,10 @@ scroll_horizontal_enabled = false [node name="ProjectBrushContainer" type="GridContainer" parent="BrushesPopup/TabContainer/Project"] columns = 5 -[node name="CreateNewImage" parent="." instance=ExtResource( 59 )] +[node name="SplashDialog" parent="." instance=ExtResource( 59 )] +visible = false + +[node name="CreateNewImage" parent="." instance=ExtResource( 60 )] [node name="OpenSprite" type="FileDialog" parent="."] margin_right = 515.0 @@ -1648,17 +1653,17 @@ filters = PoolStringArray( "*.pxo ; Pixelorama Project" ) current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama" current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/" -[node name="ImportSprites" parent="." instance=ExtResource( 60 )] +[node name="ImportSprites" parent="." instance=ExtResource( 61 )] -[node name="ExportSprites" parent="." instance=ExtResource( 61 )] +[node name="ExportSprites" parent="." instance=ExtResource( 62 )] -[node name="ScaleImage" parent="." instance=ExtResource( 62 )] +[node name="ScaleImage" parent="." instance=ExtResource( 63 )] -[node name="PreferencesDialog" parent="." instance=ExtResource( 63 )] +[node name="PreferencesDialog" parent="." instance=ExtResource( 64 )] -[node name="OutlineDialog" parent="." instance=ExtResource( 64 )] +[node name="OutlineDialog" parent="." instance=ExtResource( 65 )] -[node name="AboutDialog" parent="." instance=ExtResource( 65 )] +[node name="AboutDialog" parent="." instance=ExtResource( 66 )] [node name="QuitDialog" type="ConfirmationDialog" parent="."] margin_right = 200.0 @@ -1672,12 +1677,12 @@ margin_bottom = 60.0 window_title = "Error!" dialog_text = "This is an error message!" -[node name="EditPalettePopup" parent="." instance=ExtResource( 66 )] +[node name="EditPalettePopup" parent="." instance=ExtResource( 67 )] visible = false -[node name="NewPaletteDialog" parent="." instance=ExtResource( 67 )] +[node name="NewPaletteDialog" parent="." instance=ExtResource( 68 )] -[node name="PaletteImportFileDialog" parent="." instance=ExtResource( 68 )] +[node name="PaletteImportFileDialog" parent="." instance=ExtResource( 69 )] filters = PoolStringArray( "*.json ; JavaScript Object Notation", "*.gpl ; Gimp Palette Library" ) current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama" current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/" @@ -1751,6 +1756,7 @@ visible = false [connection signal="pressed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/CenterLayerButtons/LayerButtons/MergeDownLayer" to="." method="_on_MergeLayer_pressed"] [connection signal="value_changed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/OpacityCenter/OpacityContainer/OpacitySlider" to="." method="_on_OpacitySlider_value_changed"] [connection signal="value_changed" from="MenuAndUI/UI/LayerPanel/LayersAndMisc/LayerVBoxContainer/OpacityCenter/OpacityContainer/OpacitySpinBox" to="." method="_on_OpacitySlider_value_changed"] +[connection signal="popup_hide" from="SplashDialog" to="." method="_can_draw_true"] [connection signal="popup_hide" from="CreateNewImage" to="." method="_can_draw_true"] [connection signal="file_selected" from="OpenSprite" to="." method="_on_OpenSprite_file_selected"] [connection signal="popup_hide" from="OpenSprite" to="." method="_on_ImportSprites_popup_hide"] diff --git a/Prefabs/Canvas.tscn b/Prefabs/Canvas.tscn index c22336034..130060c63 100644 --- a/Prefabs/Canvas.tscn +++ b/Prefabs/Canvas.tscn @@ -4,9 +4,3 @@ [node name="Canvas" type="Node2D"] script = ExtResource( 1 ) - -[node name="Timer" type="Timer" parent="."] -wait_time = 0.2 -one_shot = true -autostart = true -[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] diff --git a/Prefabs/Dialogs/AboutDialog.tscn b/Prefabs/Dialogs/AboutDialog.tscn index 630bf4382..492d7be3c 100644 --- a/Prefabs/Dialogs/AboutDialog.tscn +++ b/Prefabs/Dialogs/AboutDialog.tscn @@ -177,7 +177,7 @@ margin_top = 263.0 margin_right = 488.0 margin_bottom = 276.0 custom_fonts/font = ExtResource( 5 ) -text = "Copyright 2019 - Orama Interactive" +text = "Copyright 2019-2020 Orama Interactive" align = 1 [connection signal="about_to_show" from="." to="." method="_on_AboutDialog_about_to_show"] [connection signal="pressed" from="AboutUI/IconsButtons/SloganAndLinks/VBoxContainer/LinkButtons/Website" to="." method="_on_Website_pressed"] diff --git a/Prefabs/Dialogs/SplashDialog.tscn b/Prefabs/Dialogs/SplashDialog.tscn new file mode 100644 index 000000000..7a688db38 --- /dev/null +++ b/Prefabs/Dialogs/SplashDialog.tscn @@ -0,0 +1,68 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://Scripts/Dialogs/SplashDialog.gd" type="Script" id=1] +[ext_resource path="res://Assets/Graphics/Pixelorama Logo.png" type="Texture" id=2] +[ext_resource path="res://Assets/Graphics/Splash Art.png" type="Texture" id=3] +[ext_resource path="res://Assets/Fonts/Roboto-Small.tres" type="DynamicFont" id=4] + +[node name="SplashDialog" type="WindowDialog"] +visible = true +margin_right = 400.0 +margin_bottom = 380.0 +rect_min_size = Vector2( 400, 380 ) +script = ExtResource( 1 ) + +[node name="Contents" type="VBoxContainer" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 + +[node name="PixeloramaLogo" type="TextureRect" parent="Contents"] +margin_left = 50.0 +margin_right = 350.0 +margin_bottom = 40.0 +size_flags_horizontal = 4 +texture = ExtResource( 2 ) + +[node name="HSeparator" type="HSeparator" parent="Contents"] +margin_top = 44.0 +margin_right = 400.0 +margin_bottom = 48.0 + +[node name="SplashArt" type="TextureRect" parent="Contents"] +margin_left = 12.0 +margin_top = 52.0 +margin_right = 387.0 +margin_bottom = 302.0 +rect_min_size = Vector2( 375, 250 ) +size_flags_horizontal = 4 +texture = ExtResource( 3 ) +expand = true + +[node name="ArtCredits" type="Button" parent="Contents"] +margin_top = 306.0 +margin_right = 400.0 +margin_bottom = 326.0 +text = "Art by Erevoid" +flat = true + +[node name="HSeparator2" type="HSeparator" parent="Contents"] +margin_top = 330.0 +margin_right = 400.0 +margin_bottom = 334.0 + +[node name="DevelopedBy" type="Label" parent="Contents"] +margin_top = 338.0 +margin_right = 400.0 +margin_bottom = 351.0 +custom_fonts/font = ExtResource( 4 ) +text = "Pixelorama v0.6 - Developed by Orama Interactive" +align = 1 + +[node name="Copyright" type="Label" parent="Contents"] +margin_top = 355.0 +margin_right = 400.0 +margin_bottom = 368.0 +custom_fonts/font = ExtResource( 4 ) +text = "Copyright 2019-2020 Orama Interactive" +align = 1 +[connection signal="pressed" from="Contents/ArtCredits" to="." method="_on_ArtCredits_pressed"] diff --git a/Scripts/Canvas.gd b/Scripts/Canvas.gd index 5f57ec319..1dd934780 100644 --- a/Scripts/Canvas.gd +++ b/Scripts/Canvas.gd @@ -29,8 +29,6 @@ var line_2d : Line2D # Called when the node enters the scene tree for the first time. func _ready() -> void: - Global.can_draw = false - # The sprite itself if layers.empty(): var sprite := Image.new() @@ -837,9 +835,6 @@ func point_in_rectangle(p : Vector2, coord1 : Vector2, coord2 : Vector2) -> bool func rectangle_center(rect_position : Vector2, rect_size : Vector2) -> Vector2: return (rect_position - rect_size / 2).floor() -func _on_Timer_timeout() -> void: - Global.can_draw = true - # Custom blend rect function, needed because Godot's issue #31124 func blend_rect(bg : Image, brush : Image, src_rect : Rect2, dst : Vector2) -> void: var brush_size := brush.get_size() diff --git a/Scripts/Dialogs/PreferencesDialog.gd b/Scripts/Dialogs/PreferencesDialog.gd index 33b1e8f20..2598eadde 100644 --- a/Scripts/Dialogs/PreferencesDialog.gd +++ b/Scripts/Dialogs/PreferencesDialog.gd @@ -89,35 +89,35 @@ func change_theme(ID : int) -> void: var ruler_style if ID == 0: #Dark Theme Global.theme_type = "Dark" - Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Dark.png"), 0) + Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png"), 0) VisualServer.set_default_clear_color(Color(0.247059, 0.25098, 0.247059)) main_theme = preload("res://Themes & Styles/Dark Theme/Dark Theme.tres") top_menu_style = preload("res://Themes & Styles/Dark Theme/DarkTopMenuStyle.tres") ruler_style = preload("res://Themes & Styles/Dark Theme/DarkRulerStyle.tres") elif ID == 1: #Gray Theme Global.theme_type = "Dark" - Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Gray.png"), 0) + Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png"), 0) VisualServer.set_default_clear_color(Color(0.301961, 0.301961, 0.301961)) main_theme = preload("res://Themes & Styles/Gray Theme/Gray Theme.tres") top_menu_style = preload("res://Themes & Styles/Gray Theme/GrayTopMenuStyle.tres") ruler_style = preload("res://Themes & Styles/Dark Theme/DarkRulerStyle.tres") elif ID == 2: #Godot's Theme Global.theme_type = "Dark" - Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Godot.png"), 0) + Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png"), 0) VisualServer.set_default_clear_color(Color(0.27451, 0.278431, 0.305882)) main_theme = preload("res://Themes & Styles/Godot\'s Theme/Godot\'s Theme.tres") top_menu_style = preload("res://Themes & Styles/Godot\'s Theme/TopMenuStyle.tres") ruler_style = preload("res://Themes & Styles/Godot\'s Theme/RulerStyle.tres") elif ID == 3: #Gold Theme Global.theme_type = "Gold" - Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Gold.png"), 0) + Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png"), 0) VisualServer.set_default_clear_color(Color(0.694118, 0.619608, 0.458824)) main_theme = preload("res://Themes & Styles/Gold Theme/Gold Theme.tres") top_menu_style = preload("res://Themes & Styles/Gold Theme/GoldTopMenuStyle.tres") ruler_style = preload("res://Themes & Styles/Gold Theme/GoldRulerStyle.tres") elif ID == 4: #Light Theme Global.theme_type = "Light" - Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Light.png"), 0) + Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png"), 0) VisualServer.set_default_clear_color(Color(0.705882, 0.705882, 0.705882)) main_theme = preload("res://Themes & Styles/Light Theme/Light Theme.tres") top_menu_style = preload("res://Themes & Styles/Light Theme/LightTopMenuStyle.tres") diff --git a/Scripts/Dialogs/SplashDialog.gd b/Scripts/Dialogs/SplashDialog.gd new file mode 100644 index 000000000..061617bbf --- /dev/null +++ b/Scripts/Dialogs/SplashDialog.gd @@ -0,0 +1,4 @@ +extends WindowDialog + +func _on_ArtCredits_pressed() -> void: + OS.shell_open("https://www.instagram.com/erevos_art") diff --git a/Scripts/Global.gd b/Scripts/Global.gd index 46c9f4bf3..2d0dd81c8 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -222,7 +222,7 @@ func _ready() -> void: undo_redo = UndoRedo.new() transparent_background = ImageTexture.new() - transparent_background.create_from_image(preload("res://Assets/Graphics/Transparent Background Dark.png"), 0) + transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png"), 0) image_clipboard = Image.new() var root = get_tree().get_root() diff --git a/Scripts/Main.gd b/Scripts/Main.gd index 6870324b0..cff3e1f2e 100644 --- a/Scripts/Main.gd +++ b/Scripts/Main.gd @@ -153,6 +153,8 @@ func _ready() -> void: Import.import_brushes("Brushes") + $SplashDialog.popup_centered() # Splash screen + func _input(event : InputEvent) -> void: Global.left_cursor.position = get_global_mouse_position() + Vector2(-32, 32) Global.left_cursor.texture = Global.left_cursor_tool_texture