manual merge

This commit is contained in:
Clevertop 2024-09-27 17:15:11 +10:00
parent a2772f9147
commit 2a35d1236d
15 changed files with 695 additions and 142 deletions

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=33 format=3 uid="uid://c7f5wae7pdjt2"]
[gd_scene load_steps=31 format=3 uid="uid://c7f5wae7pdjt2"]
[ext_resource type="Script" path="res://tools/Presentation.gd" id="1_qta7b"]
[ext_resource type="PackedScene" uid="uid://d8j6ib7w6yys" path="res://slides/image_slide.tscn" id="2_ik415"]
@ -7,11 +7,12 @@
[ext_resource type="Texture2D" uid="uid://bcgsioqubeos3" path="res://rug/2.png" id="4_s3h6q"]
[ext_resource type="Texture2D" uid="uid://xq82athlp711" path="res://rug/3.png" id="5_soan3"]
[ext_resource type="Texture2D" uid="uid://c8lv70amgbeev" path="res://rug/4.png" id="6_02god"]
[ext_resource type="Texture2D" uid="uid://dweu560gyqjqy" path="res://icon.svg" id="9_bqqad"]
[ext_resource type="Script" path="res://tools/progress_bar.gd" id="9_k3gnd"]
[ext_resource type="PackedScene" uid="uid://btfa7ec7kchhv" path="res://widgets/imageGallery.tscn" id="9_ps7ws"]
[ext_resource type="PackedScene" uid="uid://blu4544ek1sg1" path="res://transfer/godot's_killer_features___file_size.tscn" id="9_d1irl"]
[ext_resource type="PackedScene" path="res://widgets/imageGallery.tscn" id="9_ps7ws"]
[ext_resource type="Texture2D" uid="uid://cn0cen48gp28p" path="res://images/logo_large_color_light.png" id="9_sk8pf"]
[ext_resource type="PackedScene" uid="uid://djm8cv56arfi7" path="res://transfer/godot's_killer_features___file_size_2.tscn" id="10_waynb"]
[ext_resource type="Texture2D" uid="uid://bmndc0dperqpb" path="res://images/Screenshot 2024-09-27 154936.png" id="11_0qxko"]
[ext_resource type="PackedScene" uid="uid://cyrxb1ojy1fxq" path="res://transfer/godot's_killer_features___code_editor.tscn" id="11_hkchj"]
[ext_resource type="Texture2D" uid="uid://bcnf6sw6dxp8b" path="res://02-3d-outdoor-with-editor.webp" id="11_ynajw"]
[ext_resource type="Texture2D" uid="uid://bro0snxc1xvip" path="res://images/Screenshot 2024-09-27 155007.png" id="12_p1su2"]
[ext_resource type="PackedScene" uid="uid://cap8s1gpqsueq" path="res://rug_player.tscn" id="12_xc2ke"]
@ -29,15 +30,6 @@
[ext_resource type="Texture2D" uid="uid://dsh82igoxdpgf" path="res://images/signals.webp" id="25_34hna"]
[ext_resource type="Texture2D" uid="uid://bxto2xi1aqb0i" path="res://images/ps5.webp" id="26_7we82"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_j57wk"]
bg_color = Color(0.6, 0.6, 0.6, 0)
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_idp5h"]
[sub_resource type="LabelSettings" id="LabelSettings_mlksy"]
font_size = 50
font_color = Color(0, 0, 0, 1)
[sub_resource type="LabelSettings" id="LabelSettings_gl1th"]
font_color = Color(1, 0, 0, 1)
@ -285,134 +277,14 @@ texture = ExtResource("26_7we82")
visible = false
text = "Things are coming along well~"
[node name="Godot\'s killer features - File Size" parent="Slides" instance=ExtResource("3_o6pbq")]
[node name="Godot\'s killer features - File Size" parent="Slides" instance=ExtResource("9_d1irl")]
layout_mode = 1
[node name="Header" parent="Slides/Godot\'s killer features - File Size" index="0"]
title = "Godot's killer features"
subtitle = "Miniature File Size"
[node name="HBoxContainer" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer" index="0"]
visible = false
[node name="Engine Comparison graph" type="HBoxContainer" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer" index="1"]
layout_mode = 2
theme_override_constants/separation = 150
alignment = 1
[node name="Unity" type="VBoxContainer" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph"]
layout_mode = 2
[node name="Logo" type="TextureRect" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity"]
layout_mode = 2
texture = ExtResource("9_bqqad")
[node name="Control" type="Control" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity"]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 3
[node name="ProgressBar" type="ProgressBar" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity/Control"]
[node name="Godot\'s killer features - File Size2" parent="Slides" instance=ExtResource("10_waynb")]
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_top = -85.0
offset_right = 507.0
grow_horizontal = 2
grow_vertical = 0
rotation = 4.71239
pivot_offset = Vector2(0, 42)
theme_override_styles/background = SubResource("StyleBoxFlat_j57wk")
theme_override_styles/fill = SubResource("StyleBoxFlat_idp5h")
value = 55.71
show_percentage = false
script = ExtResource("9_k3gnd")
speed = 3.0
[node name="Engine Size" type="Label" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity"]
layout_mode = 2
text = "100mb"
label_settings = SubResource("LabelSettings_mlksy")
[node name="Unity2" type="VBoxContainer" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph"]
layout_mode = 2
[node name="Logo" type="TextureRect" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity2"]
layout_mode = 2
texture = ExtResource("9_bqqad")
[node name="Control" type="Control" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity2"]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 3
[node name="ProgressBar" type="ProgressBar" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity2/Control"]
[node name="Godot\'s killer features - Code Editor" parent="Slides" instance=ExtResource("11_hkchj")]
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_top = -85.0
offset_right = 507.0
grow_horizontal = 2
grow_vertical = 0
rotation = 4.71239
pivot_offset = Vector2(0, 42)
theme_override_styles/background = SubResource("StyleBoxFlat_j57wk")
theme_override_styles/fill = SubResource("StyleBoxFlat_idp5h")
value = 55.71
show_percentage = false
script = ExtResource("9_k3gnd")
speed = 3.0
[node name="Engine Size" type="Label" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity2"]
layout_mode = 2
text = "100mb"
label_settings = SubResource("LabelSettings_mlksy")
[node name="Unity3" type="VBoxContainer" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph"]
layout_mode = 2
[node name="Logo" type="TextureRect" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity3"]
layout_mode = 2
texture = ExtResource("9_bqqad")
[node name="Control" type="Control" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity3"]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 3
[node name="ProgressBar" type="ProgressBar" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity3/Control"]
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_top = -85.0
offset_right = 507.0
grow_horizontal = 2
grow_vertical = 0
rotation = 4.71239
pivot_offset = Vector2(0, 42)
theme_override_styles/background = SubResource("StyleBoxFlat_j57wk")
theme_override_styles/fill = SubResource("StyleBoxFlat_idp5h")
value = 55.71
show_percentage = false
script = ExtResource("9_k3gnd")
speed = 3.0
[node name="Engine Size" type="Label" parent="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity3"]
layout_mode = 2
text = "100mb"
label_settings = SubResource("LabelSettings_mlksy")
[node name="Footer" parent="Slides/Godot\'s killer features - File Size" index="2"]
text = "Things are coming along well~"
[node name="Godot\'s killer features - Lower system requirements" parent="Slides" instance=ExtResource("3_o6pbq")]
visible = false
@ -502,10 +374,6 @@ text = "Exiting"
label_settings = SubResource("LabelSettings_gl1th")
horizontal_alignment = 1
[connection signal="visibility_changed" from="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity/Control/ProgressBar" to="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity/Control/ProgressBar" method="_on_visibility_changed"]
[connection signal="visibility_changed" from="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity2/Control/ProgressBar" to="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity2/Control/ProgressBar" method="_on_visibility_changed"]
[connection signal="visibility_changed" from="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity3/Control/ProgressBar" to="Slides/Godot\'s killer features - File Size/ColorRect/MarginContainer/Engine Comparison graph/Unity3/Control/ProgressBar" method="_on_visibility_changed"]
[editable path="Slides/1"]
[editable path="Slides/2"]
[editable path="Slides/3"]
@ -518,6 +386,8 @@ horizontal_alignment = 1
[editable path="Slides/What makes Godot different?"]
[editable path="Slides/Limitations"]
[editable path="Slides/Godot\'s killer features - File Size"]
[editable path="Slides/Godot\'s killer features - File Size2"]
[editable path="Slides/Godot\'s killer features - Code Editor"]
[editable path="Slides/Godot\'s killer features - Lower system requirements"]
[editable path="Slides/Godot\'s killer features - Easy export for HTML"]
[editable path="Slides/Godot\'s killer features - Asset Library"]

View file

@ -1,10 +1,17 @@
extends ProgressBar
@export var speed : float = 2
@export var target_value : float
func _ready():
max_value = 60000
func _process(delta: float) -> void:
value = lerp(value, 100.0, speed * delta)
value = lerp(value, target_value, speed * delta)
func _on_visibility_changed() -> void:
if visible:
value = 0
$Timer.start(0)
func _on_timer_timeout() -> void:
value = 0