Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2024-12-22 17:47:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix tiny issue with seasons on DH LODS

Browse Source
This commit is contained in:
Xonk 2024-05-10 14:53:39 -04:00
parent 4e00602b33
commit 23b44f78ca
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shaders/dimensions/DH_solid.vsh
View File

@ -90,8 +90,7 @@ void main() {
#if defined Seasons && defined OVERWORLD_SHADER #if defined Seasons && defined OVERWORLD_SHADER
float blank = 0.0; YearCycleColor(gcolor.rgb, gl_Color.rgb, dhMaterialId == DH_BLOCK_LEAVES, dh_material_id == DH_BLOCK_GRASS);
YearCycleColor(gcolor.rgb, gl_Color.rgb, blank, dhMaterialId == DH_BLOCK_LEAVES);
#endif #endif
#if DOF_QUALITY == 5 #if DOF_QUALITY == 5

3
shaders/dimensions/all_solid.vsh
View File

@ -355,8 +355,7 @@ if(heldItemId == ITEM_LIGHT_SOURCES || heldItemId2 == ITEM_LIGHT_SOURCES) HELD_I
#endif #endif
#if defined Seasons && defined WORLD && !defined ENTITIES && !defined BLOCKENTITIES && !defined HAND #if defined Seasons && defined WORLD && !defined ENTITIES && !defined BLOCKENTITIES && !defined HAND
float blank = 0.0; YearCycleColor(color.rgb, gl_Color.rgb, mc_Entity.x == BLOCK_AIR_WAVING, true);
YearCycleColor(color.rgb, gl_Color.rgb, blank, mc_Entity.x == BLOCK_AIR_WAVING);
#endif #endif
#ifdef TAA_UPSCALING #ifdef TAA_UPSCALING

22
shaders/lib/climate_settings.glsl
View File

@ -17,9 +17,9 @@
void YearCycleColor ( void YearCycleColor (
inout vec3 FinalColor, inout vec3 FinalColor,
vec3 glcolor, vec3 glcolor,
inout float SnowySeason,
bool isLeaves bool isLeaves,
bool isPlants
){ ){
// colors for things that arent leaves and using the tint index. // colors for things that arent leaves and using the tint index.
vec3 SummerCol = vec3(Summer_R, Summer_G, Summer_B); vec3 SummerCol = vec3(Summer_R, Summer_G, Summer_B);
@ -65,19 +65,19 @@
vec3 SpringToSummer = mix(WinterToSpring, SummerCol, SpringTime); vec3 SpringToSummer = mix(WinterToSpring, SummerCol, SpringTime);
// make it so that you only have access to parts of the texture that use the tint index // make it so that you only have access to parts of the texture that use the tint index
bool IsTintIndex = floor(dot(glcolor,vec3(0.5))) < 1.0; bool IsTintIndex = floor(dot(glcolor,vec3(0.5))) < 1.0 && isPlants;
// multiply final color by the final lerped color, because it contains all the other colors. // multiply final color by the final lerped color, because it contains all the other colors.
if(IsTintIndex) FinalColor = SpringToSummer; if(IsTintIndex) FinalColor = SpringToSummer;
#ifdef Snowy_Winter // #ifdef Snowy_Winter
// this is to make snow only exist in winter // // this is to make snow only exist in winter
float FallToWinter_snowfall = mix(0.0, 1.0, AutumnTime); // float FallToWinter_snowfall = mix(0.0, 1.0, AutumnTime);
float WinterToSpring_snowfall = mix(FallToWinter_snowfall, 0.0, WinterTime); // float WinterToSpring_snowfall = mix(FallToWinter_snowfall, 0.0, WinterTime);
SnowySeason = clamp(pow(sin(WinterToSpring_snowfall*SeasonLength)*0.5+0.5,5),0,1) * WinterToSpring_snowfall * noPuddleAreas; // // SnowySeason = clamp(pow(sin(WinterToSpring_snowfall*SeasonLength)*0.5+0.5,5),0,1) * WinterToSpring_snowfall * noPuddleAreas;
#else // #else
SnowySeason = 0.0; // // SnowySeason = 0.0;
#endif // #endif
} }
#endif #endif
#endif #endif