2 Commit-ok a2aa1ff63a ... 50fbc37a56

Szerző SHA1 Üzenet Dátum
  DricomDragon 50fbc37a56 :memo: Parle des prochaines confs JDLL2025 3 hónapja
  DricomDragon 27901d1c43 :sparkles: Dump GodotSlideShow plugin to v1.3.0 3 hónapja

+ 1 - 1
godot/addons/slide_show/plugin.cfg

@@ -3,5 +3,5 @@
 name="SlideShowPlugin"
 description="A plugin to easily create and animate slides in Godot 4."
 author="Jovian HERSEMEULE"
-version="1.0.0"
+version="1.3.0"
 script="plugin.gd"

+ 24 - 6
godot/addons/slide_show/projector/show/Show.gd

@@ -9,6 +9,7 @@ const VOID_SLIDE_ID := -1
 
 @export_group("Slide management")
 @export var start_slide := 0 ## Id of the slide focused at startup
+@export var home_slide := -1 ## Id of the slide to focus when triggering "Home Slide" action ; fallback to start_slide id when negative
 @export var hide_slides := false ## Hide every slide at startup (except the ones with always_visible enabled)
 
 @export_group("Input setup", "action_")
@@ -80,7 +81,7 @@ func next_slide_at(next_id: int, trans: Focus.Transit) -> void:
 
 
 func is_last_slide() -> bool:
-	return current_id == slides.size() - 1
+	return current_id == _last_slide_id()
 
 
 func _focus_slide(id: int, trans: Focus.Transit) -> Slide:
@@ -120,7 +121,9 @@ func _enforce_parameters() -> void:
 	assert(start_slide >= 0,
 		"Negative index is not supported for start_slide")
 	assert(start_slide < slides.size(),
-		"start_slide index is out of bound (max is %s)" % (slides.size() - 1))
+		"start_slide index is out of bound (max is %s)" % (_last_slide_id()))
+	assert(home_slide < slides.size(),
+		"home_slide index is out of bound (max is %s)" % (_last_slide_id()))
 
 
 func _enforce_children() -> void:
@@ -142,13 +145,13 @@ func _previous_id() -> int:
 	var next_id: int = current_id - 1
 
 	if next_id < 0:
-		return slides.size() - 1
+		return _last_slide_id()
 
 	return next_id
 
 
-func _reset_id() -> void:
-		current_id = VOID_SLIDE_ID
+func _last_slide_id() -> int:
+	return slides.size() - 1
 
 
 func _unhandled_key_input(event: InputEvent) -> void:
@@ -163,7 +166,7 @@ func _unhandled_key_input(event: InputEvent) -> void:
 		go_fast_to_previous_slide()
 	elif event.is_action(action_home_slide):
 		get_viewport().set_input_as_handled()
-		_reset_id()
+		_reset_id_just_before_home()
 		go_slowly_to_next_slide()
 
 
@@ -190,5 +193,20 @@ func _search_nearest_slide_from(target_pos: Vector2) -> Slide:
 	return nearest_slide
 
 
+func _reset_id_just_before_home() -> void:
+	var home_id = _get_home_slide_id()
+	current_id = home_id - 1
+
+
+## Get Home slide id, with backup
+func _get_home_slide_id() -> int:
+	if home_slide >= 0:
+		return home_slide
+	elif start_slide >= 0:
+		return start_slide
+	else:
+		return 0
+
+
 func _on_current_slide_finished() -> void:
 	go_slowly_to_next_slide()

+ 10 - 9
godot/run/root.tscn

@@ -98,8 +98,8 @@
 [ext_resource type="PackedScene" uid="uid://bprjwsnhrfkj6" path="res://slides/375/show_reel.tscn" id="86_vajxb"]
 [ext_resource type="PackedScene" uid="uid://bjtiwlal1u4ba" path="res://slides/399/MyPluginRevealed.tscn" id="87_k3ewu"]
 [ext_resource type="PackedScene" uid="uid://qyjijrrvlnur" path="res://slides/390/Bientot.tscn" id="96_4ivcd"]
