Consolidate water-related assets

Stray files are moved into a new directory.  The water MeshInstance is
made into a new scene, as I will be adding components to it.

1 files changed, 4 insertions, 43 deletions

diff --git a/Main.tscn b/Main.tscn
index 2906276..1c1c29b 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -1,10 +1,9 @@
-[gd_scene load_steps=19 format=2]
+[gd_scene load_steps=14 format=2]
 
 [ext_resource path="res://character/fps_controller/fps_controller.tscn" type="PackedScene" id=1]
 [ext_resource path="res://icon.png" type="Texture" id=2]
+[ext_resource path="res://water/Water.tscn" type="PackedScene" id=3]
 [ext_resource path="res://Float.tscn" type="PackedScene" id=4]
-[ext_resource path="res://Water.gd" type="Script" id=5]
-[ext_resource path="res://Wave.gdshader" type="Shader" id=7]
 
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 5, 0.5, 5 )
@@ -16,32 +15,6 @@ size = Vector3( 10, 1, 10 )
 albedo_texture = ExtResource( 2 )
 uv1_triplanar = true
 
-[sub_resource type="PlaneMesh" id=9]
-size = Vector2( 500, 500 )
-subdivide_width = 500
-subdivide_depth = 500
-
-[sub_resource type="OpenSimplexNoise" id=17]
-
-[sub_resource type="NoiseTexture" id=18]
-seamless = true
-as_normalmap = true
-noise = SubResource( 17 )
-
-[sub_resource type="ShaderMaterial" id=11]
-shader = ExtResource( 7 )
-shader_param/wave1 = Quat( 0.25, 0.10472, 2.38732, 509.65 )
-shader_param/wave1_dir = Vector2( 1, 1 )
-shader_param/wave2 = Quat( 0.25, 0.202683, 1.23345, 366.334 )
-shader_param/wave2_dir = Vector2( 1, 0.6 )
-shader_param/wave3 = Quat( 0.25, 0.349066, 0.716197, 279.147 )
-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/noise = SubResource( 18 )
-
 [sub_resource type="BoxShape" id=19]
 extents = Vector3( 250, 1, 250 )
 
@@ -96,20 +69,8 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.0045, 0, 5.02626 )
 [node name="DirectionalLight" type="DirectionalLight" parent="."]
 transform = Transform( 0.863334, 0.0994421, -0.494738, 0, 0.980392, 0.197058, 0.504633, -0.170127, 0.846406, -12.2908, 5.96757, 0 )
 
-[node name="Water" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00538254, -1.02502, 0.0534515 )
-mesh = SubResource( 9 )
-material/0 = SubResource( 11 )
-script = ExtResource( 5 )
-wave1_steepness = 0.25
-wave1_wavelength = 60.0
-wave1_direction = Vector2( 1, 1 )
-wave2_steepness = 0.25
-wave2_wavelength = 31.0
-wave2_direction = Vector2( 1, 0.6 )
-wave3_steepness = 0.25
-wave3_wavelength = 18.0
-wave3_direction = Vector2( 1, 1.3 )
+[node name="Water" parent="." instance=ExtResource( 3 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0 )
 
 [node name="Ground" type="StaticBody" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, 0 )