Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2024-12-23 01:59:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix Seasons

Browse Source
This commit is contained in:
Xonk 2023-06-11 19:26:12 -04:00
parent f6d977b5d7
commit 4cc83166db
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shaders/gbuffers_all_solid.fsh
View File

@ -36,9 +36,9 @@ varying vec4 vtexcoord;
#endif #endif
#include "/lib/res_params.glsl" #include "/lib/res_params.glsl"
varying vec4 lmtexcoord; varying vec4 lmtexcoord;
varying vec4 color; varying vec4 color;
varying vec4 NoSeasonCol;
varying vec4 seasonColor;
uniform float far; uniform float far;

20
shaders/gbuffers_all_solid.vsh
View File

@ -22,7 +22,6 @@ Read the terms of modification and sharing before changing something below pleas
varying vec4 color; varying vec4 color;
varying vec4 NoSeasonCol;
varying float VanillaAO; varying float VanillaAO;
varying vec4 lmtexcoord; varying vec4 lmtexcoord;
@ -288,15 +287,16 @@ void main() {
#endif #endif
#ifdef Seasons
NoSeasonCol.rgb = gl_Color.rgb; #ifdef WORLD
#ifndef BLOCKENTITIES
#ifdef Seasons #ifndef ENTITIES
#ifndef BLOCKENTITIES #ifndef HAND
#ifndef ENTITIES YearCycleColor(color.rgb, gl_Color.rgb);
YearCycleColor(color.rgb, gl_Color.rgb); #endif
#endif #endif
#endif #endif
#endif
#endif #endif
#ifdef TAA_UPSCALING #ifdef TAA_UPSCALING

4
shaders/lib/climate_settings.glsl
View File

@ -25,7 +25,7 @@
#ifdef Seasons #ifdef Seasons
#ifdef SEASONS_VSH #ifdef SEASONS_VSH
varying vec4 seasonColor; uniform int worldDay;
void YearCycleColor ( void YearCycleColor (
inout vec3 FinalColor, inout vec3 FinalColor,
@ -78,7 +78,7 @@
bool IsTintIndex = floor(dot(glcolor,vec3(0.5))) < 1.0; bool IsTintIndex = floor(dot(glcolor,vec3(0.5))) < 1.0;
// 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.
FinalColor = SpringToSummer; if(IsTintIndex) FinalColor = SpringToSummer;
} }
#endif #endif
#endif #endif

10
shaders/lib/settings.glsl
View File

@ -206,11 +206,13 @@
#endif #endif
// #define Allow_Vanilla_sky // allow the vanilla sky to appear. may appear broken with some resourcepacks.
// #define WhiteWorld // THIS IS A DEBUG VIEW. uses to see AO easier. used to see fake GI better (green light)
#define TAA #define TAA
// #define TAA_UPSCALING // Lowers render resolution and uses TAA to combine several lower resolution images (greatly improves performance). USE THIS INSTEAD OF SHADER RENDER QUALITY OPTION IF YOU WANT TO INCREASE FPS (Leave it to 1). IF YOU WANT TO INCREASE QUALITY DISABLE THIS AND INCREASE SHADER RENDER QUALITY // #define TAA_UPSCALING // Lowers render resolution and uses TAA to combine several lower resolution images (greatly improves performance). USE THIS INSTEAD OF SHADER RENDER QUALITY OPTION IF YOU WANT TO INCREASE FPS (Leave it to 1). IF YOU WANT TO INCREASE QUALITY DISABLE THIS AND INCREASE SHADER RENDER QUALITY
// #define Seasons
#define Seasons
#define Season_Length 24 // how long each season lasts in minecraft days. 91 is roughly how long each season is in reality. 1 will make a year last 4 days [ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91] #define Season_Length 24 // how long each season lasts in minecraft days. 91 is roughly how long each season is in reality. 1 will make a year last 4 days [ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91]
// #define Snowy_Winter // snow in the winter, yes or no? // #define Snowy_Winter // snow in the winter, yes or no?
#define Summer_R 1.0 // the color of the plants during this season [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0] #define Summer_R 1.0 // the color of the plants during this season [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0]
@ -395,7 +397,9 @@ const float shadowDistanceRenderMul = -1.0; //[-1.0 1.0] THIS WILL BREAK SUBSURF
// -- RANDOM SHIT --- // -- RANDOM SHIT ---
// #define WhiteWorld // THIS IS A DEBUG VIEW. uses to see AO easier. used to see fake GI better (green light)
// #define Compositing_Sky // make the sky some color to make compositing a sky in some photoediting software easier. // #define Compositing_Sky // make the sky some color to make compositing a sky in some photoediting software easier.
#define CompSky_R 0.0 // [ 0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] #define CompSky_R 0.0 // [ 0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ]
#define CompSky_G 0.0 // [ 0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] #define CompSky_G 0.0 // [ 0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ]
#define CompSky_B 0.0 // [ 0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ] #define CompSky_B 0.0 // [ 0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 ]