-[ext_resource type="PackedScene" uid="uid://wb4v56u3n2ay" path="res://slides/391/Actux.tscn" id="97_yfu58"]
-[ext_resource type="PackedScene" uid="uid://q30qjv4ncc70" path="res://slides/392/GrafikLabor.tscn" id="98_sqp5w"]
+[ext_resource type="PackedScene" uid="uid://wb4v56u3n2ay" path="res://slides/391/Bientot1.tscn" id="97_yfu58"]
+[ext_resource type="PackedScene" uid="uid://q30qjv4ncc70" path="res://slides/392/Bientot2.tscn" id="98_sqp5w"]
 
 [node name="Root" type="Node"]
 metadata/_edit_horizontal_guides_ = []
@@ -118,6 +118,7 @@ scope_trans = 10
 
 [node name="Show" type="Node2D" parent="Board"]
 script = ExtResource("2_c3jkg")
+home_slide = 6
 hide_slides = true
 action_finish_slide = "finish"
 action_skip_slide = "skip"
@@ -491,17 +492,17 @@ scale = Vector2(0.435, 0.435)
 position = Vector2(7731, 7989)
 scale = Vector2(0.29, 0.29)
 
-[node name="Bientot" parent="Board/Show" instance=ExtResource("96_4ivcd")]
+[node name="BientotIntro" parent="Board/Show" instance=ExtResource("96_4ivcd")]
 position = Vector2(7063, 7974)
 scale = Vector2(0.29, 0.29)
 
-[node name="Actux" parent="Board/Show" instance=ExtResource("97_yfu58")]
-position = Vector2(7297, 8037)
-scale = Vector2(0.1, 0.1)
+[node name="BientotPart1" parent="Board/Show" instance=ExtResource("97_yfu58")]
+position = Vector2(7218, 8035)
+scale = Vector2(0.15, 0.15)
 
-[node name="GrafikLabor" parent="Board/Show" instance=ExtResource("98_sqp5w")]
-position = Vector2(7333, 8117)
-scale = Vector2(0.2, 0.2)
+[node name="BientotPart2" parent="Board/Show" instance=ExtResource("98_sqp5w")]
+position = Vector2(7277, 8221)
+scale = Vector2(0.15, 0.15)
 
 [node name="MyPluginRevealed" parent="Board/Show" instance=ExtResource("87_k3ewu")]
 position = Vector2(6370, 7512)

+ 7 - 2
godot/slides/390/Bientot.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=3 format=3 uid="uid://qyjijrrvlnur"]
+[gd_scene load_steps=4 format=3 uid="uid://qyjijrrvlnur"]
 
 [ext_resource type="Script" uid="uid://dujtdgtfgki4c" path="res://addons/slide_show/projector/slide/Slide.gd" id="1_xlmpo"]
 [ext_resource type="PackedScene" uid="uid://bvrtmyq4g1qes" path="res://common/components/title/title.tscn" id="3_hzoxe"]
+[ext_resource type="Texture2D" uid="uid://dufeyccbohowu" path="res://slides/0/logo_jdll.svg" id="3_ru6xg"]
 
 [node name="Bientot" type="Node2D"]
 script = ExtResource("1_xlmpo")
@@ -11,4 +12,8 @@ offset_left = 85.0
 offset_top = 26.0
 offset_right = 1847.0
 offset_bottom = 194.0
-text = "Bientôt sur Rennes"
+text = "Bientôt aux JDLL"
+
+[node name="Img" type="Sprite2D" parent="."]
+position = Vector2(361, 897)
+texture = ExtResource("3_ru6xg")

+ 0 - 32
godot/slides/391/Actux.tscn

