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

Tweak ambient light color sampling to be more gooder

Browse Source
This commit is contained in:
Xonk 2023-06-28 17:14:08 -04:00
parent 4d2c35c526
commit c4c2e0d2d7
7 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shaders/deferred.vsh
View File

@ -89,12 +89,15 @@ void main() {
vec3 pos = normalize(vec3(0,1,0)); vec3 pos = normalize(vec3(0,1,0));
int maxIT = 9; int maxIT = 9;
for (int i = 0; i < maxIT; i++) { for (int i = 0; i < maxIT; i++) {
pos.xy += normalize(sample3x3[i] * vec2(0.5,0.5)); pos = normalize(vec3(0,1,0));
averageSkyCol_Clouds += 2.0*skyCloudsFromTex(pos,colortex4).rgb/maxIT/150.; pos.xy += normalize(sample3x3[i]) * vec2(0.3183,0.90);
averageSkyCol_Clouds += 1.72*skyCloudsFromTex(pos,colortex4).rgb/maxIT/150.;
// pos = normalize(vec3(0,1,0));
// pos.xy += normalize(sample3x3[i]) * vec2(0.3183,0.90);
averageSkyCol += 1.5*skyFromTex(pos,colortex4).rgb/maxIT/150.; // please dont do an infinite feedback loop.... averageSkyCol += 1.5*skyFromTex(pos,colortex4).rgb/maxIT/150.; // please dont do an infinite feedback loop....
pos = normalize(vec3(0,1,0));
} }
/// TOOO DAMN BLUE /// TOOO DAMN BLUE

4
shaders/entity.properties
View File

@ -6,8 +6,10 @@
entity.1100 = slime giant ender_dragon ghast sheep entity.1100 = slime giant ender_dragon ghast sheep
#weak sss (same as weak sss for blocks) #weak sss (same as weak sss for blocks)
entity.1200 = player frog chicken snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin blaze creeper drowned elder_gaurdian endermite evoker guardian hoglin husk magma_cube phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager wither trader_llama entity.1200 = player frog chicken snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin blaze creeper drowned elder_gaurdian endermite evoker guardian hoglin husk magma_cube phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager wither trader_llama
# various stuff
entity.12345 = minecraft:lightning_bolt weather2:lightning_bolt entity.12345 = minecraft:lightning_bolt weather2:lightning_bolt
entity.2300 = minecraft:item_frame minecraft:item_display entity.2300 = minecraft:item_frame minecraft:item_display

5
shaders/gbuffers_all_solid.vsh
View File

@ -223,7 +223,9 @@ void main() {
SIGN = 0; SIGN = 0;
#ifdef WORLD #ifdef WORLD
// disallow POM to work on signs.
if(blockEntityId == 2200) SIGN = 1; if(blockEntityId == 2200) SIGN = 1;
if(blockEntityId == 2100) PORTAL = 1; if(blockEntityId == 2100) PORTAL = 1;
#endif #endif
@ -231,12 +233,13 @@ void main() {
PHYSICSMOD_SNOW = 0; PHYSICSMOD_SNOW = 0;
#ifdef ENTITIES #ifdef ENTITIES
// disallow POM to work on item frames.
if(entityId == 2300) SIGN = 1;
#ifdef ENTITY_PHYSICSMOD_SNOW #ifdef ENTITY_PHYSICSMOD_SNOW
if(entityId == 829925) PHYSICSMOD_SNOW = 1; if(entityId == 829925) PHYSICSMOD_SNOW = 1;
#endif #endif
if(entityId == 2300) SIGN = 1;
// try and single out nametag text and then discard nametag background // try and single out nametag text and then discard nametag background
// if( dot(gl_Color.rgb, vec3(1.0/3.0)) < 1.0) NameTags = 1; // if( dot(gl_Color.rgb, vec3(1.0/3.0)) < 1.0) NameTags = 1;

5
shaders/gbuffers_basic.fsh
View File

@ -1,6 +1,7 @@
#version 120 #version 120
// #define ENTITIES #define ENTITIES
#define BLOCKENTITIES // #define LINE
// #define BLOCKENTITIES
#define WORLD #define WORLD
#include "gbuffers_all_solid.fsh" #include "gbuffers_all_solid.fsh"

4
shaders/gbuffers_basic.vsh
View File

@ -1,7 +1,7 @@
#version 120 #version 120
// #define ENTITIES #define ENTITIES
// #define LINE // #define LINE
#define BLOCKENTITIES // #define BLOCKENTITIES
#define WORLD #define WORLD
#include "gbuffers_all_solid.vsh" #include "gbuffers_all_solid.vsh"

2
shaders/lib/ROBOBO_sky.glsl
View File

@ -139,7 +139,7 @@ vec3 calculateAtmosphere(vec3 background, vec3 viewVector, vec3 upVector, vec3 s
scatteringSun += sky_coefficientsScattering * (stepAirmass.xy * phaseSun ) * stepScatteringVisible * sky_transmittance(position, sunVector*0.5+0.1, jSteps) ; scatteringSun += sky_coefficientsScattering * (stepAirmass.xy * phaseSun ) * stepScatteringVisible * sky_transmittance(position, sunVector*0.5+0.1, jSteps) ;
scatteringMoon += sky_coefficientsScattering * (stepAirmass.xy * phaseMoon) * stepScatteringVisible * sky_transmittance(position, moonVector, jSteps); scatteringMoon += sky_coefficientsScattering * (stepAirmass.xy * phaseMoon) * stepScatteringVisible * sky_transmittance(position, moonVector, jSteps);
// Nice way to fake multiple scattering. // Nice way to fake multiple scattering.
scatteringAmbient += sky_coefficientsScattering * stepAirmass.xy * (stepScatteringVisible * low_sun ); scatteringAmbient += sky_coefficientsScattering * stepAirmass.xy * (stepScatteringVisible * low_sun);
transmittance *= stepTransmittance ; transmittance *= stepTransmittance ;
} }

2
shaders/shaders.properties
View File

@ -5,7 +5,7 @@ underwaterOverlay=false
sun=true sun=true
moon=true moon=true
clouds=off clouds=off
stars=true stars=false
vignette=false vignette=false
dynamicHandLight=true dynamicHandLight=true
program.composite4.enabled=TAA_UPSCALING program.composite4.enabled=TAA_UPSCALING