Skip to content

Commit 60bff1e

Browse files
lhofhansllhofhansl
committedNov 20, 2019
Waves generated with Perlin-type noise #8994
·
5.11.05.2.0
1 parent b3c245b commit 60bff1e

File tree

2 files changed

+64
-7
lines changed

2 files changed

+64
-7
lines changed
 

‎client/shaders/nodes_shader/opengl_vertex.glsl

+53-6
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,43 @@ float smoothTriangleWave(float x)
4646
return smoothCurve(triangleWave(x)) * 2.0 - 1.0;
4747
}
4848

49+
#if (MATERIAL_TYPE == TILE_MATERIAL_WAVING_LIQUID_TRANSPARENT || \
50+
MATERIAL_TYPE == TILE_MATERIAL_WAVING_LIQUID_OPAQUE || \
51+
MATERIAL_TYPE == TILE_MATERIAL_WAVING_LIQUID_BASIC) && ENABLE_WAVING_WATER
52+
53+
//
54+
// Simple, fast noise function.
55+
// See: https://gist.github.com/patriciogonzalezvivo/670c22f3966e662d2f83
56+
//
57+
vec4 perm(vec4 x)
58+
{
59+
return mod(((x * 34.0) + 1.0) * x, 289.0);
60+
}
61+
62+
float snoise(vec3 p)
63+
{
64+
vec3 a = floor(p);
65+
vec3 d = p - a;
66+
d = d * d * (3.0 - 2.0 * d);
67+
68+
vec4 b = a.xxyy + vec4(0.0, 1.0, 0.0, 1.0);
69+
vec4 k1 = perm(b.xyxy);
70+
vec4 k2 = perm(k1.xyxy + b.zzww);
71+
72+
vec4 c = k2 + a.zzzz;
73+
vec4 k3 = perm(c);
74+
vec4 k4 = perm(c + 1.0);
75+
76+
vec4 o1 = fract(k3 * (1.0 / 41.0));
77+
vec4 o2 = fract(k4 * (1.0 / 41.0));
78+
79+
vec4 o3 = o2 * d.z + o1 * (1.0 - d.z);
80+
vec2 o4 = o3.yw * d.x + o3.xz * (1.0 - d.x);
81+
82+
return o4.y * d.y + o4.x * (1.0 - d.y);
83+
}
84+
85+
#endif
4986

5087
void main(void)
5188
{
@@ -65,7 +102,8 @@ void main(void)
65102

66103
float disp_x;
67104
float disp_z;
68-
#if (MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES) || (MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS)
105+
#if (MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES) || \
106+
(MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS)
69107
vec4 pos2 = mWorld * gl_Vertex;
70108
float tOffset = (pos2.x + pos2.y) * 0.001 + pos2.z * 0.002;
71109
disp_x = (smoothTriangleWave(animationTimer * 23.0 + tOffset) +
@@ -75,12 +113,22 @@ float disp_z;
75113
smoothTriangleWave(animationTimer * 13.0 + tOffset)) * 0.5;
76114
#endif
77115

116+
worldPosition = (mWorld * gl_Vertex).xyz;
78117

79-
#if (MATERIAL_TYPE == TILE_MATERIAL_WAVING_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_WAVING_LIQUID_OPAQUE || MATERIAL_TYPE == TILE_MATERIAL_WAVING_LIQUID_BASIC) && ENABLE_WAVING_WATER
118+
#if (MATERIAL_TYPE == TILE_MATERIAL_WAVING_LIQUID_TRANSPARENT || \
119+
MATERIAL_TYPE == TILE_MATERIAL_WAVING_LIQUID_OPAQUE || \
120+
MATERIAL_TYPE == TILE_MATERIAL_WAVING_LIQUID_BASIC) && ENABLE_WAVING_WATER
121+
// Generate waves with Perlin-type noise.
122+
// The constants are calibrated such that they roughly
123+
// correspond to the old sine waves.
80124
vec4 pos = gl_Vertex;
81-
pos.y -= 2.0;
82-
float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH);
83-
pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT;
125+
vec3 wavePos = worldPosition + cameraOffset;
126+
// The waves are slightly compressed along the z-axis to get
127+
// wave-fronts along the x-axis.
128+
wavePos.x /= WATER_WAVE_LENGTH * 3;
129+
wavePos.z /= WATER_WAVE_LENGTH * 2;
130+
wavePos.z += animationTimer * WATER_WAVE_SPEED * 10;
131+
pos.y += (snoise(wavePos) - 1) * WATER_WAVE_HEIGHT * 5;
84132
gl_Position = mWorldViewProj * pos;
85133
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES
86134
vec4 pos = gl_Vertex;
@@ -101,7 +149,6 @@ float disp_z;
101149

102150

103151
vPosition = gl_Position.xyz;
104-
worldPosition = (mWorld * gl_Vertex).xyz;
105152

106153
// Don't generate heightmaps when too far from the eye
107154
float dist = distance (vec3(0.0, 0.0, 0.0), vPosition);

‎src/client/mapblock_mesh.cpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,7 @@ static void getTileInfo(
795795
v3s16 &p_corrected,
796796
v3s16 &face_dir_corrected,
797797
u16 *lights,
798+
u8 &waving,
798799
TileSpec &tile
799800
)
800801
{
@@ -842,6 +843,7 @@ static void getTileInfo(
842843

843844
getNodeTile(n, p_corrected, face_dir_corrected, data, tile);
844845
const ContentFeatures &f = ndef->get(n);
846+
waving = f.waving;
845847
tile.emissive_light = f.light_source;
846848

847849
// eg. water and glass
@@ -876,6 +878,10 @@ static void updateFastFaceRow(
876878
const v3s16 &&face_dir,
877879
std::vector<FastFace> &dest)
878880
{
881+
static thread_local const bool waving_liquids =
882+
g_settings->getBool("enable_shaders") &&
883+
g_settings->getBool("enable_waving_water");
884+
879885
v3s16 p = startpos;
880886

881887
u16 continuous_tiles_count = 1;
@@ -884,10 +890,11 @@ static void updateFastFaceRow(
884890
v3s16 p_corrected;
885891
v3s16 face_dir_corrected;
886892
u16 lights[4] = {0, 0, 0, 0};
893+
u8 waving;
887894
TileSpec tile;
888895
getTileInfo(data, p, face_dir,
889896
makes_face, p_corrected, face_dir_corrected,
890-
lights, tile);
897+
lights, waving, tile);
891898

892899
// Unroll this variable which has a significant build cost
893900
TileSpec next_tile;
@@ -910,12 +917,15 @@ static void updateFastFaceRow(
910917
getTileInfo(data, p_next, face_dir,
911918
next_makes_face, next_p_corrected,
912919
next_face_dir_corrected, next_lights,
920+
waving,
913921
next_tile);
914922

915923
if (next_makes_face == makes_face
916924
&& next_p_corrected == p_corrected + translate_dir
917925
&& next_face_dir_corrected == face_dir_corrected
918926
&& memcmp(next_lights, lights, ARRLEN(lights) * sizeof(u16)) == 0
927+
// Don't apply fast faces to waving water.
928+
&& (waving != 3 || !waving_liquids)
919929
&& next_tile.isTileable(tile)) {
920930
next_is_different = false;
921931
continuous_tiles_count++;

0 commit comments

Comments
 (0)
Please sign in to comment.