@@ -1,32 +0,0 @@
-[gd_scene load_steps=5 format=3 uid="uid://wb4v56u3n2ay"]
-
-[ext_resource type="Script" uid="uid://dujtdgtfgki4c" path="res://addons/slide_show/projector/slide/Slide.gd" id="1_jersq"]
-[ext_resource type="Texture2D" uid="uid://cubjbc6t3fmsr" path="res://slides/391/logo-actux.png" id="2_x5x8b"]
-[ext_resource type="Texture2D" uid="uid://c8mx6ry3d7tpl" path="res://slides/391/logo_chatons.png" id="3_bl8la"]
-[ext_resource type="PackedScene" uid="uid://bvrtmyq4g1qes" path="res://common/components/title/title.tscn" id="3_rhszn"]
-
-[node name="GullRennais" type="Node2D"]
-script = ExtResource("1_jersq")
-
-[node name="ColorRect" type="ColorRect" parent="."]
-offset_left = 5.0
-offset_top = 207.0
-offset_right = 1920.0
-offset_bottom = 776.0
-
-[node name="AssoActux" type="Sprite2D" parent="."]
-position = Vector2(521, 471)
-scale = Vector2(1.685, 1.685)
-texture = ExtResource("2_x5x8b")
-
-[node name="CollectifCHATONS" type="Sprite2D" parent="."]
-position = Vector2(1564, 494)
-scale = Vector2(0.295, 0.295)
-texture = ExtResource("3_bl8la")
-
-[node name="Title" parent="." instance=ExtResource("3_rhszn")]
-offset_left = 85.0
-offset_top = 26.0
-offset_right = 1847.0
-offset_bottom = 194.0
-text = "GULL Rennais"

+ 44 - 0
godot/slides/391/Bientot1.tscn

@@ -0,0 +1,44 @@
+[gd_scene load_steps=5 format=3 uid="uid://wb4v56u3n2ay"]
+
+[ext_resource type="Script" uid="uid://dujtdgtfgki4c" path="res://addons/slide_show/projector/slide/Slide.gd" id="1_jersq"]
+[ext_resource type="Texture2D" uid="uid://c1xqudfjb588w" path="res://slides/391/Descent3_aCamb4K.jpg" id="2_6kd2x"]
+[ext_resource type="PackedScene" uid="uid://bvrtmyq4g1qes" path="res://common/components/title/title.tscn" id="3_rhszn"]
+[ext_resource type="PackedScene" uid="uid://b811jddpttnt4" path="res://common/components/subtitle/subtitle.tscn" id="4_64mdp"]
+
+[node name="BientotPart1" type="Node2D"]
+script = ExtResource("1_jersq")
+
+[node name="Img1" type="Sprite2D" parent="."]
+position = Vector2(238, 329)
+scale = Vector2(1.685, 1.685)
+texture = ExtResource("2_6kd2x")
+
+[node name="Title" parent="." instance=ExtResource("3_rhszn")]
+offset_left = 793.0
+offset_top = 2.0
+offset_right = 1916.0
+offset_bottom = 170.0
+text = "À voir juste après !"
+
+[node name="Event1" parent="." instance=ExtResource("4_64mdp")]
+offset_left = 464.0
+offset_top = 177.0
+offset_right = 2220.0
+offset_bottom = 626.0
+text = "Descent 3
+Ressusciter un jeu du siècle dernier
+grâce à l'open source !
+Conf 2 - D2.002 "
+horizontal_alignment = 0
+
+[node name="Event2" parent="." instance=ExtResource("4_64mdp")]
+offset_left = -82.0
+offset_top = 533.0
+offset_right = 1913.0
+offset_bottom = 1095.0
+text = "(en)jeux
+Jouer, c'est sérieux :
+le jeu vidéo et le libre partagent des enjeux sociaux.
+Discutons-en !
+Conf 3 - D2.004 "
+horizontal_alignment = 2

