Merge branch 'main' into ethan

rug/1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bs6f7cgyoy6hb"
+path="res://.godot/imported/1.png-25b10cbcf04b8dbb862f12d39d23c0d3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://rug/1.png"
+dest_files=["res://.godot/imported/1.png-25b10cbcf04b8dbb862f12d39d23c0d3.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

rug/2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bcgsioqubeos3"
+path="res://.godot/imported/2.png-c36f4182af43179b61168f8e44a86599.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://rug/2.png"
+dest_files=["res://.godot/imported/2.png-c36f4182af43179b61168f8e44a86599.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

rug/3.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://xq82athlp711"
+path="res://.godot/imported/3.png-320331e80b345e7e2a5546f640654603.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://rug/3.png"
+dest_files=["res://.godot/imported/3.png-320331e80b345e7e2a5546f640654603.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

rug/4.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c8lv70amgbeev"
+path="res://.godot/imported/4.png-30e9a1aad947eff168b7818bf6c5e5e1.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://rug/4.png"
+dest_files=["res://.godot/imported/4.png-30e9a1aad947eff168b7818bf6c5e5e1.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

slides/image_slide.tscn

@@ -7,6 +7,7 @@
 font_size = 60
 
 [node name="ImageSlide" type="VBoxContainer"]
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2

tools/presentation.tscn

@@ -1,10 +1,15 @@
-[gd_scene load_steps=10 format=3 uid="uid://c7f5wae7pdjt2"]
+[gd_scene load_steps=15 format=3 uid="uid://c7f5wae7pdjt2"]
 
 [ext_resource type="Script" path="res://tools/Presentation.gd" id="1_qta7b"]
 [ext_resource type="PackedScene" uid="uid://cjnkbtvmbn8nf" path="res://slides/title.tscn" id="2_t5os2"]
+[ext_resource type="PackedScene" uid="uid://d8j6ib7w6yys" path="res://slides/image_slide.tscn" id="2_y0y7a"]
+[ext_resource type="Texture2D" uid="uid://bs6f7cgyoy6hb" path="res://rug/1.png" id="3_1n18t"]
 [ext_resource type="PackedScene" uid="uid://ccokwij05tg74" path="res://slides/standard.tscn" id="3_o6pbq"]
+[ext_resource type="Texture2D" uid="uid://bcgsioqubeos3" path="res://rug/2.png" id="4_4lnbk"]
+[ext_resource type="Texture2D" uid="uid://xq82athlp711" path="res://rug/3.png" id="4_toov0"]
 [ext_resource type="Theme" uid="uid://bswj4s1sfy137" path="res://presentation_theme.tres" id="4_wo3mt"]
 [ext_resource type="Texture2D" uid="uid://bcnf6sw6dxp8b" path="res://02-3d-outdoor-with-editor.webp" id="5_8ldqg"]
+[ext_resource type="Texture2D" uid="uid://c8lv70amgbeev" path="res://rug/4.png" id="5_k0iyo"]
 [ext_resource type="VideoStream" path="res://Cat-has-the-softest_-sweetest-little-meow.ogv" id="6_icktr"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_ys6im"]
@@ -31,11 +36,59 @@ grow_vertical = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
+[node name="ImageSlide2" parent="Slides" instance=ExtResource("2_y0y7a")]
+layout_mode = 1
+anchors_preset = 15
+
+[node name="TextureRect2" parent="Slides/ImageSlide2/PanelContainer" index="0"]
+texture = ExtResource("3_1n18t")
+expand_mode = 3
+
+[node name="PanelContainer" parent="Slides/ImageSlide2/PanelContainer" index="1"]
+visible = false
+
+[node name="ImageSlide3" parent="Slides" instance=ExtResource("2_y0y7a")]
+visible = false
+layout_mode = 1
+anchors_preset = 15
+
+[node name="TextureRect2" parent="Slides/ImageSlide3/PanelContainer" index="0"]
+texture = ExtResource("4_4lnbk")
+expand_mode = 3
+
+[node name="PanelContainer" parent="Slides/ImageSlide3/PanelContainer" index="1"]
+visible = false
+
+[node name="ImageSlide4" parent="Slides" instance=ExtResource("2_y0y7a")]
+visible = false
+layout_mode = 1
+anchors_preset = 15
+
+[node name="TextureRect2" parent="Slides/ImageSlide4/PanelContainer" index="0"]
+texture = ExtResource("4_toov0")
+expand_mode = 3
+
+[node name="PanelContainer" parent="Slides/ImageSlide4/PanelContainer" index="1"]
+visible = false
+
+[node name="ImageSlide5" parent="Slides" instance=ExtResource("2_y0y7a")]
+visible = false
+layout_mode = 1
+anchors_preset = 15
+
+[node name="TextureRect2" parent="Slides/ImageSlide5/PanelContainer" index="0"]
+texture = ExtResource("5_k0iyo")
+expand_mode = 3
+
+[node name="PanelContainer" parent="Slides/ImageSlide5/PanelContainer" index="1"]
+visible = false
+
 [node name="TitleSlide" parent="Slides" instance=ExtResource("2_t5os2")]
 visible = false
 layout_mode = 1
 
 [node name="StandardSlide1" parent="Slides" instance=ExtResource("3_o6pbq")]
+visible = false
 layout_mode = 1
 
 [node name="StandardSlide2" parent="Slides" instance=ExtResource("3_o6pbq")]
@@ -140,4 +193,8 @@ text = "Exiting"
 label_settings = SubResource("LabelSettings_gl1th")
 horizontal_alignment = 1
 
+[editable path="Slides/ImageSlide2"]
+[editable path="Slides/ImageSlide3"]
+[editable path="Slides/ImageSlide4"]
+[editable path="Slides/ImageSlide5"]
 [editable path="Slides/StandardSlide2"]