Skip to content

Commit

Permalink
Loading Screen Update
Browse files Browse the repository at this point in the history
We can now transition between scenes.
A new autoload "Transition" let's you load things (files) like other scenes and transition between them
  • Loading branch information
Frakif91 committed Oct 7, 2024
1 parent d98359b commit 47fcc61
Show file tree
Hide file tree
Showing 26 changed files with 561 additions and 72 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ Example.avi

# Custom Ignores
/build/
Movie.avi
Binary file added Assets/Handmade/IMG_20240927_141423.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Assets/Handmade/IMG_20240927_141423.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dmodglff3fjxv"
path="res://.godot/imported/IMG_20240927_141423.png-00aff0455710140f088fc80b0ef85b95.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Handmade/IMG_20240927_141423.png"
dest_files=["res://.godot/imported/IMG_20240927_141423.png-00aff0455710140f088fc80b0ef85b95.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
5 changes: 2 additions & 3 deletions Godot/Nodes/Brother/MarioOverworld.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ext_resource type="Script" path="res://Godot/Scripts/MarioOverworld_Movement.gd" id="1_ehyyf"]
[ext_resource type="SpriteFrames" uid="uid://dly67auifksik" path="res://Godot/overworld_test_mario_animations_new.tres" id="2_fnsjw"]
[ext_resource type="Script" path="res://Godot/Scripts/CamSlowFlo.gd" id="3_8dsqk"]
[ext_resource type="Script" path="res://Godot/Scripts/Utility/CamSlowFlo.gd" id="3_8dsqk"]
[ext_resource type="AudioStream" uid="uid://cm8whqc1dnbfa" path="res://Assets/SFX/SML2_Jump.ogg" id="4_bf2cq"]
[ext_resource type="AudioStream" uid="uid://detaoo1lrgc0q" path="res://Assets/SFX/WU_SE_PLY_FOOTNOTE_ROCK.wav" id="5_800kh"]
[ext_resource type="AudioStream" uid="uid://b0t1hd3unig7i" path="res://Assets/SFX/WU_SE_PLY_FOOTNOTE_ROCK_L.wav" id="6_dhej2"]
Expand All @@ -24,7 +24,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.53208, 0)
collision_layer = 4
slide_on_ceiling = false
script = ExtResource("1_ehyyf")
luigi_np = NodePath("../Luigi")
SPEED = 2.0

[node name="ASprite3D" type="AnimatedSprite3D" parent="."]
Expand All @@ -46,7 +45,7 @@ doppler_tracking = 2
current = true
script = ExtResource("3_8dsqk")
speed = 5.0
follow_offset = Vector3(0, 1.63535, 1.5)
follow_offset = Vector3(0, 1, 1.5)

[node name="FakeShadow" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00353271, 0.12, 0.0285166)
Expand Down
2 changes: 1 addition & 1 deletion Godot/Nodes/HP.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[ext_resource type="Texture2D" uid="uid://bttlcp3mi0wwr" path="res://Assets/Healths.png" id="1_7bt3t"]
[ext_resource type="Script" path="res://Godot/Scripts/HP.gd" id="1_amk17"]
[ext_resource type="Texture2D" uid="uid://56b044xq0dta" path="res://Assets/Numbers/0.png" id="3_gpjy4"]
[ext_resource type="Script" path="res://Godot/Scripts/ImageNumber.gd" id="3_jgbnl"]
[ext_resource type="Script" path="res://Godot/Scripts/Utility/ImageNumber.gd" id="3_jgbnl"]
[ext_resource type="Texture2D" uid="uid://c8qga18gqccj4" path="res://Assets/Numbers/1.png" id="4_pdakh"]
[ext_resource type="Texture2D" uid="uid://bipvm1mjnlti" path="res://Assets/Numbers/2.png" id="4_r0ilm"]
[ext_resource type="Texture2D" uid="uid://j8mocvjm3wcr" path="res://Assets/Numbers/3.png" id="7_ccty3"]
Expand Down
2 changes: 1 addition & 1 deletion Godot/Nodes/damage_display.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[ext_resource type="Script" path="res://Godot/Scripts/Damage_Anouncer.gd" id="1_5pjkn"]
[ext_resource type="Texture2D" uid="uid://dwiad5hmtb41q" path="res://Assets/Battle UI Paper Mario.png" id="2_gsxcb"]
[ext_resource type="Script" path="res://Godot/Scripts/DamageAnouncerTexture.gd" id="3_fr5vs"]
[ext_resource type="Script" path="res://Godot/Scripts/ImageNumber.gd" id="4_ock2l"]
[ext_resource type="Script" path="res://Godot/Scripts/Utility/ImageNumber.gd" id="4_ock2l"]

