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

add distance haze to cloud planes. fix weird stuff when atmosphere ground setting is turned off.

Browse Source
This commit is contained in:
Xonk
2025-03-10 20:39:00 -04:00
parent 2bc82146bb
commit 0bbe877f38
3 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shaders/dimensions/composite3.fsh
View File

@ -489,7 +489,7 @@ void main() {
#ifdef SKY_GROUND #ifdef SKY_GROUND
vec3 borderFogColor = skyGroundColor; vec3 borderFogColor = skyGroundColor;
#else #else
vec3 borderFogColor = skyFromTex(playerPos_normalized, colortex4)/30.0; vec3 borderFogColor = skyFromTex(playerPos_normalized, colortex4)/1200.0 * Sky_Brightness;
#endif #endif
color.rgb = mix(color.rgb, borderFogColor, fog); color.rgb = mix(color.rgb, borderFogColor, fog);

2
shaders/dimensions/deferred.fsh
View File

@ -146,7 +146,7 @@ float invLinZ (float lindepth){
} }
#ifdef OVERWORLD_SHADER #ifdef OVERWORLD_SHADER
uniform sampler2D colortex4; // uniform sampler2D colortex4;
// uniform sampler2D colortex12; // uniform sampler2D colortex12;
// const bool shadowHardwareFiltering = true; // const bool shadowHardwareFiltering = true;
uniform sampler2DShadow shadow; uniform sampler2DShadow shadow;

49
shaders/lib/volumetricClouds.glsl
View File

