animation water

default_env.tres

@@ -5,4 +5,3 @@
 [resource]
 background_mode = 2
 background_sky = SubResource( 1 )
-

meshes/props/fountain_suzanha/Fountain_suzanha.tscn

@@ -23,5 +23,4 @@ material/0 = ExtResource( 4 )
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0338864, 0.482117, 0.0421809 )
 
 [node name="water_tap" parent="." index="4" instance=ExtResource( 6 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0165249, 1.21644, -0.474036 )
-
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00119147, 1.3246, -0.474306 )

previewer/previewer.tscn

@@ -43,6 +43,7 @@ environment = SubResource( 2 )
 [node name="dummy" parent="." instance=ExtResource( 2 )]
 
 [node name="terrain" type="Spatial" parent="."]
+editor/display_folded = true
 
 [node name="test_csg_mesh" type="CSGMesh" parent="terrain"]
 transform = Transform( 60.964, 0, 0, 0, 1.21928, 0, 0, 0, 60.964, 0, 0, 0 )
@@ -59,9 +60,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5 )
 [node name="reference_box" parent="props" instance=ExtResource( 6 )]
 
 [node name="Fountain_suzanha" parent="props" instance=ExtResource( 7 )]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 0.472, -5 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 6.26447, 0.501236, -4.62751 )
 
 [node name="light_system" type="Spatial" parent="."]
+editor/display_folded = true
 
 [node name="directional_light" type="DirectionalLight" parent="light_system"]
 transform = Transform( 0.522088, 0.655715, -0.545401, 0, 0.639473, 0.768814, 0.852892, -0.401389, 0.333861, 0, 13.7088, 0 )
@@ -71,4 +73,3 @@ shadow_enabled = true
 [node name="gi_probe" type="GIProbe" parent="light_system"]
 extents = Vector3( 63.192, 10, 76.3229 )
 data = SubResource( 5 )
-

shaders/water_plane/water_plane.tres

@@ -0,0 +1,17 @@
+[gd_resource type="Animation" format=2]
+
+[resource]
+resource_name = "fountain_anim"
+loop = true
+tracks/0/type = "value"
+tracks/0/path = NodePath(".:mesh:material:uv1_offset")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 0.25, 0.5, 0.75, 1 ),
+"transitions": PoolRealArray( 1, 1, 0.965936, 1, 0.965936 ),
+"update": 0,
+"values": [ Vector3( 0, 0, 0 ), Vector3( -1, 0, 0 ), Vector3( 0, 1, 0 ), Vector3( -1, 0, 0 ), Vector3( 0, 0, 0 ) ]
+}

shaders/water_plane/water_plane.tscn

@@ -1,9 +1,26 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=7 format=2]
+
+[ext_resource path="res://textures/atlas/water/water_surface_normal.png" type="Texture" id=1]
+[ext_resource path="res://textures/atlas/water/water_surface_refraction.png" type="Texture" id=2]
+[ext_resource path="res://textures/atlas/water/water_surface_transmission.png" type="Texture" id=3]
+[ext_resource path="res://shaders/water_plane/water_plane.tres" type="Animation" id=4]
 
 [sub_resource type="SpatialMaterial" id=1]
 flags_transparent = true
+params_blend_mode = 1
 params_cull_mode = 2
-albedo_color = Color( 0.505882, 0.784314, 0.796078, 0.698039 )
+albedo_color = Color( 0.0901961, 0.301961, 0.396078, 0.576471 )
+normal_enabled = true
+normal_scale = 16.0
+normal_texture = ExtResource( 1 )
+transmission_enabled = true
+transmission = Color( 0, 0, 0, 1 )
+transmission_texture = ExtResource( 3 )
+refraction_enabled = true
+refraction_scale = 1.0
+refraction_texture = ExtResource( 2 )
+refraction_texture_channel = 0
+uv1_offset = Vector3( -0.182718, 0, 0 )
 
 [sub_resource type="PlaneMesh" id=2]
 material = SubResource( 1 )
@@ -12,6 +29,11 @@ size = Vector2( 3.5, 1.8 )
 [node name="water_plane" type="Spatial"]
 
 [node name="mesh_instance" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 0.999998, -0.00185714, 0, 0.00185714, 0.999998, 0, 0, 0 )
 mesh = SubResource( 2 )
 material/0 = null
 
+[node name="animation_player" type="AnimationPlayer" parent="mesh_instance"]
+autoplay = "fountain_anim"
+playback_speed = 0.01
+anims/fountain_anim = ExtResource( 4 )

shaders/waterfall/water_tap.tscn

@@ -1,25 +1,49 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=7 format=2]
+
+[ext_resource path="res://textures/atlas/particles_water/heavy_falling_water_heavyFallingWater2.png" type="Texture" id=1]
 
 [sub_resource type="ParticlesMaterial" id=1]
+emission_shape = 2
+emission_box_extents = Vector3( 0.015, 0.015, 0.045 )
+gravity = Vector3( 0, -11, 0 )
+initial_velocity = 0.4
+initial_velocity_random = 0.4
+angular_velocity = 8.99995e-039
+color = Color( 0.427451, 0.745098, 0.796078, 1 )
 
-[sub_resource type="SpatialMaterial" id=3]
-flags_transparent = true
-albedo_color = Color( 0.533333, 0.768627, 0.745098, 0.764706 )
+[sub_resource type="SpatialMaterial" id=2]
+flags_unshaded = true
+vertex_color_use_as_albedo = true
+params_blend_mode = 1
+params_cull_mode = 2
+params_billboard_mode = 3
+particles_anim_h_frames = 1
+particles_anim_v_frames = 1
+particles_anim_loop = false
+albedo_texture = ExtResource( 1 )
 
-[sub_resource type="CylinderMesh" id=2]
-material = SubResource( 3 )
-top_radius = 0.05
-bottom_radius = 0.06
-height = 1.6
+[sub_resource type="QuadMesh" id=3]
+material = SubResource( 2 )
+
+[sub_resource type="SpatialMaterial" id=4]
+flags_unshaded = true
+params_blend_mode = 1
+params_billboard_mode = 3
+particles_anim_h_frames = 1
+particles_anim_v_frames = 1
+particles_anim_loop = false
+albedo_texture = ExtResource( 1 )
+
+[sub_resource type="QuadMesh" id=5]
+material = SubResource( 4 )
 
 [node name="water_tap" type="Spatial"]
 
 [node name="particles" type="Particles" parent="."]
-transform = Transform( 1, 0, 0, 0, 0.15, 0, 0, 0, 1, 0, 0, 0 )
+transform = Transform( 0.1, 0, 0, 0, 0.15, 0, 0, 0, 1, 0, 0, 0 )
+amount = 60
 visibility_aabb = AABB( -2.39364, -2.25282, -4, 4.78728, 4.50564, 8 )
 process_material = SubResource( 1 )
-draw_passes = 3
-draw_pass_1 = SubResource( 2 )
-draw_pass_2 = null
-draw_pass_3 = null
-
+draw_passes = 2
+draw_pass_1 = SubResource( 3 )
+draw_pass_2 = SubResource( 5 )