[sub_resource type="AtlasTexture" id="AtlasTexture_evgwo"]
atlas = ExtResource("2_gsxcb")
Expand Down
2 changes: 1 addition & 1 deletion Godot/Nodes/multiplayer_entity.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[ext_resource type="FontFile" uid="uid://bia54gcp3jvvb" path="res://Fonts/SuperMario256.ttf" id="2_tg1x1"]
[ext_resource type="SpriteFrames" uid="uid://dly67auifksik" path="res://Godot/overworld_test_mario_animations_new.tres" id="3_r4voj"]
[ext_resource type="Script" path="res://Godot/Scripts/Multiplayer/multiplayer_info.gd" id="4_02nal"]
[ext_resource type="Script" path="res://Godot/Scripts/CamSlowFlo.gd" id="4_oopw4"]
[ext_resource type="Script" path="res://Godot/Scripts/Utility/CamSlowFlo.gd" id="4_oopw4"]
[ext_resource type="AudioStream" uid="uid://cm8whqc1dnbfa" path="res://Assets/SFX/SML2_Jump.ogg" id="5_y1h8l"]
[ext_resource type="AudioStream" uid="uid://detaoo1lrgc0q" path="res://Assets/SFX/WU_SE_PLY_FOOTNOTE_ROCK.wav" id="6_ydqhb"]
[ext_resource type="AudioStream" uid="uid://b0t1hd3unig7i" path="res://Assets/SFX/WU_SE_PLY_FOOTNOTE_ROCK_L.wav" id="7_ddcp5"]
Expand Down
112 changes: 112 additions & 0 deletions Godot/Nodes/transitions.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
[gd_scene load_steps=10 format=3 uid="uid://tbgjt6hvf0ut"]

[ext_resource type="Script" path="res://Godot/Scripts/Utility/transitions.gd" id="1_akd26"]
[ext_resource type="Texture2D" uid="uid://hxrnl6hyk66j" path="res://Assets/image.png" id="1_f6fci"]
[ext_resource type="Texture2D" uid="uid://cefwb64it1for" path="res://Assets/load.png" id="2_cwr7t"]
[ext_resource type="PackedScene" uid="uid://cdqimmnx0j6kj" path="res://Godot/Scene/loading_screen.tscn" id="3_xyccu"]

[sub_resource type="Gradient" id="Gradient_ej2yx"]
interpolation_mode = 1
colors = PackedColorArray(0, 0, 0, 0, 0, 0, 0, 1)

[sub_resource type="GradientTexture2D" id="GradientTexture2D_epwyl"]
gradient = SubResource("Gradient_ej2yx")
width = 1152
height = 1152
fill = 1
fill_from = Vector2(0.5, 0.5)

[sub_resource type="Animation" id="Animation_pig56"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".:gradient_2_progression")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [0.0]
}

[sub_resource type="Animation" id="Animation_ftwxo"]
resource_name = "TransitionIn"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".:gradient_2_progression")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [1.0, 0.0]
}

[sub_resource type="AnimationLibrary" id="AnimationLibrary_ltklw"]
_data = {
"RESET": SubResource("Animation_pig56"),
"TransitionIn": SubResource("Animation_ftwxo")
}

[node name="Transition" type="Control"]
top_level = true
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_akd26")

[node name="Transitions" type="TextureRect" parent="."]
clip_children = 1
clip_contents = true
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
texture = SubResource("GradientTexture2D_epwyl")
expand_mode = 1
stretch_mode = 3