@ -218,6 +218,8 @@ vec3 getCloudLighting(
return indirectScattering + directScattering; return indirectScattering + directScattering;
} }
uniform sampler2D colortex4;
vec4 raymarchCloud( vec4 raymarchCloud(
int LayerIndex, int LayerIndex,
float samples, float samples,
@ -235,6 +237,9 @@ vec4 raymarchCloud(
float distanceFade, float distanceFade,
float referenceDistance float referenceDistance
,vec3 sampledSkyCol
){ ){
vec3 color = vec3(0.0); vec3 color = vec3(0.0);
float totalAbsorbance = 1.0; float totalAbsorbance = 1.0;
@ -269,6 +274,14 @@ vec4 raymarchCloud(
vec3 lighting = getCloudLighting(shapeWithDensity, shapeWithDensity, sunShadowMask, sunScattering, sunMultiScattering, indirectShadowMask, skyScattering, distanceFade); vec3 lighting = getCloudLighting(shapeWithDensity, shapeWithDensity, sunShadowMask, sunScattering, sunMultiScattering, indirectShadowMask, skyScattering, distanceFade);
vec3 newPos = rayPosition - cameraPosition;
newPos.xz /= max(newPos.y,0.0)*0.0025 + 1.0;
newPos.y = min(newPos.y,0.0);
float distancefog = exp(-0.00025*length(newPos));
vec3 atmosphereHaze = (sampledSkyCol - sampledSkyCol * distancefog);
lighting = lighting * distancefog + atmosphereHaze;
float densityCoeff = exp(-distanceFactor*shapeWithDensity); float densityCoeff = exp(-distanceFactor*shapeWithDensity);
color += (lighting - lighting * densityCoeff) * totalAbsorbance; color += (lighting - lighting * densityCoeff) * totalAbsorbance;
totalAbsorbance *= densityCoeff; totalAbsorbance *= densityCoeff;
@ -328,6 +341,15 @@ vec4 raymarchCloud(
vec3 lighting = getCloudLighting(shapeWithDensity, shapeWithDensityFaded, sunShadowMask, sunScattering, sunMultiScattering, indirectShadowMask, skyScattering * skylightOcclusion, distanceFade); vec3 lighting = getCloudLighting(shapeWithDensity, shapeWithDensityFaded, sunShadowMask, sunScattering, sunMultiScattering, indirectShadowMask, skyScattering * skylightOcclusion, distanceFade);
vec3 newPos = rayPosition - cameraPosition;
newPos.xz /= max(newPos.y,0.0)*0.0025 + 1.0;
newPos.y = min(newPos.y,0.0);
float distancefog = exp(-0.00025*length(newPos));
vec3 atmosphereHaze = (sampledSkyCol - sampledSkyCol * distancefog);
lighting = lighting * distancefog + atmosphereHaze;
float densityCoeff = exp(-distanceFactor*shapeWithDensityFaded); float densityCoeff = exp(-distanceFactor*shapeWithDensityFaded);
color += (lighting - lighting * densityCoeff) * totalAbsorbance; color += (lighting - lighting * densityCoeff) * totalAbsorbance;
totalAbsorbance *= densityCoeff; totalAbsorbance *= densityCoeff;
@ -353,7 +375,7 @@ vec3 getRayOrigin(
float maxHeight float maxHeight
){ ){
vec3 cloudDist = vec3(1.0); cloudDist.xz = vec2(25.0); vec3 cloudDist = vec3(1.0); cloudDist.xz = vec2(255.0);
// allow passing through/above/below the plane without limits // allow passing through/above/below the plane without limits
float flip = mix(max(cameraPos.y - maxHeight,0.0), max(minHeight - cameraPos.y,0.0), clamp(rayStartPos.y,0.0,1.0)); float flip = mix(max(cameraPos.y - maxHeight,0.0), max(minHeight - cameraPos.y,0.0), clamp(rayStartPos.y,0.0,1.0));
@ -397,8 +419,9 @@ vec4 GetVolumetricClouds(
vec3 signedSunVec = sunVector; vec3 signedSunVec = sunVector;
vec3 unignedSunVec = sunVector;// * (float(sunElevation > 1e-5)*2.0-1.0); vec3 unignedSunVec = sunVector;// * (float(sunElevation > 1e-5)*2.0-1.0);
float SdotV = dot(unignedSunVec, NormPlayerPos.xyz); float SdotV = dot(unignedSunVec, NormPlayerPos.xyz);
#ifdef SKY_GROUND
// NormPlayerPos.y += 0.025*heightRelativeToClouds; NormPlayerPos.y += 0.03;
#endif
int maxSamples = 15; int maxSamples = 15;
int minSamples = 10; int minSamples = 10;
@ -406,7 +429,7 @@ vec4 GetVolumetricClouds(
// int samples = 30; // int samples = 30;
///------- setup the ray ///------- setup the ray
vec3 cloudDist = vec3(1.0); cloudDist.xz *= 25.0; vec3 cloudDist = vec3(1.0); cloudDist.xz = vec2(255.0);
// vec3 rayDirection = NormPlayerPos.xyz * (cloudheight/abs(NormPlayerPos.y)/samples); // vec3 rayDirection = NormPlayerPos.xyz * (cloudheight/abs(NormPlayerPos.y)/samples);
vec3 rayDirection = NormPlayerPos.xyz * (cloudheight/length(NormPlayerPos.xyz/cloudDist)/samples); vec3 rayDirection = NormPlayerPos.xyz * (cloudheight/length(NormPlayerPos.xyz/cloudDist)/samples);
vec3 rayPosition = getRayOrigin(rayDirection, cameraPosition, dither.y, minHeight, maxHeight); vec3 rayPosition = getRayOrigin(rayDirection, cameraPosition, dither.y, minHeight, maxHeight);
@ -428,15 +451,21 @@ vec4 GetVolumetricClouds(
distanceFade = 1.0; distanceFade = 1.0;
// - pow(1.0-clamp(signedSunVec.y,0.0,1.0),5.0) // - pow(1.0-clamp(signedSunVec.y,0.0,1.0),5.0)
skyScattering *= mix(1.0, 2.0, distanceFade); skyScattering *= 2.0;
sunScattering *= distanceFade; // sunScattering *= distanceFade;
sunMultiScattering *= distanceFade; // sunMultiScattering *= distanceFade;
#ifdef SKY_GROUND
vec3 sampledSkyCol = skyScattering * 0.5;
#else
vec3 sampledSkyCol = skyFromTex(normalize(rayPosition-cameraPosition), colortex4)/1200.0 * Sky_Brightness;
#endif
////------- RENDER SMALL CUMULUS CLOUDS ////------- RENDER SMALL CUMULUS CLOUDS
vec4 smallCumulusClouds = cloudColor; vec4 smallCumulusClouds = cloudColor;
#ifdef CloudLayer0 #ifdef CloudLayer0
smallCumulusClouds = raymarchCloud(SMALLCUMULUS_LAYER, samples, rayPosition, rayDirection, dither.x, minHeight, maxHeight, unignedSunVec, sunScattering, sunMultiScattering, skyScattering, distanceFade, lViewPosM); smallCumulusClouds = raymarchCloud(SMALLCUMULUS_LAYER, samples, rayPosition, rayDirection, dither.x, minHeight, maxHeight, unignedSunVec, sunScattering, sunMultiScattering, skyScattering, distanceFade, lViewPosM, sampledSkyCol);
#endif #endif
////------- RENDER LARGE CUMULUS CLOUDS ////------- RENDER LARGE CUMULUS CLOUDS
@ -450,7 +479,7 @@ vec4 GetVolumetricClouds(
rayDirection = NormPlayerPos.xyz * (cloudheight/length(NormPlayerPos.xyz/cloudDist)/samples); rayDirection = NormPlayerPos.xyz * (cloudheight/length(NormPlayerPos.xyz/cloudDist)/samples);
rayPosition = getRayOrigin(rayDirection, cameraPosition, dither.y, minHeight, maxHeight); rayPosition = getRayOrigin(rayDirection, cameraPosition, dither.y, minHeight, maxHeight);
if(smallCumulusClouds.a > 1e-5) largeCumulusClouds = raymarchCloud(LARGECUMULUS_LAYER, samples, rayPosition, rayDirection, dither.x, minHeight, maxHeight, unignedSunVec, sunScattering, sunMultiScattering, skyScattering, distanceFade, lViewPosM); if(smallCumulusClouds.a > 1e-5) largeCumulusClouds = raymarchCloud(LARGECUMULUS_LAYER, samples, rayPosition, rayDirection, dither.x, minHeight, maxHeight, unignedSunVec, sunScattering, sunMultiScattering, skyScattering, distanceFade, lViewPosM, sampledSkyCol);
#endif #endif
////------- RENDER ALTOSTRATUS CLOUDS ////------- RENDER ALTOSTRATUS CLOUDS
@ -464,7 +493,7 @@ vec4 GetVolumetricClouds(
rayDirection = NormPlayerPos.xyz * (cloudheight/length(NormPlayerPos.xyz/cloudDist)); rayDirection = NormPlayerPos.xyz * (cloudheight/length(NormPlayerPos.xyz/cloudDist));
rayPosition = getRayOrigin(rayDirection, cameraPosition, dither.y, minHeight, maxHeight); rayPosition = getRayOrigin(rayDirection, cameraPosition, dither.y, minHeight, maxHeight);
if(smallCumulusClouds.a > 1e-5 || largeCumulusClouds.a > 1e-5) altoStratusClouds = raymarchCloud(ALTOSTRATUS_LAYER, samples, rayPosition, rayDirection, dither.x, minHeight, maxHeight, unignedSunVec, sunScattering, sunMultiScattering, skyScattering, distanceFade, lViewPosM); if(smallCumulusClouds.a > 1e-5 || largeCumulusClouds.a > 1e-5) altoStratusClouds = raymarchCloud(ALTOSTRATUS_LAYER, samples, rayPosition, rayDirection, dither.x, minHeight, maxHeight, unignedSunVec, sunScattering, sunMultiScattering, skyScattering, distanceFade, lViewPosM, sampledSkyCol);
#endif #endif
////------- BLEND LAYERS ////------- BLEND LAYERS