Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2025-06-26 18:22:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve water waves and underwater fog colors. add support for viveCraft hand with the flashlight/handheld light (more vivecraft support is planned for the future). tweak time of day fog labels. clean a little code.

Browse Source
This commit is contained in:
Xonk
2025-03-09 22:36:51 -04:00
parent b7c276b015
commit c2d97ec045
18 changed files with 169 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
shaders/lib/waterBump.glsl
View File

@ -3,93 +3,79 @@ float waterCaustics(vec3 worldPos, vec3 sunVec) {
vec3 projectedPos = worldPos - (sunVec/sunVec.y*worldPos.y);
vec2 pos = projectedPos.xz;
float heightSum = 0.0;
float movement = frameTimeCounter*0.035 * WATER_WAVE_SPEED;
// movement = 0.0;
float movement = frameTimeCounter * 0.035 * WATER_WAVE_SPEED;
float radiance = 2.39996;
mat2 rotationMatrix = mat2(vec2(cos(radiance), -sin(radiance)), vec2(sin(radiance), cos(radiance)));
vec2 wave_size[3] = vec2[](
vec2 wave_size[3] = vec2[](
vec2(48.,12.),
vec2(12.,48.),
vec2(32.,32.)
);
float WavesLarge = max(texture2D(noisetex, pos / 600.0 ).b,0.1);
float largeWaves = texture2D(noisetex, pos / 600.0 ).b;
float largeWavesCurved = pow(1.0-pow(1.0-largeWaves,2.5),4.5);
float heightSum = 0.0;
for (int i = 0; i < 3; i++){
pos = rotationMatrix * pos;
heightSum += pow(abs(abs(texture2D(noisetex, pos / wave_size[i] + WavesLarge*0.5 + movement).b * 2.0 - 1.0) * 2.0 - 1.0), 2.0) ;
heightSum += pow(abs(abs(texture2D(noisetex, pos / wave_size[i] + largeWavesCurved * 0.5 + movement).b * 2.0 - 1.0) * 2.0 - 1.0), 1.0+largeWavesCurved) ;
}
float FinalCaustics = exp((1.0 + 5.0 * pow(WavesLarge,0.5)) * (heightSum / 3.0 - 0.5));
return exp((1.0 + 5.0 * sqrt(largeWavesCurved)) * (heightSum / 3.0 - 0.5));
return FinalCaustics;
}
float getWaterHeightmap(vec2 posxz) {
float getWaterHeightmap(vec2 posxz, in float largeWaves, in float largeWavesCurved) {
vec2 pos = posxz;
float heightSum = 0.0;
float movement = frameTimeCounter*0.035 * WATER_WAVE_SPEED;
// movement = 0.0;
float movement = frameTimeCounter * 0.035 * WATER_WAVE_SPEED;
float radiance = 2.39996;
mat2 rotationMatrix = mat2(vec2(cos(radiance), -sin(radiance)), vec2(sin(radiance), cos(radiance)));
vec2 wave_size[3] = vec2[](
vec2 wave_size[3] = vec2[](
vec2(48.,12.),
vec2(12.,48.),
vec2(32.,32.)
);
float WavesLarge = max(texture2D(noisetex, pos / 600.0 ).b,0.1);
float heightSum = 0.0;
for (int i = 0; i < 3; i++){
pos = rotationMatrix * pos;
heightSum += texture2D(noisetex, pos / wave_size[i] + WavesLarge*0.5 + movement).b;
heightSum += texture2D(noisetex, pos / wave_size[i] + largeWavesCurved * 0.5 + movement).b;
}
return (heightSum / 60.0) * WavesLarge;
return (heightSum/4.5) * max(largeWavesCurved,0.3);
}
vec3 getWaveNormal(vec3 waterPos, vec3 playerpos, bool isLOD){
// vary the normal's "smooth" factor as distance changes, to avoid noise from too much details.
// float range = pow(clamp(1.0 - length(posxz - cameraPosition)/(32*4),0.0,1.0),2.0);
// float deltaPos = mix(0.5, 0.1, range);
float range = min(length(playerpos) / (16*12.0), 3.0) ;
float deltaPos = range + 0.15;
// float range = 1-max(1.0-length(playerpos) / (16.0*16.0) ,0.0) ;
// range = (1.0-pow(1.0-pow(range,2.0),2.0)) * 3.0;
// float deltaPos = range + 0.15;
// float normalMult = 1.0 * WATER_WAVE_STRENGTH;
// if(isLOD){
// deltaPos = mix(0.9, deltaPos, range);
// }
// added detail for snells window
// if(isEyeInWater == 1) deltaPos = 0.025;
float largeWaves = texture2D(noisetex, waterPos.xy / 600.0 ).b;
float largeWavesCurved = pow(1.0-pow(1.0-largeWaves,2.5),4.5);
#ifdef HYPER_DETAILED_WAVES
deltaPos = 0.025;
float deltaPos = mix(1.0, 0.05, largeWavesCurved);
#else
float deltaPos = mix(1.0, 0.15, largeWavesCurved);
// reduce high frequency detail as distance increases. reduces noise on waves. why have more details than pixels?
float range = min(length(playerpos) / (16.0*24.0), 3.0);
deltaPos += range;
#endif
vec2 coord = waterPos.xy;
float h0 = getWaterHeightmap(coord);
float h1 = getWaterHeightmap(coord + vec2(deltaPos,0.0));
float h3 = getWaterHeightmap(coord + vec2(0.0,deltaPos));
float h0 = getWaterHeightmap(coord, largeWaves, largeWavesCurved);
float h1 = getWaterHeightmap(coord + vec2(deltaPos,0.0), largeWaves,largeWavesCurved);
float h3 = getWaterHeightmap(coord + vec2(0.0,deltaPos), largeWaves,largeWavesCurved);
float xDelta = (h1-h0)/deltaPos;
float yDelta = (h3-h0)/deltaPos;
vec3 wave = normalize(vec3(xDelta, yDelta, 1.0-pow(abs(xDelta+yDelta),2.0)));
vec3 wave = normalize(vec3(xDelta, yDelta, 1.0-pow(abs(xDelta+yDelta),2.0)));
return wave;
}
}