[node name="Background" type="TextureRect" parent="Transitions"]
self_modulate = Color(0.310617, 0.310617, 0.310617, 1)
layout_mode = 0
offset_right = 1156.0
offset_bottom = 644.0
texture = ExtResource("1_f6fci")

[node name="LoadingScreen" parent="Transitions/Background" instance=ExtResource("3_xyccu")]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = -1
anchor_bottom = 0.723
offset_bottom = -0.362061

[node name="ColorRect2" type="TextureRect" parent="."]
visible = false
layout_mode = 0
offset_right = 1156.0
offset_bottom = 648.0
texture = ExtResource("2_cwr7t")

[node name="DebugMiddleScreen" type="Marker2D" parent="."]
visible = false
position = Vector2(576, 324)
gizmo_extents = 340.5

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
process_priority = 2
process_thread_group = 1
process_thread_group_order = 0
process_thread_messages = 0
callback_mode_method = 1
libraries = {
"": SubResource("AnimationLibrary_ltklw")
}
4 changes: 2 additions & 2 deletions Godot/Scene/battle_scene.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
[ext_resource type="Texture2D" uid="uid://dwiad5hmtb41q" path="res://Assets/Battle UI Paper Mario.png" id="17_fsweh"]
[ext_resource type="Texture2D" uid="uid://dv24wmg0mqlm4" path="res://Assets/Handmade/podium_wip_paint_transparent.png" id="18_t17jn"]
[ext_resource type="Texture2D" uid="uid://cv0kpg36223vs" path="res://Assets/curtains.png" id="19_itlsx"]
[ext_resource type="Script" path="res://Godot/Scripts/S2D_on_3D.gd" id="19_k8dub"]
[ext_resource type="Script" path="res://Godot/Scripts/Utility/S2D_on_3D.gd" id="19_k8dub"]
[ext_resource type="AudioStream" uid="uid://cwe5ucqbpy4l7" path="res://Assets/Music/Mario And Luigi Paper Jam Bros OST - Victory Is For Us !.ogg" id="19_mibui"]
[ext_resource type="AudioStream" uid="uid://ctbdx3nvmbiqi" path="res://Assets/SFX/WU_SE_SYS_BACK.wav" id="19_u3je3"]
[ext_resource type="Script" path="res://Godot/Scripts/HP.gd" id="21_0foia"]
[ext_resource type="Texture2D" uid="uid://uatqkysl6vwh" path="res://Assets/HealthsL.png" id="22_tyw2n"]
[ext_resource type="Script" path="res://Godot/Scripts/ImageNumber.gd" id="23_6nw3e"]
[ext_resource type="Script" path="res://Godot/Scripts/Utility/ImageNumber.gd" id="23_6nw3e"]
[ext_resource type="Texture2D" uid="uid://56b044xq0dta" path="res://Assets/Numbers/0.png" id="24_bm6kh"]
[ext_resource type="Texture2D" uid="uid://c8qga18gqccj4" path="res://Assets/Numbers/1.png" id="25_lk58u"]
[ext_resource type="Texture2D" uid="uid://bipvm1mjnlti" path="res://Assets/Numbers/2.png" id="26_dd7em"]
Expand Down
68 changes: 52 additions & 16 deletions Godot/Scene/cafe.tscn

Large diffs are not rendered by default.

173 changes: 173 additions & 0 deletions Godot/Scene/loading_screen.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
[gd_scene load_steps=19 format=3 uid="uid://cdqimmnx0j6kj"]

[ext_resource type="Texture2D" uid="uid://chwn1br1jchb" path="res://Assets/texture_ml_little.png" id="1_7buxi"]
[ext_resource type="Script" path="res://Godot/Scripts/Utility/loading_screen.gd" id="1_n37fu"]
[ext_resource type="Script" path="res://Godot/Scripts/defilling_tiles.gd" id="2_gdgyd"]
[ext_resource type="Texture2D" uid="uid://dmodglff3fjxv" path="res://Assets/Handmade/IMG_20240927_141423.png" id="3_jtv50"]
[ext_resource type="FontFile" uid="uid://bjdgtfcm87v6i" path="res://Fonts/Daydream-short.ttf" id="4_wcm7l"]

