Browse Source

:wrench: Refine node slides

Split concerns among slides.
DricomDragon 2 years ago
parent
commit
e29b52c4cf

+ 2 - 2
godot/run/root.tscn

@@ -267,7 +267,7 @@ position = Vector2(615, 8160)
 scale = Vector2(0.8, 0.8)
 
 [node name="NodeBasic" parent="Board/Show" instance=ExtResource("52_6wl4g")]
-position = Vector2(599, 8546)
+position = Vector2(596, 8506)
 scale = Vector2(0.3, 0.3)
 
 [node name="NodeProvided" parent="Board/Show" instance=ExtResource("53_0dqpu")]
@@ -279,7 +279,7 @@ position = Vector2(1399, 8508)
 scale = Vector2(0.3, 0.3)
 
 [node name="NodeScripted" parent="Board/Show" instance=ExtResource("55_sbgqt")]
-position = Vector2(1334, 8953)
+position = Vector2(1388, 9020)
 scale = Vector2(0.3, 0.3)
 
 [node name="Script" parent="Board/Show" instance=ExtResource("36_yphsp")]

File diff suppressed because it is too large
+ 1 - 0
godot/slides/261/AudioStreamPlayer.svg


+ 37 - 0
godot/slides/261/AudioStreamPlayer.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bfukgv7ke12u2"
+path="res://.godot/imported/AudioStreamPlayer.svg-2f3f145c893399d7c53456123e04e073.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://slides/261/AudioStreamPlayer.svg"
+dest_files=["res://.godot/imported/AudioStreamPlayer.svg-2f3f145c893399d7c53456123e04e073.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
+svg/scale=8.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

+ 1 - 0
godot/slides/261/Button.svg

@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m7 1v3.1328l-1.4453-.96484-1.1094 1.6641 3 2a1.0001 1.0001 0 0 0 1.1094 0l3-2-1.1094-1.6641-1.4453.96484v-3.1328zm-1.5 8c-.831 0-1.5.669-1.5 1.5v1.5h-2v2h12v-2h-2v-1.5c0-.831-.669-1.5-1.5-1.5z" fill="#8eef97"/></svg>

+ 7 - 4
godot/slides/261/editor_gd3_node_tree_shooter_ray.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://c8gkrerffm63f"
-path="res://.godot/imported/editor_gd3_node_tree_shooter_ray.png-8cbca4a8e7b9f34f365f44b36c68e08c.ctex"
+uid="uid://ct5mw1oelcnre"
+path="res://.godot/imported/Button.svg-b5f6fe5cd4bfc49cfcf2bd610438f35e.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://slides/261/editor_gd3_node_tree_shooter_ray.png"
-dest_files=["res://.godot/imported/editor_gd3_node_tree_shooter_ray.png-8cbca4a8e7b9f34f365f44b36c68e08c.ctex"]
+source_file="res://slides/261/Button.svg"
+dest_files=["res://.godot/imported/Button.svg-b5f6fe5cd4bfc49cfcf2bd610438f35e.ctex"]
 
 [params]
 
@@ -32,3 +32,6 @@ process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
 detect_3d/compress_to=1
+svg/scale=8.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

File diff suppressed because it is too large
+ 1 - 0
godot/slides/261/CharacterBody3D.svg


+ 37 - 0
godot/slides/261/CharacterBody3D.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dmomdjq4wcfb8"
+path="res://.godot/imported/CharacterBody3D.svg-0c07fbe3263200b174d6906688fb5b88.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://slides/261/CharacterBody3D.svg"
+dest_files=["res://.godot/imported/CharacterBody3D.svg-0c07fbe3263200b174d6906688fb5b88.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
+svg/scale=8.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

+ 68 - 14
godot/slides/261/NodeBasic.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=3 uid="uid://cih6gpod0ny6v"]
+[gd_scene load_steps=13 format=3 uid="uid://cih6gpod0ny6v"]
 
 [ext_resource type="Script" path="res://projector/slide/Slide.gd" id="1_fasfe"]
 [ext_resource type="Texture2D" uid="uid://bsfj3o88pmxdk" path="res://slides/261/editor_gd4_nodes_list_top_level.png" id="2_q1xuf"]
@@ -6,8 +6,12 @@
 [ext_resource type="PackedScene" uid="uid://bvrtmyq4g1qes" path="res://common/components/title/title.tscn" id="3_zydax"]
 [ext_resource type="Texture2D" uid="uid://cm53121n6vwcb" path="res://slides/261/editor_gd4_nodes_list_2D.png" id="4_sd1tb"]
 [ext_resource type="Texture2D" uid="uid://rvgmetqy4ydh" path="res://slides/261/editor_gd4_nodes_list_3D.png" id="5_ueg1x"]
-[ext_resource type="Texture2D" uid="uid://dg1ryvqqvnvp8" path="res://slides/261/editor_gd3_node_tree_physics_ball.png" id="7_j6w31"]
-[ext_resource type="Texture2D" uid="uid://c8gkrerffm63f" path="res://slides/261/editor_gd3_node_tree_shooter_ray.png" id="8_kbw6u"]
+[ext_resource type="Texture2D" uid="uid://b1wyo3m71uyjl" path="res://slides/261/Sprite2D.svg" id="7_07k7v"]
+[ext_resource type="PackedScene" uid="uid://b811jddpttnt4" path="res://common/components/subtitle/subtitle.tscn" id="8_6x00h"]
+[ext_resource type="Texture2D" uid="uid://dmomdjq4wcfb8" path="res://slides/261/CharacterBody3D.svg" id="8_tnp1t"]
+[ext_resource type="Texture2D" uid="uid://ct5mw1oelcnre" path="res://slides/261/Button.svg" id="9_gdan4"]
+[ext_resource type="Texture2D" uid="uid://bfukgv7ke12u2" path="res://slides/261/AudioStreamPlayer.svg" id="10_qvlvk"]
+[ext_resource type="Texture2D" uid="uid://vnvk2xegt48r" path="res://slides/261/Timer.svg" id="11_t0r5f"]
 
 [node name="NodeBasic" type="Node2D"]
 script = ExtResource("1_fasfe")
@@ -18,15 +22,15 @@ scale = Vector2(1.65046, 1.65046)
 texture = ExtResource("2_q1xuf")
 
 [node name="NodeListControl" type="Sprite2D" parent="."]
-position = Vector2(490, 529)
+position = Vector2(470, 529)
 texture = ExtResource("3_rutri")
 
 [node name="NodeList2D" type="Sprite2D" parent="."]
-position = Vector2(742, 642)
+position = Vector2(687, 639)
 texture = ExtResource("4_sd1tb")
 
 [node name="NodeList3D" type="Sprite2D" parent="."]
-position = Vector2(991, 832)
+position = Vector2(931, 829)
 texture = ExtResource("5_ueg1x")
 
 [node name="Title" parent="." instance=ExtResource("3_zydax")]
@@ -36,12 +40,62 @@ offset_right = 1922.0
 offset_bottom = 155.0
 text = "Des briques de base"
 
-[node name="NodeTreeBall" type="Sprite2D" parent="."]
-position = Vector2(1523, 401)
-scale = Vector2(4, 4)
-texture = ExtResource("7_j6w31")
+[node name="Sprite2D" type="Sprite2D" parent="."]
+position = Vector2(1088, 240)
+texture = ExtResource("7_07k7v")
 
-[node name="NodeTreeShooter" type="Sprite2D" parent="."]
-position = Vector2(1517, 863)
-scale = Vector2(3, 3)
-texture = ExtResource("8_kbw6u")
+[node name="Sprite2DLabel" parent="." instance=ExtResource("8_6x00h")]
+offset_left = 1165.0
+offset_top = 176.0
+offset_right = 1727.0
+offset_bottom = 307.0
+text = "Sprite 2D"
+horizontal_alignment = 0
+
+[node name="Character3D" type="Sprite2D" parent="."]
+position = Vector2(1086, 424)
+texture = ExtResource("8_tnp1t")
+
+[node name="Character3DLabel" parent="." instance=ExtResource("8_6x00h")]
+offset_left = 1165.0
+offset_top = 360.0
+offset_right = 1846.0
+offset_bottom = 491.0
+text = "CharacterBody3D"
+horizontal_alignment = 0
+
+[node name="Button" type="Sprite2D" parent="."]
+position = Vector2(1086, 591)
+texture = ExtResource("9_gdan4")
+
+[node name="ButtonLabel" parent="." instance=ExtResource("8_6x00h")]
+offset_left = 1165.0
+offset_top = 527.0
+offset_right = 1846.0
+offset_bottom = 658.0
+text = "Button"
+horizontal_alignment = 0
+
+[node name="AudioPlayer" type="Sprite2D" parent="."]
+position = Vector2(1088, 762)
+texture = ExtResource("10_qvlvk")
+
+[node name="AudioPlayerLabel" parent="." instance=ExtResource("8_6x00h")]
+offset_left = 1165.0
+offset_top = 698.0
+offset_right = 1909.0
+offset_bottom = 829.0
+text = "AudioStreamPlayer"
+horizontal_alignment = 0
+
+[node name="Timer" type="Sprite2D" parent="."]
+position = Vector2(1101, 936)
+texture = ExtResource("11_t0r5f")
+
+[node name="TimerLabel" parent="." instance=ExtResource("8_6x00h")]
+offset_left = 1165.0
+offset_top = 872.0
+offset_right = 1909.0
+offset_bottom = 1003.0
+text = "Timer"
+horizontal_alignment = 0

File diff suppressed because it is too large
+ 1 - 0
godot/slides/261/Sprite2D.svg


+ 37 - 0
godot/slides/261/Sprite2D.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b1wyo3m71uyjl"
+path="res://.godot/imported/Sprite2D.svg-61dd57c929d1062e6e5f9dbb21d748ec.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://slides/261/Sprite2D.svg"
+dest_files=["res://.godot/imported/Sprite2D.svg-61dd57c929d1062e6e5f9dbb21d748ec.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
+svg/scale=8.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

File diff suppressed because it is too large
+ 1 - 0
godot/slides/261/Timer.svg


+ 7 - 4
godot/slides/261/editor_gd3_node_tree_physics_ball.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dg1ryvqqvnvp8"
-path="res://.godot/imported/editor_gd3_node_tree_physics_ball.png-a1fa4a11306609896c2c41048f1225bc.ctex"
+uid="uid://vnvk2xegt48r"
+path="res://.godot/imported/Timer.svg-43c68985a1f0ae1205ace07473dd631e.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://slides/261/editor_gd3_node_tree_physics_ball.png"
-dest_files=["res://.godot/imported/editor_gd3_node_tree_physics_ball.png-a1fa4a11306609896c2c41048f1225bc.ctex"]
+source_file="res://slides/261/Timer.svg"
+dest_files=["res://.godot/imported/Timer.svg-43c68985a1f0ae1205ace07473dd631e.ctex"]
 
 [params]
 
@@ -32,3 +32,6 @@ process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
 detect_3d/compress_to=1
+svg/scale=8.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

BIN
godot/slides/261/editor_gd3_node_tree_physics_ball.png


BIN
godot/slides/261/editor_gd3_node_tree_shooter_ray.png


+ 9 - 12
godot/slides/262/NodeProvided.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=10 format=3 uid="uid://ucp66t5qowio"]
+[gd_scene load_steps=9 format=3 uid="uid://ucp66t5qowio"]
 
 [ext_resource type="Script" path="res://projector/slide/Slide.gd" id="1_rnhcg"]
-[ext_resource type="Texture2D" uid="uid://bo1tq5h0gwnik" path="res://slides/262/editor_gd4_inheritance_rigidbody.png" id="2_5n8p5"]
 [ext_resource type="Texture2D" uid="uid://c42oq87enp0yb" path="res://slides/262/editor_gd3_node_tree_physics_ball.png" id="3_72lhg"]
 [ext_resource type="PackedScene" uid="uid://bvrtmyq4g1qes" path="res://common/components/title/title.tscn" id="3_avsmy"]
 [ext_resource type="Texture2D" uid="uid://cyrep25b62sr8" path="res://slides/262/RigidBody2D.svg" id="5_r3cye"]
@@ -13,14 +12,9 @@
 [node name="NodeProvided" type="Node2D"]
 script = ExtResource("1_rnhcg")
 
-[node name="Inheritance" type="Sprite2D" parent="."]
-position = Vector2(314, 579)
-scale = Vector2(3, 3)
-texture = ExtResource("2_5n8p5")
-
 [node name="ExampleOfNodeTree" type="Sprite2D" parent="."]
-position = Vector2(828, 408)
-scale = Vector2(4, 4)
+position = Vector2(261, 671)
+scale = Vector2(4.38947, 4.38947)
 texture = ExtResource("3_72lhg")
 
 [node name="Title" parent="." instance=ExtResource("3_avsmy")]
@@ -28,10 +22,13 @@ offset_left = 12.0
 offset_top = 18.0
 offset_right = 1890.0
 offset_bottom = 186.0
-text = "Spécialisation et combinaison"
+text = "Assembler"
+
+[node name="Subtitle" parent="." instance=ExtResource("6_18rmv")]
+text = "vos nœuds"
 
 [node name="Node2D" type="Node2D" parent="."]
-position = Vector2(1004, 506)
+position = Vector2(817, 543)
 
 [node name="RigidBody2D" type="Sprite2D" parent="Node2D"]
 position = Vector2(105, -107)
@@ -54,7 +51,7 @@ offset_left = 68.0
 offset_top = -58.0
 offset_right = 715.0
 offset_bottom = 73.0
-text = "RectangleShape2D"
+text = "Shape2D"
 horizontal_alignment = 0
 
 [node name="Sprite2D" type="Sprite2D" parent="Node2D"]

+ 11 - 6
godot/slides/274/ScriptOOP.tscn

@@ -1,23 +1,23 @@
-[gd_scene load_steps=5 format=3 uid="uid://mafppe6pavvi"]
+[gd_scene load_steps=6 format=3 uid="uid://mafppe6pavvi"]
 
 [ext_resource type="Script" path="res://projector/slide/Slide.gd" id="1_wmeyv"]
 [ext_resource type="Texture2D" uid="uid://ow45ugvbarxo" path="res://slides/274/ResourcePreloader.svg" id="2_uose8"]
 [ext_resource type="PackedScene" uid="uid://bvrtmyq4g1qes" path="res://common/components/title/title.tscn" id="3_corcb"]
 [ext_resource type="PackedScene" uid="uid://dogtm6fdbp3wl" path="res://common/components/gdedit/GdScriptEdit.tscn" id="4_t16pa"]
+[ext_resource type="Texture2D" uid="uid://bo1tq5h0gwnik" path="res://slides/274/editor_gd4_inheritance_rigidbody.png" id="5_sq1r2"]
 
 [node name="ScriptOOP" type="Node2D"]
 script = ExtResource("1_wmeyv")
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
+[node name="PackageIcon" type="Sprite2D" parent="."]
 modulate = Color(1, 0.411765, 1, 1)
-position = Vector2(456, 605)
-scale = Vector2(2, 2)
+position = Vector2(914, 121)
 texture = ExtResource("2_uose8")
 
 [node name="Title" parent="." instance=ExtResource("3_corcb")]
 offset_left = 5.0
 offset_top = 28.0
-offset_right = 961.0
+offset_right = 860.0
 offset_bottom = 196.0
 text = "Orienté objet"
 
@@ -27,7 +27,7 @@ offset_top = 18.0
 offset_right = 1895.0
 offset_bottom = 1064.0
 text = "class_name Penguin
-extends PhysicsBody2D
+extends RigidBody2D
 # My amazing main character
 
 var speed: float = 0.0 # km/h
@@ -41,3 +41,8 @@ func _ready():
 
 func accelerate() -> void:
 	speed = speed + 2.0"
+
+[node name="Inheritance" type="Sprite2D" parent="."]
+position = Vector2(447.5, 641.8)
+scale = Vector2(3.225, 3.225)
+texture = ExtResource("5_sq1r2")

godot/slides/262/editor_gd4_inheritance_rigidbody.png → godot/slides/274/editor_gd4_inheritance_rigidbody.png


+ 3 - 3
godot/slides/262/editor_gd4_inheritance_rigidbody.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bo1tq5h0gwnik"
-path="res://.godot/imported/editor_gd4_inheritance_rigidbody.png-80811c4a15c91e17bb94c39c71dfc4d3.ctex"
+path="res://.godot/imported/editor_gd4_inheritance_rigidbody.png-bd02a53892812839097fd461aa978577.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://slides/262/editor_gd4_inheritance_rigidbody.png"
-dest_files=["res://.godot/imported/editor_gd4_inheritance_rigidbody.png-80811c4a15c91e17bb94c39c71dfc4d3.ctex"]
+source_file="res://slides/274/editor_gd4_inheritance_rigidbody.png"
+dest_files=["res://.godot/imported/editor_gd4_inheritance_rigidbody.png-bd02a53892812839097fd461aa978577.ctex"]
 
 [params]