AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update fixNES

This commit is contained in:
Jack Andersen 2018-06-18 21:03:00 -10:00
parent 58c00b6c9c
commit 64dd7b1643
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NESEmulator/fixNES

@ -1 +1 @@
Subproject commit 03b5b7fdf32708dd83e13224747fe3a387dafa69 Subproject commit cc08b110f945cdfb3f78d1bb35908f1c23faf5ce

2
Runtime/Graphics/Shaders/CFluidPlaneShaderGLSL.cpp
View File

@ -138,7 +138,7 @@ BOO_GLSL_BINDING_HEAD
"void ApplyRipple(in Ripple ripple, in vec2 pos, inout float height)\n" "void ApplyRipple(in Ripple ripple, in vec2 pos, inout float height)\n"
"{\n" "{\n"
" float dist = length(ripple.center.xy - pos);\n" " float dist = length(ripple.center.xy - pos);\n"
" float rippleV = texture(RippleMap, vec2(dist * ripple.center.w, ripple.center.z)).r;\n" " float rippleV = textureLod(RippleMap, vec2(dist * ripple.center.w, ripple.center.z), 0.0).r;\n"
" height += rippleV * ripple.params.x * sin((dist * ripple.params.y + ripple.params.z) * PI_X2);\n" " height += rippleV * ripple.params.x * sin((dist * ripple.params.y + ripple.params.z) * PI_X2);\n"
"}\n" "}\n"
"\n" "\n"