summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordusoleil <howcansocksbereal@gmail.com>2022-09-16 09:02:19 -0400
committerdusoleil <howcansocksbereal@gmail.com>2022-09-16 09:02:19 -0400
commit82798bd4abf171d18cb89b41ccb305c68d5c0d21 (patch)
treed23fa4101ebb75969f65cdcc39ba54565995ebe3
parent0b7daa101c282fe83b6d75b080e25d0e2147253f (diff)
downloadgodot_wildjam_49-82798bd4abf171d18cb89b41ccb305c68d5c0d21.tar.gz
godot_wildjam_49-82798bd4abf171d18cb89b41ccb305c68d5c0d21.zip
Cull the Water from the below deck camera
-rw-r--r--ship/ship/ship.tscn1
-rw-r--r--water/Water.tscn10
2 files changed, 8 insertions, 3 deletions
diff --git a/ship/ship/ship.tscn b/ship/ship/ship.tscn
index eaf0161..0609dd1 100644
--- a/ship/ship/ship.tscn
+++ b/ship/ship/ship.tscn
@@ -378,6 +378,7 @@ render_target_v_flip = true
[node name="Camera" type="Camera" parent="ViewPorts/below_deck"]
transform = Transform( 0.897382, 0, 0.441255, 0, 1, 0, -0.441255, 0, 0.897382, 4.54343, -0.839509, 29.0326 )
+cull_mask = 1048573
[node name="bridge_downstairs" type="Viewport" parent="ViewPorts"]
size = Vector2( 320, 180 )
diff --git a/water/Water.tscn b/water/Water.tscn
index 3724e82..27377a9 100644
--- a/water/Water.tscn
+++ b/water/Water.tscn
@@ -17,16 +17,17 @@ noise = SubResource( 17 )
[sub_resource type="ShaderMaterial" id=11]
shader = ExtResource( 1 )
-shader_param/wave1 = Quat( 0.25, 0.10472, 2.38732, 2652.57 )
+shader_param/wave1 = Quat( 0.25, 0.10472, 2.38732, 203.957 )
shader_param/wave1_dir = Vector2( 1, 1 )
-shader_param/wave2 = Quat( 0.25, 0.202683, 1.23345, 1906.65 )
+shader_param/wave2 = Quat( 0.25, 0.202683, 1.23345, 146.603 )
shader_param/wave2_dir = Vector2( 1, 0.6 )
-shader_param/wave3 = Quat( 0.25, 0.349066, 0.716197, 1452.87 )
+shader_param/wave3 = Quat( 0.25, 0.349066, 0.716197, 111.712 )
shader_param/wave3_dir = Vector2( 1, 1.3 )
shader_param/water_colour = Color( 0.694118, 0.945098, 0.941176, 0.368627 )
shader_param/deep_water_colour = Color( 0.25098, 0.623529, 0.788235, 0.54902 )
shader_param/foam_amount = 0.6
shader_param/murkiness = 4.0
+shader_param/refraction_amount = 0.01
shader_param/noise = SubResource( 18 )
[sub_resource type="PlaneMesh" id=19]
@@ -40,6 +41,7 @@ size = Vector2( 2000, 2000 )
[node name="Water" type="Spatial"]
[node name="MeshInstance" type="MeshInstance" parent="."]
+layers = 2
mesh = SubResource( 9 )
material/0 = SubResource( 11 )
script = ExtResource( 2 )
@@ -54,9 +56,11 @@ wave3_wavelength = 18.0
wave3_direction = Vector2( 1, 1.3 )
[node name="CSGMesh" type="CSGMesh" parent="."]
+layers = 2
mesh = SubResource( 19 )
material = SubResource( 11 )
[node name="CSGMesh" type="CSGMesh" parent="CSGMesh"]
+layers = 2
operation = 2
mesh = SubResource( 20 )