[sub_resource type="AtlasTexture" id="AtlasTexture_nbsio"]
atlas = ExtResource("3_jtv50")
region = Rect2(0, 0, 450, 672)

[sub_resource type="AtlasTexture" id="AtlasTexture_5b4ip"]
atlas = ExtResource("3_jtv50")
region = Rect2(450, 0, 450, 672)

[sub_resource type="AtlasTexture" id="AtlasTexture_mnamu"]
atlas = ExtResource("3_jtv50")
region = Rect2(900, 0, 450, 672)

[sub_resource type="AtlasTexture" id="AtlasTexture_pwtma"]
atlas = ExtResource("3_jtv50")
region = Rect2(0, 672, 450, 672)

[sub_resource type="AtlasTexture" id="AtlasTexture_2vnni"]
atlas = ExtResource("3_jtv50")
region = Rect2(450, 672, 450, 672)

[sub_resource type="AtlasTexture" id="AtlasTexture_ju28a"]
atlas = ExtResource("3_jtv50")
region = Rect2(900, 672, 450, 672)

[sub_resource type="AtlasTexture" id="AtlasTexture_hwk3w"]
atlas = ExtResource("3_jtv50")
region = Rect2(0, 1344, 450, 672)

[sub_resource type="AtlasTexture" id="AtlasTexture_iu6tb"]
atlas = ExtResource("3_jtv50")
region = Rect2(450, 1344, 450, 672)

[sub_resource type="SpriteFrames" id="SpriteFrames_y1fo6"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_nbsio")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_5b4ip")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_mnamu")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_pwtma")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_2vnni")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ju28a")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_hwk3w")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_iu6tb")
}],
"loop": true,
"name": &"default",
"speed": 15.0
}]

[sub_resource type="LabelSettings" id="LabelSettings_dps45"]
font = ExtResource("4_wcm7l")
font_size = 41
outline_size = 13
outline_color = Color(0, 0, 0, 1)

[sub_resource type="Animation" id="Animation_x024o"]
resource_name = "Loading"
length = 0.5
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".:modulate")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.5),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Color(0, 0, 0, 1), Color(1, 1, 1, 1)]
}

[sub_resource type="Animation" id="Animation_ymeuv"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".:modulate")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(0, 0, 0, 1)]
}

[sub_resource type="AnimationLibrary" id="AnimationLibrary_jj4j8"]
_data = {
"Loading": SubResource("Animation_x024o"),
"RESET": SubResource("Animation_ymeuv")
}

[node name="LoadingScreen" type="Control"]
modulate = Color(0, 0, 0, 1)
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_n37fu")

[node name="TextureRect2" type="TextureRect" parent="."]
texture_repeat = 2
layout_mode = 0
offset_right = 2304.0
offset_bottom = 1536.0
size_flags_horizontal = 3
size_flags_vertical = 3
texture = ExtResource("1_7buxi")
expand_mode = 1
stretch_mode = 1
script = ExtResource("2_gdgyd")
parkour_times = 2
seconds = 15.0

[node name="ReferenceRect" type="ReferenceRect" parent="."]
layout_mode = 0
offset_right = 1152.0
offset_bottom = 648.0
border_width = 3.0

[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(1078, 540)
scale = Vector2(0.3, 0.3)
sprite_frames = SubResource("SpriteFrames_y1fo6")
autoplay = "default"
frame_progress = 0.193713

[node name="Label" type="Label" parent="."]
custom_minimum_size = Vector2(0, 135.455)
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_left = -286.0
offset_top = -55.0
offset_right = 286.0
grow_horizontal = 2
grow_vertical = 0
text = "Loading..."
label_settings = SubResource("LabelSettings_dps45")
horizontal_alignment = 1

[node name="Animation" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_jj4j8")
}
Loading

0 comments on commit 47fcc61

Please sign in to comment.