From 1fd750cf6ef1717021e760004b4c0780394d61f3 Mon Sep 17 00:00:00 2001
From: Victor Turgeon <masfervic@hotmail.com>
Date: Wed, 12 Oct 2022 14:27:03 -0400
Subject: [PATCH] Relighting, main scene to level 01

---
 Levels/Level01.tscn |  4 ++--
 Levels/Level02.tscn | 40 ++++++++++++++++++----------------------
 Levels/Level03.tscn | 40 ++++++++++++++++++----------------------
 project.godot       |  2 +-
 4 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/Levels/Level01.tscn b/Levels/Level01.tscn
index bf3be85..4870161 100644
--- a/Levels/Level01.tscn
+++ b/Levels/Level01.tscn
@@ -9,12 +9,12 @@
 [ext_resource path="res://AllSkyFree_Skyboxes/Epic_BlueSunset_EquiRect_flat.png" type="Texture" id=7]
 [ext_resource path="res://fonts/TorontoSubwayRegular.ttf" type="DynamicFontData" id=8]
 
-[sub_resource type="PanoramaSky" id=9]
+[sub_resource type="PanoramaSky" id=12]
 panorama = ExtResource( 7 )
 
 [sub_resource type="Environment" id=10]
 background_mode = 2
-background_sky = SubResource( 9 )
+background_sky = SubResource( 12 )
 ambient_light_energy = 0.5
 fog_color = Color( 0.305882, 0.372549, 0.52549, 1 )
 fog_sun_color = Color( 0.901961, 0.803922, 0.752941, 1 )
diff --git a/Levels/Level02.tscn b/Levels/Level02.tscn
index 1db1201..8b7441a 100644
--- a/Levels/Level02.tscn
+++ b/Levels/Level02.tscn
@@ -25,14 +25,21 @@ albedo_texture = ExtResource( 1 )
 [sub_resource type="SpatialMaterial" id=5]
 albedo_texture = ExtResource( 1 )
 
-[sub_resource type="PanoramaSky" id=9]
+[sub_resource type="DynamicFont" id=8]
+size = 64
+outline_size = 4
+outline_color = Color( 0, 0, 0, 1 )
+use_mipmaps = true
+use_filter = true
+font_data = ExtResource( 8 )
+
+[sub_resource type="PanoramaSky" id=11]
 panorama = ExtResource( 6 )
 
-[sub_resource type="Environment" id=7]
+[sub_resource type="Environment" id=10]
 background_mode = 2
-background_sky = SubResource( 9 )
-ambient_light_energy = 0.67
-fog_enabled = true
+background_sky = SubResource( 11 )
+ambient_light_energy = 0.5
 fog_color = Color( 0.305882, 0.372549, 0.52549, 1 )
 fog_sun_color = Color( 0.901961, 0.803922, 0.752941, 1 )
 fog_sun_amount = 1.0
@@ -58,14 +65,6 @@ glow_bloom = 0.02
 glow_hdr_threshold = 0.44
 glow_bicubic_upscale = true
 
-[sub_resource type="DynamicFont" id=8]
-size = 64
-outline_size = 4
-outline_color = Color( 0, 0, 0, 1 )
-use_mipmaps = true
-use_filter = true
-font_data = ExtResource( 8 )
-
 [node name="lvl2" type="Spatial"]
 script = ExtResource( 7 )
 
