From 1f8288735c1c524691d0b3d2a96fd55d1ab52609 Mon Sep 17 00:00:00 2001 From: vengefulcartographer <76922012+vengefulcartographer@users.noreply.github.com> Date: Sun, 20 Aug 2023 00:09:59 -0600 Subject: [PATCH 1/3] ocean wave --- godot/Level/Island.tscn | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/godot/Level/Island.tscn b/godot/Level/Island.tscn index 0e2539a..459a16c 100644 --- a/godot/Level/Island.tscn +++ b/godot/Level/Island.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=3 uid="uid://3d51hjh2st8a"] +[gd_scene load_steps=30 format=3 uid="uid://3d51hjh2st8a"] [ext_resource type="PackedScene" uid="uid://d2d4uv7o5gx5p" path="res://Level/World/screen_shader.tscn" id="1_huyen"] [ext_resource type="PackedScene" uid="uid://b35w4hlh4n1jt" path="res://Level/World/world_environment.tscn" id="2_lerrn"] @@ -26,6 +26,23 @@ [ext_resource type="PackedScene" uid="uid://bw3k2c75qavce" path="res://Models/beach_decor/bucket.tscn" id="27_f3p1i"] [ext_resource type="PackedScene" uid="uid://g4gmc0pwlak1" path="res://Models/buildings/fence.tscn" id="28_prydb"] +[sub_resource type="Animation" id="Animation_jpnyu"] +resource_name = "waves" +length = 6.0 +loop_mode = 1 +tracks/0/type = "position_3d" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".") +tracks/0/interp = 2 +tracks/0/loop_wrap = true +tracks/0/keys = PackedFloat32Array(0, 1, 0, 1.67685, 0, 3, 1, 0, 1.72422, 0, 6, 1, 0, 1.67685, 0) + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_p0f8x"] +_data = { +"waves": SubResource("Animation_jpnyu") +} + [sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_hf2jh"] [sub_resource type="BoxShape3D" id="BoxShape3D_um2bu"] @@ -41,7 +58,13 @@ size = Vector3(19.9041, 1, 1) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) [node name="ocean" parent="." instance=ExtResource("4_dey2i")] -transform = Transform3D(5.04206, 0, 0, 0, 1.96278, 0, 0, 0, 4.42374, 0, 1.67685, 0) +transform = Transform3D(5.04206, 0, 0, 0, 1.96278, 0, 0, 0, 4.42374, 0, 1.67782, 0) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="ocean"] +autoplay = "waves" +libraries = { +"": SubResource("AnimationLibrary_p0f8x") +} [node name="Decorations" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) @@ -264,7 +287,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.192051, 2.60275, 0) [node name="Ambiance" type="AudioStreamPlayer" parent="."] stream = ExtResource("22_4tylf") -volume_db = 5.0 +volume_db = 7.0 autoplay = true [node name="Music" type="AudioStreamPlayer" parent="."] From 0277e45a03d7445e9318f6fcf3c88973413593be Mon Sep 17 00:00:00 2001 From: vengefulcartographer <76922012+vengefulcartographer@users.noreply.github.com> Date: Sun, 20 Aug 2023 00:11:36 -0600 Subject: [PATCH 2/3] update island --- godot/Level/Island.tscn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/godot/Level/Island.tscn b/godot/Level/Island.tscn index 459a16c..43ee6e3 100644 --- a/godot/Level/Island.tscn +++ b/godot/Level/Island.tscn @@ -58,7 +58,7 @@ size = Vector3(19.9041, 1, 1) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) [node name="ocean" parent="." instance=ExtResource("4_dey2i")] -transform = Transform3D(5.04206, 0, 0, 0, 1.96278, 0, 0, 0, 4.42374, 0, 1.67782, 0) +transform = Transform3D(5.04206, 0, 0, 0, 1.96278, 0, 0, 0, 4.42374, 0, 1.70782, 0) [node name="AnimationPlayer" type="AnimationPlayer" parent="ocean"] autoplay = "waves" @@ -232,10 +232,10 @@ transform = Transform3D(8.34623, 5.51405, 6.3941, -2.9358, 24.1936, 0, -6.15225, transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, -0.784158, 0.853456, 2.16031) [node name="Floatie2" parent="Decorations/beach items" instance=ExtResource("15_2v7p7")] -transform = Transform3D(0.142475, -0.0469124, 0, 0.0469124, 0.142475, 0, 0, 0, 0.15, -3.06407, 0.899973, -0.715843) +transform = Transform3D(0.13762, -0.0596706, 0, 0.0596706, 0.13762, 0, 0, 0, 0.15, -2.54018, 1.22524, -0.715843) [node name="Floatie3" parent="Decorations/beach items" instance=ExtResource("15_2v7p7")] -transform = Transform3D(0.130141, 0.074587, 0, -0.074587, 0.130141, 0, 0, 0, 0.15, 3.48612, 0.899973, -0.715843) +transform = Transform3D(0.130141, 0.074587, 0, -0.074587, 0.130141, 0, 0, 0, 0.15, 3.25389, 1.0559, -0.715843) [node name="Floatie4" parent="Decorations/beach items" instance=ExtResource("15_2v7p7")] transform = Transform3D(0.0101389, 0.149653, -0.00103465, -0.149655, 0.0101343, -0.000689841, -0.000618342, 0.0010789, 0.149995, 0.819336, 1.48238, -0.739674) From cddbd397656dacad8565c8057b3d882c528d8eb9 Mon Sep 17 00:00:00 2001 From: vengefulcartographer <76922012+vengefulcartographer@users.noreply.github.com> Date: Sun, 20 Aug 2023 00:12:47 -0600 Subject: [PATCH 3/3] Update island --- godot/Level/Island.tscn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/godot/Level/Island.tscn b/godot/Level/Island.tscn index 43ee6e3..11d67b5 100644 --- a/godot/Level/Island.tscn +++ b/godot/Level/Island.tscn @@ -58,7 +58,7 @@ size = Vector3(19.9041, 1, 1) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) [node name="ocean" parent="." instance=ExtResource("4_dey2i")] -transform = Transform3D(5.04206, 0, 0, 0, 1.96278, 0, 0, 0, 4.42374, 0, 1.70782, 0) +transform = Transform3D(5.04206, 0, 0, 0, 1.96278, 0, 0, 0, 4.42374, 0, 1.70282, 0) [node name="AnimationPlayer" type="AnimationPlayer" parent="ocean"] autoplay = "waves" @@ -117,7 +117,7 @@ transform = Transform3D(0.00614041, -0.0133402, -0.0202603, 0.000709091, 0.02098 transform = Transform3D(0.0378488, 0, 0, 0, 0.0378488, 0, 0, 0, 0.0378488, -2.78499, 0.880813, -5.32234) [node name="PalmYoung6" parent="Decorations/nature" instance=ExtResource("5_prlw2")] -transform = Transform3D(0.0324601, 0, -0.00519927, -0.000382867, 0.0327846, -0.00239032, 0.00518516, 0.00242079, 0.032372, -2.92514, 0.929941, -5.44034) +transform = Transform3D(0.0324601, 3.0533e-11, -0.00519927, -0.00145012, 0.0315694, -0.00905337, 0.00499296, 0.00916877, 0.0311721, -2.63137, 1.1568, -5.54767) [node name="PalmYoung7" parent="Decorations/nature" instance=ExtResource("5_prlw2")] transform = Transform3D(0.0247079, -4.21649e-12, -0.00395757, -0.00112831, 0.0239843, -0.0070443, 0.00379331, 0.00713409, 0.0236825, -2.48546, 1.27716, -5.5655)