mirror_js/WebGL-Fluid-Simulation
1
0
Fork 0
mirror of https://github.com/PavelDoGreat/WebGL-Fluid-Simulation.git synced 2025-10-03 17:31:53 +02:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
Pavel Dobryakov
2017-08-08 17:30:29 +03:00
parent 72d30d2854
commit 9cd5dcbd66
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
script.js
View File

@@ -192,21 +192,28 @@ const advectionShader = compileShader(gl.FRAGMENT_SHADER, `
uniform float dt; uniform float dt;
uniform float dissipation; uniform float dissipation;
// https://github.com/mharrys/fluids-2d/blob/master/shaders/advect.fs
vec4 bilerp (sampler2D sam, vec2 p) vec4 bilerp (sampler2D sam, vec2 p)
{ {
vec2 res = 1.0 / wh_inv.xy; vec2 res = 1.0 / wh_inv.xy;
// vec2 st = p * res - 0.5; // vec2 st = p * res - 0.5;
// vec2 iuv = floor(st); // vec2 iuv = floor(st);
// vec2 fuv = fract(st); // vec2 fuv = fract(st);
vec4 st;
st.xy = floor(p - 0.5) + 0.5;
st.zw = st.xy + 1.0;
vec4 uv = st / res.xyxy;
vec2 f = p - floor(p); // vec2 f = p - floor(p);
p = floor(p); // p = floor(p);
vec4 a = texture2D(sam, p); vec4 a = texture2D(sam, uv.xy);
vec4 b = texture2D(sam, p + vec2(wh_inv.x, 0.0)); vec4 b = texture2D(sam, uv.zy);
vec4 c = texture2D(sam, p + vec2(0.0, wh_inv.y)); vec4 c = texture2D(sam, uv.xw);
vec4 d = texture2D(sam, p + wh_inv.xy); vec4 d = texture2D(sam, uv.zw);
vec2 f = p - st.xy;
return mix(mix(a, b, f.x), mix(c, d, f.x), f.y); return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);
} }