@@ -112,15 +111,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.311301, 5.60897, -25.7954 )
 [node name="Enemy2" parent="." instance=ExtResource( 3 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.950571, 4.64411, 34.8337 )
 
-[node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."]
-environment = SubResource( 7 )
-
-[node name="DirectionalLight_EpicBlueSky" type="DirectionalLight" parent="."]
-transform = Transform( 1, 0, 0, 0, 0.849579, 0.527461, 0, -0.527461, 0.849579, 0, 26.5368, 0 )
-light_color = Color( 1, 0.924276, 0.869018, 1 )
-light_specular = 1.0
-shadow_enabled = true
-
 [node name="Messages" type="Control" parent="."]
 margin_right = 40.0
 margin_bottom = 40.0
@@ -143,6 +133,12 @@ stream = ExtResource( 9 )
 volume_db = -3.0
 bus = "Music"
 
+[node name="Sun" type="DirectionalLight" parent="."]
+transform = Transform( 0.707107, -0.353553, 0.612372, 0, 0.866025, 0.5, -0.707107, -0.353553, 0.612372, 7.99925, 6, 7.97141 )
+
+[node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."]
+environment = SubResource( 10 )
+
 [connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"]
 [connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"]
 [connection signal="timeout" from="End" to="." method="_on_Win_timeout"]
diff --git a/Levels/Level03.tscn b/Levels/Level03.tscn
index 3685f87..249217b 100644
--- a/Levels/Level03.tscn
+++ b/Levels/Level03.tscn
@@ -19,14 +19,21 @@ albedo_texture = ExtResource( 2 )
 [sub_resource type="SpatialMaterial" id=12]
 albedo_texture = ExtResource( 7 )
 
-[sub_resource type="PanoramaSky" id=6]
+[sub_resource type="DynamicFont" id=8]
+size = 64
+outline_size = 4
+outline_color = Color( 0, 0, 0, 1 )
+use_mipmaps = true
+use_filter = true
+font_data = ExtResource( 8 )
+
+[sub_resource type="PanoramaSky" id=13]
 panorama = ExtResource( 6 )
 
-[sub_resource type="Environment" id=7]
+[sub_resource type="Environment" id=14]
 background_mode = 2
-background_sky = SubResource( 6 )
-ambient_light_energy = 0.67
-fog_enabled = true
+background_sky = SubResource( 13 )
+ambient_light_energy = 0.5
 fog_color = Color( 0.305882, 0.372549, 0.52549, 1 )
 fog_sun_color = Color( 0.901961, 0.803922, 0.752941, 1 )
 fog_sun_amount = 1.0
@@ -52,14 +59,6 @@ glow_bloom = 0.02
 glow_hdr_threshold = 0.44
 glow_bicubic_upscale = true
 
-[sub_resource type="DynamicFont" id=8]
-size = 64
-outline_size = 4
-outline_color = Color( 0, 0, 0, 1 )
-use_mipmaps = true
-use_filter = true
-font_data = ExtResource( 8 )
-
 [node name="lvl3" type="Spatial"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.990751, 0 )
 script = ExtResource( 1 )
@@ -89,15 +88,6 @@ material = SubResource( 12 )
 [node name="Player" parent="." instance=ExtResource( 5 )]
 transform = Transform( -0.997569, 0, -0.0696868, 0, 1, 0, 0.0696868, 0, -0.997569, 0.792524, 7.59106, -6.04147 )
 
-[node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."]
-environment = SubResource( 7 )
-
-[node name="DirectionalLight_EpicBlueSky" type="DirectionalLight" parent="."]
-transform = Transform( 1, 0, 0, 0, 0.849579, 0.527461, 0, -0.527461, 0.849579, 0, 26.5368, 0 )
-light_color = Color( 1, 0.924276, 0.869018, 1 )
-light_specular = 1.0
-shadow_enabled = true
-
 [node name="Messages" type="Control" parent="."]
 margin_right = 40.0
 margin_bottom = 40.0
@@ -140,6 +130,12 @@ transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -0.602382
 [node name="Enemy7" parent="." instance=ExtResource( 3 )]
 transform = Transform( 0.995641, 0, 0, 0, 0.995641, 0, 0, 0, 0.995641, -0.602382, 2.53295, -12.5044 )
 
+[node name="Sun" type="DirectionalLight" parent="."]
+transform = Transform( 0.707107, -0.353553, 0.612372, 0, 0.866025, 0.5, -0.707107, -0.353553, 0.612372, 7.99925, 6, 7.97141 )
+
+[node name="WorldEnvironment_EpicBlueSky" type="WorldEnvironment" parent="."]
+environment = SubResource( 14 )
+
 [connection signal="timeout" from="End" to="." method="_on_Win_timeout"]
 [connection signal="dying" from="Enemy" to="." method="_on_Enemy_dying"]
 [connection signal="dying" from="Enemy2" to="." method="_on_Enemy_dying"]
diff --git a/project.godot b/project.godot
index 4792279..cadefa1 100644
--- a/project.godot
+++ b/project.godot
@@ -27,7 +27,7 @@ _global_script_class_icons={
 [application]
 
 config/name="Slap"
-run/main_scene="res://Test_Scene.tscn"
+run/main_scene="res://Levels/Level01.tscn"
 config/icon="res://icon.png"
 
 [display]