diff --git a/meshes/props/fountain_suzanha/Fountain_suzanha.tscn b/meshes/props/fountain_suzanha/Fountain_suzanha.tscn index 743a4aa..ec9160a 100644 --- a/meshes/props/fountain_suzanha/Fountain_suzanha.tscn +++ b/meshes/props/fountain_suzanha/Fountain_suzanha.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://meshes/props/fountain_suzanha/foutain_suzanha.escn" type="PackedScene" id=1] [ext_resource path="res://materials/tilables/suzahna_bricks.tres" type="Material" id=2] [ext_resource path="res://materials/tilables/suzahna_bricks_wide.tres" type="Material" id=3] [ext_resource path="res://materials/tilables/suzahna_base.tres" type="Material" id=4] +[ext_resource path="res://shaders/water_plane/water_plane.tscn" type="PackedScene" id=5] +[ext_resource path="res://shaders/waterfall/water_tap.tscn" type="PackedScene" id=6] [node name="Fountain_suzanha" index="0" instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.47228, 0 ) @@ -17,3 +19,9 @@ material/0 = ExtResource( 3 ) [node name="Fountain_suzanha_waterhole" parent="." index="2"] material/0 = ExtResource( 4 ) +[node name="water_plane" parent="." index="3" instance=ExtResource( 5 )] +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 ) + diff --git a/shaders/water_plane/water_plane.tscn b/shaders/water_plane/water_plane.tscn new file mode 100644 index 0000000..13b4ab2 --- /dev/null +++ b/shaders/water_plane/water_plane.tscn @@ -0,0 +1,17 @@ +[gd_scene load_steps=3 format=2] + +[sub_resource type="SpatialMaterial" id=1] +flags_transparent = true +params_cull_mode = 2 +albedo_color = Color( 0.505882, 0.784314, 0.796078, 0.698039 ) + +[sub_resource type="PlaneMesh" id=2] +material = SubResource( 1 ) +size = Vector2( 3.5, 1.8 ) + +[node name="water_plane" type="Spatial"] + +[node name="mesh_instance" type="MeshInstance" parent="."] +mesh = SubResource( 2 ) +material/0 = null + diff --git a/shaders/waterfall/water_tap.tscn b/shaders/waterfall/water_tap.tscn new file mode 100644 index 0000000..ed92672 --- /dev/null +++ b/shaders/waterfall/water_tap.tscn @@ -0,0 +1,25 @@ +[gd_scene load_steps=4 format=2] + +[sub_resource type="ParticlesMaterial" id=1] + +[sub_resource type="SpatialMaterial" id=3] +flags_transparent = true +albedo_color = Color( 0.533333, 0.768627, 0.745098, 0.764706 ) + +[sub_resource type="CylinderMesh" id=2] +material = SubResource( 3 ) +top_radius = 0.05 +bottom_radius = 0.06 +height = 1.6 + +[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 ) +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 +