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

Added a Splash Screen popup window

Re-organized transparent backgrounds, removed the Timer from Canvas nodes.
This commit is contained in:
OverloadedOrama 2019-12-31 18:04:00 +02:00
parent d1ef5c17e9
commit d42648efe1
28 changed files with 241 additions and 104 deletions

View file

Before

Width:  |  Height:  |  Size: 76 B

After

Width:  |  Height:  |  Size: 76 B

View file

@ -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]

View file

Before

Width:  |  Height:  |  Size: 76 B

After

Width:  |  Height:  |  Size: 76 B

View file

@ -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]

View file

Before

Width:  |  Height:  |  Size: 76 B

After

Width:  |  Height:  |  Size: 76 B

View file

@ -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]

View file

Before

Width:  |  Height:  |  Size: 76 B

After

Width:  |  Height:  |  Size: 76 B

View file

@ -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]

View file

Before

Width:  |  Height:  |  Size: 71 B

After

Width:  |  Height:  |  Size: 71 B

View file

@ -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]

Binary file not shown.

After

Width:  |  Height:  |  Size: 779 B

View file

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -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

View file

@ -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]

View file

@ -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]

View file

@ -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]

View file

@ -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]

View file

@ -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]

View file

@ -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"]

View file

@ -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"]

View file

@ -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"]

View file

@ -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"]

View file

@ -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()

View file

@ -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")

View file

@ -0,0 +1,4 @@
extends WindowDialog
func _on_ArtCredits_pressed() -> void:
OS.shell_open("https://www.instagram.com/erevos_art")

View file

@ -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()

View file

@ -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