Make splashscreen responsive to other aspect ratios

2 files changed, 33 insertions, 24 deletions

diff --git a/scenes/splashscreen.tscn b/scenes/splashscreen.tscn
index 5f9b6fa..44c82df 100644
--- a/scenes/splashscreen.tscn
+++ b/scenes/splashscreen.tscn
@@ -4,10 +4,10 @@
 [ext_resource path="res://desksmashers.svg" type="Texture" id=2]
 [ext_resource path="res://scripts/splashscreen.gd" type="Script" id=3]
 
-[sub_resource type="Animation" id=2]
+[sub_resource type="Animation" id=1]
 length = 0.001
 tracks/0/type = "value"
-tracks/0/path = NodePath("Sprite:modulate")
+tracks/0/path = NodePath("Logo:modulate")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
@@ -19,20 +19,20 @@ tracks/0/keys = {
 "values": [ Color( 1, 1, 1, 0 ) ]
 }
 
-[sub_resource type="Animation" id=1]
+[sub_resource type="Animation" id=2]
 resource_name = "splashscreen"
-length = 5.0
+length = 5.5
 tracks/0/type = "value"
-tracks/0/path = NodePath("Sprite:modulate")
+tracks/0/path = NodePath("Logo:modulate")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0.5, 2, 3.5, 5 ),
-"transitions": PoolRealArray( 1, 1, 1, 1 ),
+"times": PoolRealArray( 0, 0.5, 2, 3.5, 5, 5.5 ),
+"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
 "update": 0,
-"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
+"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ) ]
 }
 tracks/1/type = "audio"
 tracks/1/path = NodePath("Audio")
@@ -49,7 +49,9 @@ tracks/1/keys = {
 "times": PoolRealArray( 1.5 )
 }
 
-[node name="Node" type="Node"]
+[node name="SplashScreen" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
 script = ExtResource( 3 )
 
 [node name="Audio" type="AudioStreamPlayer" parent="."]
@@ -57,26 +59,33 @@ stream = ExtResource( 1 )
 volume_db = -20.0
 
 [node name="ColorRect" type="ColorRect" parent="."]
-margin_right = 214.0
-margin_bottom = 120.0
+anchor_right = 1.0
+anchor_bottom = 1.0
 color = Color( 0, 0, 0, 1 )
 
-[node name="Sprite" type="Sprite" parent="."]
+[node name="Logo" type="Control" parent="."]
 modulate = Color( 1, 1, 1, 0 )
-position = Vector2( 107, 60 )
-scale = Vector2( 0.05, 0.05 )
-texture = ExtResource( 2 )
+anchor_right = 1.0
+anchor_bottom = 1.0
 
-[node name="Label" type="Label" parent="Sprite"]
-margin_left = -900.0
-margin_top = 620.0
-margin_right = -804.0
-margin_bottom = 636.0
-rect_scale = Vector2( 20, 20 )
+[node name="Label" type="Label" parent="Logo"]
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+margin_left = -48.0
+margin_top = 29.0
+margin_right = 48.0
+margin_bottom = 45.0
 text = "desksmashers"
 
+[node name="Sprite" type="Sprite" parent="Logo/Label"]
+position = Vector2( 48, -30 )
+scale = Vector2( 0.05, 0.05 )
+texture = ExtResource( 2 )
+
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-anims/RESET = SubResource( 2 )
-anims/splashscreen = SubResource( 1 )
+anims/RESET = SubResource( 1 )
+anims/splashscreen = SubResource( 2 )
 
 [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"]
diff --git a/scripts/splashscreen.gd b/scripts/splashscreen.gd
index 01291e9..22675a7 100644
--- a/scripts/splashscreen.gd
+++ b/scripts/splashscreen.gd
@@ -1,4 +1,4 @@
-extends Node
+extends Control
 
 func _ready():
 	global_variables.startup = true