BIN
godot/slides/391/Descent3_aCamb4K.jpg


+ 4 - 4
godot/slides/391/logo_chatons.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://c8mx6ry3d7tpl"
-path="res://.godot/imported/logo_chatons.png-765c3507958b90b34ae8579e594204ad.ctex"
+uid="uid://c1xqudfjb588w"
+path="res://.godot/imported/Descent3_aCamb4K.jpg-a046adfbb7e6f42047aed2c0bd84b80f.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://slides/391/logo_chatons.png"
-dest_files=["res://.godot/imported/logo_chatons.png-765c3507958b90b34ae8579e594204ad.ctex"]
+source_file="res://slides/391/Descent3_aCamb4K.jpg"
+dest_files=["res://.godot/imported/Descent3_aCamb4K.jpg-a046adfbb7e6f42047aed2c0bd84b80f.ctex"]
 
 [params]
 

BIN
godot/slides/391/logo-actux.png


BIN
godot/slides/391/logo_chatons.png


+ 30 - 0
godot/slides/392/Bientot2.tscn

@@ -0,0 +1,30 @@
+[gd_scene load_steps=5 format=3 uid="uid://q30qjv4ncc70"]
+
+[ext_resource type="Script" uid="uid://dujtdgtfgki4c" path="res://addons/slide_show/projector/slide/Slide.gd" id="1_kxvov"]
+[ext_resource type="PackedScene" uid="uid://bvrtmyq4g1qes" path="res://common/components/title/title.tscn" id="3_corau"]
+[ext_resource type="PackedScene" uid="uid://b811jddpttnt4" path="res://common/components/subtitle/subtitle.tscn" id="4_1n3qa"]
+[ext_resource type="Texture2D" uid="uid://df6e2jl3k7c0" path="res://slides/392/dialogic.png" id="4_h7e16"]
+
+[node name="GrafikLabor" type="Node2D"]
+script = ExtResource("1_kxvov")
+
+[node name="Title" parent="." instance=ExtResource("3_corau")]
+offset_left = 81.0
+offset_top = -23.0
+offset_right = 1843.0
+offset_bottom = 145.0
+text = "Demain sur un plugin Godot"
+
+[node name="Subtitle" parent="." instance=ExtResource("4_1n3qa")]
+offset_left = 10.0
+offset_top = 113.0
+offset_right = 1917.0
+offset_bottom = 449.0
+text = "Dialogic :
+une extension pour des Visual Novels dans Godot
+11:00–11:55, Atelier 2 - D2.023 "
+
+[node name="Img1" type="Sprite2D" parent="."]
+position = Vector2(964, 821)
+scale = Vector2(0.490972, 0.490972)
+texture = ExtResource("4_h7e16")

+ 0 - 67
godot/slides/392/GrafikLabor.tscn

