mirror of
https://github.com/Merlin1809/Eclipse-Shader.git
synced 2026-10-10 04:53:07 +08:00
Small bugfixes
This commit is contained in:
Merlin1809
@@ -6,7 +6,7 @@ block.8=minecraft:water minecraft:flowing_water tfc:flowing_spring_water tfc:spr
|
||||
|
||||
block.11=bamboo bamboo_sapling
|
||||
|
||||
block.12=minecraft:short_grass minecraft:grass \
|
||||
block.12=minecraft:short_grass minecraft:grass minecraft:bush minecraft:firefly_bush minecraft:cactus_flower \
|
||||
biomesoplenty:dead_grass biomesoplenty:tundra_shrub
|
||||
|
||||
block.13=minecraft:small_dripleaf:half=lower minecraft:pitcher_plant:half=lower minecraft:tall_grass:half=lower minecraft:sunflower:half=lower minecraft:large_fern:half=lower minecraft:peony:half=lower minecraft:rose_bush:half=lower minecraft:lilac:half=lower minecraft:tall_seagrass:half=lower \
|
||||
@@ -78,7 +78,7 @@ block.53=bell \
|
||||
|
||||
## ground waving
|
||||
## add a newline to organize for modded blocks
|
||||
block.54=minecraft:melon_stem minecraft:pumpkin_stem minecraft:flowering_azalea minecraft:azalea minecraft:big_dripleaf minecraft:torchflower minecraft:torchflower_crop minecraft:pitcher_crop:half=upper minecraft:warped_fungus minecraft:twisting_vines minecraft:pink_petals minecraft:kelp minecraft:beetroots minecraft:potatoes minecraft:carrots minecraft:wheat minecraft:nether_wart minecraft:crimson_roots minecraft:nether_sprouts minecraft:warped_roots minecraft:seagrass minecraft:wither_rose minecraft:lily_of_the_valley minecraft:cornflower minecraft:sweet_berry_bush minecraft:oxeye_daisy minecraft:pink_tulip minecraft:white_tulip minecraft:orange_tulip minecraft:red_tulip minecraft:azure_bluet minecraft:allium minecraft:blue_orchid minecraft:poppy minecraft:dandelion minecraft:dead_bush minecraft:lily_pad \
|
||||
block.54=minecraft:melon_stem minecraft:pumpkin_stem minecraft:flowering_azalea minecraft:azalea minecraft:big_dripleaf minecraft:torchflower minecraft:torchflower_crop minecraft:pitcher_crop:half=upper minecraft:warped_fungus minecraft:twisting_vines minecraft:kelp minecraft:beetroots minecraft:potatoes minecraft:carrots minecraft:wheat minecraft:nether_wart minecraft:crimson_roots minecraft:nether_sprouts minecraft:warped_roots minecraft:seagrass minecraft:wither_rose minecraft:lily_of_the_valley minecraft:cornflower minecraft:sweet_berry_bush minecraft:oxeye_daisy minecraft:pink_tulip minecraft:white_tulip minecraft:orange_tulip minecraft:red_tulip minecraft:azure_bluet minecraft:allium minecraft:blue_orchid minecraft:poppy minecraft:dandelion minecraft:dead_bush minecraft:lily_pad \
|
||||
biomesoplenty:rose biomesoplenty:violet biomesoplenty:lavender biomesoplenty:white_lavender biomesoplenty:desert_grass biomesoplenty:dead_grass biomesoplenty:orange_cosmos biomesoplenty:pink_daffodil biomesoplenty:pink_hibiscus biomesoplenty:glowflower biomesoplenty:wilted_lily biomesoplenty:burning_blossom biomesoplenty:blue_hydrangea_bottom biomesoplenty:blue_hydrangea_top biomesoplenty:goldenrod_bottom biomesoplenty:goldenrod_top biomesoplenty:waterlily biomesoplenty:huge_lily_pad biomesoplenty:high_grass biomesoplenty:huge_clover_petal biomesoplenty:sprout biomesoplenty:hair biomesoplenty:dune_grass \
|
||||
farmersdelight:tomatoes farmersdelight:onions farmersdelight:budding_tomatoes farmersdelight:cabbages farmersdelight:sandy_shrub farmersdelight:wild_cabbages farmersdelight:wild_onions farmersdelight:wild_tomatoes farmersdelight:wild_carrots farmersdelight:wild_potatoes farmersdelight:wild_beetroots \
|
||||
herbalbrews:wild_coffee_plant herbalbrews:wild_yerba_mate_plant herbalbrews:wild_rooibos_plant herbalbrews:hibiscus herbalbrews:lavender herbalbrews:coffee_plant herbalbrews:yerba_mate_plant herbalbrews:rooibos_plant \
|
||||
|
||||
@@ -465,7 +465,7 @@ void main() {
|
||||
#endif
|
||||
|
||||
#ifdef END_SHADER
|
||||
Indirect_lighting = vec3(0.3,0.6,1.0) * 0.1;
|
||||
Indirect_lighting = vec3(0.3,0.36,1.0) * 0.1;
|
||||
#endif
|
||||
|
||||
///////////////////////// BLOCKLIGHT LIGHTING OR LPV LIGHTING OR FLOODFILL COLORED LIGHTING
|
||||
|
||||
@@ -288,6 +288,8 @@ uniform float dhFarPlane;
|
||||
|
||||
#ifdef RIPPLE_WATER
|
||||
#include "/lib/ripples.glsl"
|
||||
|
||||
uniform int biome_precipitation;
|
||||
#endif
|
||||
|
||||
// #undef BASIC_SHADOW_FILTER
|
||||
@@ -552,7 +554,7 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 )
|
||||
waterPos.xyz = getParallaxDisplacement(waterPos, playerPos);
|
||||
|
||||
#ifdef RIPPLE_WATER
|
||||
if(viewDist < 35 && rainStrength > 0.0 && abs(worldSpaceNormal.z) < 0.95 && abs(worldSpaceNormal.x) < 0.95) {
|
||||
if(viewDist < 35 && rainStrength > 0.0 && biome_precipitation == 1 && abs(worldSpaceNormal.z) < 0.95 && abs(worldSpaceNormal.x) < 0.95) {
|
||||
float effectStrength = smoothstep(0.85, 1.0, lightmap.y);
|
||||
rippleBump = ripples(feetPlayerPos.xz+cameraPosition.xz);
|
||||
waterPos.xyz += RIPPLE_STRENGTH * rippleBump * rainStrength * effectStrength * smoothstep(35, 10, viewDist);
|
||||
@@ -691,7 +693,7 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 )
|
||||
|
||||
Direct_lighting += lightColors * endPhase * end_NdotL * fogShadow;
|
||||
|
||||
vec3 AmbientLightColor = vec3(0.3,0.6,1.0) ;
|
||||
vec3 AmbientLightColor = vec3(0.3,0.36,1.0) ;
|
||||
|
||||
Indirect_lighting = AmbientLightColor + 0.7 * AmbientLightColor * dot(worldSpaceNormal, normalize(feetPlayerPos));
|
||||
Indirect_lighting *= 0.1;
|
||||
|
||||
@@ -43,6 +43,8 @@ uniform float rainStrength;
|
||||
|
||||
#if defined RIPPLE_PUDDLES && defined Puddles
|
||||
#include "/lib/ripples.glsl"
|
||||
|
||||
uniform int biome_precipitation;
|
||||
#endif
|
||||
|
||||
#include "/lib/stars.glsl"
|
||||
@@ -738,7 +740,7 @@ uniform float wetness;
|
||||
float viewDist = length(worldPos - cameraPosition);
|
||||
vec3 rippleNormal = flatNormals;
|
||||
|
||||
if(viewDist < 35 && rainStrength > 0.0) {
|
||||
if(viewDist < 35 && rainStrength > 0.0 && biome_precipitation == 1) {
|
||||
vec3 ripple = ripples(1.2 * worldPos.xz);
|
||||
|
||||
ripple = ripple.xzy;
|
||||
|
||||
@@ -22,6 +22,7 @@ uniform sampler2D colortex0;
|
||||
uniform sampler2D colortex1;
|
||||
uniform sampler2D colortex2;
|
||||
uniform sampler2D colortex3;
|
||||
uniform sampler2D colortex4;
|
||||
uniform sampler2D colortex5;
|
||||
uniform sampler2D colortex6;
|
||||
uniform sampler2D colortex7;
|
||||
@@ -92,8 +93,6 @@ uniform float caveDetection;
|
||||
|
||||
#define LIGHTNINGONLY;
|
||||
#include "/lib/volumetricClouds.glsl"
|
||||
#else
|
||||
uniform sampler2D colortex4;
|
||||
#endif
|
||||
|
||||
#include "/lib/waterBump.glsl"
|
||||
@@ -593,7 +592,7 @@ void main() {
|
||||
|
||||
bool isLightning = false;
|
||||
|
||||
#if defined OVERWORLD_SHADER && defined CUMULONIMBUS_LIGHTNING && defined CUMULONIMBUS
|
||||
#if defined OVERWORLD_SHADER && defined CUMULONIMBUS_LIGHTNING && defined CUMULONIMBUS && defined VOLUMETRIC_CLOUDS
|
||||
|
||||
vec2 cloudDepth = imageLoad(cloudDepthTex, ivec2(gl_FragCoord.xy*VL_RENDER_RESOLUTION*RENDER_SCALE)).rg;
|
||||
|
||||
|
||||
@@ -170,7 +170,7 @@ const float entityShadowDistanceMul = 0.25; // [0.01 0.02 0.03 0.04 0.05 0.10 0.
|
||||
#define Night_Uniform_Fog 0.2 // [0.0 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0]
|
||||
#define Night_Cloudy_Fog 0.05 // [0.0 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0]
|
||||
|
||||
#define Haze_amount 0.3 // [0.0 0.05 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1.0 1.25 1.5 1.75 2.0 3.0 4.0 5.0]
|
||||
#define Haze_amount 0.85 // [0.0 0.05 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1.0 1.25 1.5 1.75 2.0 3.0 4.0 5.0]
|
||||
#define fog_coefficientRayleighR 5.8 // [0.0 0.5 1.0 1.5 2.0 2.5 3.0 3.5 4.0 4.5 5.0 5.5 6.0 6.5 7.0 7.5 8.0 8.5 9.0 9.5 10.0]
|
||||
#define fog_coefficientRayleighG 1.35 // [0.0 0.5 1.0 1.5 2.0 2.5 3.0 3.5 4.0 4.5 5.0 5.5 6.0 6.5 7.0 7.5 8.0 8.5 9.0 9.5 10.0]
|
||||
#define fog_coefficientRayleighB 3.31 // [0.0 0.5 1.0 1.5 2.0 2.5 3.0 3.5 4.0 4.5 5.0 5.5 6.0 6.5 7.0 7.5 8.0 8.5 9.0 9.5 10.0]
|
||||
|
||||
@@ -15,7 +15,7 @@ block.8=minecraft:water minecraft:flowing_water
|
||||
block.11=bamboo bamboo_sapling
|
||||
|
||||
#= BLOCK_GRASS_SHORT
|
||||
block.*=minecraft:short_grass minecraft:grass
|
||||
block.*=minecraft:short_grass minecraft:grass minecraft:bush minecraft:firefly_bush minecraft:cactus_flower
|
||||
\ biomesoplenty:dead_grass biomesoplenty:tundra_shrub
|
||||
|
||||
#$
|
||||
@@ -108,7 +108,7 @@ block.*=bell \
|
||||
#= BLOCK_GROUND_WAVING
|
||||
## ground waving
|
||||
## add a newline to organize for modded blocks
|
||||
block.*=minecraft:melon_stem minecraft:pumpkin_stem minecraft:flowering_azalea minecraft:azalea minecraft:big_dripleaf minecraft:torchflower minecraft:torchflower_crop minecraft:pitcher_crop:half=upper minecraft:warped_fungus minecraft:twisting_vines minecraft:pink_petals minecraft:kelp minecraft:beetroots minecraft:potatoes minecraft:carrots minecraft:wheat minecraft:nether_wart minecraft:crimson_roots minecraft:nether_sprouts minecraft:warped_roots minecraft:seagrass minecraft:wither_rose minecraft:lily_of_the_valley minecraft:cornflower minecraft:sweet_berry_bush minecraft:oxeye_daisy minecraft:pink_tulip minecraft:white_tulip minecraft:orange_tulip minecraft:red_tulip minecraft:azure_bluet minecraft:allium minecraft:blue_orchid minecraft:poppy minecraft:dandelion minecraft:dead_bush minecraft:lily_pad \
|
||||
block.*=minecraft:melon_stem minecraft:pumpkin_stem minecraft:flowering_azalea minecraft:azalea minecraft:big_dripleaf minecraft:torchflower minecraft:torchflower_crop minecraft:pitcher_crop:half=upper minecraft:warped_fungus minecraft:twisting_vines minecraft:kelp minecraft:beetroots minecraft:potatoes minecraft:carrots minecraft:wheat minecraft:nether_wart minecraft:crimson_roots minecraft:nether_sprouts minecraft:warped_roots minecraft:seagrass minecraft:wither_rose minecraft:lily_of_the_valley minecraft:cornflower minecraft:sweet_berry_bush minecraft:oxeye_daisy minecraft:pink_tulip minecraft:white_tulip minecraft:orange_tulip minecraft:red_tulip minecraft:azure_bluet minecraft:allium minecraft:blue_orchid minecraft:poppy minecraft:dandelion minecraft:dead_bush minecraft:lily_pad \
|
||||
biomesoplenty:rose biomesoplenty:violet biomesoplenty:lavender biomesoplenty:white_lavender biomesoplenty:desert_grass biomesoplenty:dead_grass biomesoplenty:orange_cosmos biomesoplenty:pink_daffodil biomesoplenty:pink_hibiscus biomesoplenty:glowflower biomesoplenty:wilted_lily biomesoplenty:burning_blossom biomesoplenty:blue_hydrangea_bottom biomesoplenty:blue_hydrangea_top biomesoplenty:goldenrod_bottom biomesoplenty:goldenrod_top biomesoplenty:waterlily biomesoplenty:huge_lily_pad biomesoplenty:high_grass biomesoplenty:huge_clover_petal biomesoplenty:sprout biomesoplenty:hair biomesoplenty:dune_grass \
|
||||
farmersdelight:sandy_shrub farmersdelight:wild_cabbages farmersdelight:wild_onions farmersdelight:wild_tomatoes farmersdelight:wild_carrots farmersdelight:wild_potatoes farmersdelight:wild_beetroots \
|
||||
herbalbrews:wild_coffee_plant herbalbrews:wild_yerba_mate_plant herbalbrews:wild_rooibos_plant herbalbrews:hibiscus herbalbrews:lavender herbalbrews:coffee_plant herbalbrews:yerba_mate_plant herbalbrews:rooibos_plant \
|
||||
|
||||
Reference in New Issue
Block a user