Merge branch 'master' into NoahBackup-08-20-1.22PM

godot/Level/World/DayNightEnvironment.tscn

@@ -0,0 +1,52 @@
+[gd_scene load_steps=7 format=3 uid="uid://6ycop5t3nra5"]
+
+[ext_resource type="Texture2D" uid="uid://6k4ialfiwfxe" path="res://Textures/blueskygradient.jpg" id="1_l2fuq"]
+
+[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_jvebd"]
+turbidity = 50.0
+sun_disk_scale = 0.5
+ground_color = Color(0, 0, 0, 1)
+night_sky = ExtResource("1_l2fuq")
+
+[sub_resource type="Sky" id="Sky_ummxe"]
+sky_material = SubResource("PhysicalSkyMaterial_jvebd")
+
+[sub_resource type="Environment" id="Environment_d42bf"]
+background_mode = 2
+background_energy_multiplier = 0.5
+sky = SubResource("Sky_ummxe")
+
+[sub_resource type="Animation" id="Animation_l6y5u"]
+resource_name = "DayNightCycle"
+length = 10.0
+loop_mode = 1
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("DirectionalLight3D:rotation")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 10),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector3(0, 0, 0), Vector3(6.28319, 0, 0)]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_2t5g8"]
+_data = {
+"DayNightCycle": SubResource("Animation_l6y5u")
+}
+
+[node name="DayNightEnvironment" type="Node3D"]
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_d42bf")
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+autoplay = "DayNightCycle"
+libraries = {
+"": SubResource("AnimationLibrary_2t5g8")
+}

godot/Models/grape_man.tscn

@@ -154,7 +154,7 @@ transform = Transform3D(0.065, 0, 0, 0, 0.065, 0, 0, 0, 0.065, 0, 0, 0)
 script = ExtResource("2_ksje8")
 
 [node name="Skeleton3D" parent="rig" index="0"]
-bones/0/rotation = Quaternion(0.0838794, 0, 0, 0.996476)
+bones/0/rotation = Quaternion(0.0933172, 0, 0, 0.995637)
 bones/1/rotation = Quaternion(-0.0891896, 1.18734e-07, -1.06322e-08, 0.996015)
 bones/2/rotation = Quaternion(0.0133933, -1.19199e-07, 1.5966e-09, 0.99991)
 bones/3/rotation = Quaternion(-0.00997737, 0.100365, -0.694951, 0.711948)
@@ -191,5 +191,5 @@ stream = ExtResource("5_b32re")
 [node name="sad" type="AudioStreamPlayer" parent="." index="7"]
 stream = ExtResource("6_qe4bi")
 
-[node name="woohoo" type="AudioStreamPlayer" parent="." index="8"]
+[node name="soundboard" type="AudioStreamPlayer" parent="." index="8"]
 stream = ExtResource("6_qe4bi")

godot/Textures/blueskygradient.jpg.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://6k4ialfiwfxe"
+path.s3tc="res://.godot/imported/blueskygradient.jpg-d6c6e0628914c8bb67a152e92adda07d.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/blueskygradient.jpg"
+dest_files=["res://.godot/imported/blueskygradient.jpg-d6c6e0628914c8bb67a152e92adda07d.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+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=0

godot/tests/TestIsland.tscn

@@ -1,7 +1,6 @@
 [gd_scene load_steps=24 format=3 uid="uid://v3vjhyhrqfhi"]
 
 [ext_resource type="PackedScene" uid="uid://d2d4uv7o5gx5p" path="res://Level/World/screen_shader.tscn" id="1_ee0bf"]
-[ext_resource type="PackedScene" uid="uid://b35w4hlh4n1jt" path="res://Level/World/world_environment.tscn" id="2_wvs0f"]
 [ext_resource type="PackedScene" uid="uid://difi2tur2j4dg" path="res://Models/island.tscn" id="3_30dtd"]
 [ext_resource type="PackedScene" uid="uid://ctbyl0qbks4k6" path="res://Models/ocean.tscn" id="4_527x8"]
 [ext_resource type="PackedScene" uid="uid://d3ccrfjpg4hbv" path="res://Models/palm_curved.tscn" id="5_a3wkm"]
@@ -23,13 +22,12 @@
 [ext_resource type="PackedScene" uid="uid://bgoo1lbt28na" path="res://Models/grape_man.tscn" id="21_j8hpq"]
 [ext_resource type="PackedScene" uid="uid://c3q6fva1c1baa" path="res://Models/slime.tscn" id="22_f6psl"]
 [ext_resource type="PackedScene" uid="uid://7utef1nnena8" path="res://player.tscn" id="23_bmfvv"]
+[ext_resource type="PackedScene" uid="uid://6ycop5t3nra5" path="res://Level/World/DayNightEnvironment.tscn" id="23_enwwy"]
 
 [node name="World" type="Node3D"]
 
 [node name="ScreenShader" parent="." instance=ExtResource("1_ee0bf")]
 
-[node name="WorldEnvironment" parent="." instance=ExtResource("2_wvs0f")]
-
 [node name="island" parent="." instance=ExtResource("3_30dtd")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 
@@ -257,3 +255,5 @@ transform = Transform3D(1, 0, 0, 0, 0.965509, 0.26037, 0, -0.26037, 0.965509, 0,
 
 [node name="Player" parent="." instance=ExtResource("23_bmfvv")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.548558, 2.93052, 0.413536)
+
+[node name="DayNightEnvironment" parent="." instance=ExtResource("23_enwwy")]