@@ -1,67 +0,0 @@
-[gd_scene load_steps=9 format=3 uid="uid://q30qjv4ncc70"]
-
-[ext_resource type="Script" uid="uid://dujtdgtfgki4c" path="res://addons/slide_show/projector/slide/Slide.gd" id="1_kxvov"]
-[ext_resource type="Texture2D" uid="uid://whvletnrswwn" path="res://slides/392/grafik-labor.png" id="2_qrrxe"]
-[ext_resource type="PackedScene" uid="uid://bvrtmyq4g1qes" path="res://common/components/title/title.tscn" id="3_corau"]
-[ext_resource type="PackedScene" uid="uid://b811jddpttnt4" path="res://common/components/subtitle/subtitle.tscn" id="4_1n3qa"]
-[ext_resource type="Texture2D" uid="uid://bbhna3w2mmvxf" path="res://slides/392/grafik_labor_2025_samedi5.png" id="5_50dcj"]
-[ext_resource type="Texture2D" uid="uid://doieh8t8dns76" path="res://slides/392/grafik_labor_2025_dimanche6.png" id="6_fe7ly"]
-
-[sub_resource type="Gradient" id="Gradient_bqgsk"]
-colors = PackedColorArray(0.00784314, 0.305882, 0.431373, 1, 0.278431, 0.54902, 0.74902, 0)
-
-[sub_resource type="GradientTexture1D" id="GradientTexture1D_el3ua"]
-gradient = SubResource("Gradient_bqgsk")
-
-[node name="GrafikLabor" type="Node2D"]
-script = ExtResource("1_kxvov")
-
-[node name="Background" type="TextureRect" parent="."]
-offset_right = 1920.0
-offset_bottom = 1080.0
-texture = SubResource("GradientTexture1D_el3ua")
-
-[node name="Sprite2D" type="Sprite2D" parent="."]
-position = Vector2(933, 546)
-scale = Vector2(0.585, 0.585)
-texture = ExtResource("2_qrrxe")
-
-[node name="Title" parent="." instance=ExtResource("3_corau")]
-offset_left = 85.0
-offset_top = 26.0
-offset_right = 1847.0
-offset_bottom = 194.0
-text = "Grafik Labor"
-
-[node name="Subtitle" parent="." instance=ExtResource("4_1n3qa")]
-text = "dans les locaux d'Activ.Design"
-
-[node name="Programme5" type="TextureRect" parent="."]
-offset_left = 60.0
-offset_top = 288.0
-offset_right = 836.0
-offset_bottom = 1245.0
-texture = ExtResource("5_50dcj")
-
-[node name="Caption5" parent="Programme5" instance=ExtResource("4_1n3qa")]
-offset_left = 873.0
-offset_top = -115.0
-offset_right = 1883.0
-offset_bottom = 16.0
-rotation = 1.5708
-text = "Samedi 5 avril"
-
-[node name="Programme6" type="TextureRect" parent="."]
-offset_left = 1055.0
-offset_top = 296.0
-offset_right = 1810.0
-offset_bottom = 1253.0
-texture = ExtResource("6_fe7ly")
-
-[node name="Caption6" parent="Programme6" instance=ExtResource("4_1n3qa")]
-offset_left = 855.0
-offset_top = -141.0
-offset_right = 1865.0
-offset_bottom = -10.0
-rotation = 1.5708
-text = "Dimanche 6 avril"

BIN
godot/slides/392/dialogic.png


+ 4 - 4
godot/slides/391/logo-actux.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cubjbc6t3fmsr"
-path="res://.godot/imported/logo-actux.png-4c0b213b218edbe5d0e7108cecb99fc8.ctex"
+uid="uid://df6e2jl3k7c0"
+path="res://.godot/imported/dialogic.png-cbce4b655bd00f96a70e37a12a89a4eb.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://slides/391/logo-actux.png"
-dest_files=["res://.godot/imported/logo-actux.png-4c0b213b218edbe5d0e7108cecb99fc8.ctex"]
+source_file="res://slides/392/dialogic.png"
+dest_files=["res://.godot/imported/dialogic.png-cbce4b655bd00f96a70e37a12a89a4eb.ctex"]
 
 [params]
 

BIN
godot/slides/392/grafik-labor.png


+ 0 - 34
godot/slides/392/grafik-labor.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://whvletnrswwn"
-path="res://.godot/imported/grafik-labor.png-48c808dd0dfa2e6d3ce6393f1a978c3b.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://slides/392/grafik-labor.png"
-dest_files=["res://.godot/imported/grafik-labor.png-48c808dd0dfa2e6d3ce6393f1a978c3b.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

BIN
godot/slides/392/grafik_labor_2025_dimanche6.png


+ 0 - 34
godot/slides/392/grafik_labor_2025_dimanche6.png.import

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

BIN
godot/slides/392/grafik_labor_2025_samedi5.png


+ 0 - 34
godot/slides/392/grafik_labor_2025_samedi5.png.import

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