From 69530b76c3d85a40a7f7d183c3df6c7b879aa8e6 Mon Sep 17 00:00:00 2001 From: Merlin1809 <88194861+Merlin1809@users.noreply.github.com> Date: Sat, 30 May 2026 14:48:29 +0200 Subject: [PATCH] Fix some small things --- shaders/dimensions/all_particles.fsh | 2 +- shaders/dimensions/all_solid.gsh | 22 +++++++++++----------- shaders/dimensions/composite2.fsh | 1 - shaders/dimensions/composite2.vsh | 17 +++++++---------- shaders/lang/en_us.lang | 2 +- shaders/lang/zh_cn.lang | 2 +- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/shaders/dimensions/all_particles.fsh b/shaders/dimensions/all_particles.fsh index e27198f..7246c4a 100644 --- a/shaders/dimensions/all_particles.fsh +++ b/shaders/dimensions/all_particles.fsh @@ -690,7 +690,7 @@ void main() { vec4 specularData = vec4(0.0); #endif - vec4 otherData = clamp(vec4(normal*0.5+0.5, 1.0),0.0,1.0); + vec4 otherData = clamp(vec4(normal*0.5+0.5, 0.0),0.0,1.0); OutSpecular = vec4( encodeVec2(specularData.x, otherData.x), diff --git a/shaders/dimensions/all_solid.gsh b/shaders/dimensions/all_solid.gsh index eb8c4e5..1bf7d3b 100644 --- a/shaders/dimensions/all_solid.gsh +++ b/shaders/dimensions/all_solid.gsh @@ -248,14 +248,14 @@ void main() { #if GRASS_QUALITY == 2 int triangle_count = 7; float heightMult = 1.1; - if(vertexDist > 2.5) {triangle_count = 5; heightMult = 1.5;} - if(vertexDist > 5.5) {triangle_count = 3; heightMult = 2.25;} if(vertexDist > 15.0) {triangle_count = 1; heightMult = 5.0;} + else if(vertexDist > 5.5) {triangle_count = 3; heightMult = 2.25;} + else if(vertexDist > 2.5) {triangle_count = 5; heightMult = 1.5;} #elif GRASS_QUALITY == 1 int triangle_count = 5; float heightMult = 1.5; - if(vertexDist > 7.5) {triangle_count = 3; heightMult = 2.25;} if(vertexDist > 15.0) {triangle_count = 1; heightMult = 5.0;} + else if(vertexDist > 7.5) {triangle_count = 3; heightMult = 2.25;} #else int triangle_count = 3; float heightMult = 2.25; @@ -263,15 +263,15 @@ void main() { #endif - float eastHeightMult = pow(clamp(abs(data_in[0].grassSideCheck.x) * abs(vertex.x-(data_in[0].centerPosition.x-0.5)), 0.0, 1.0), 2.0); - float westHeightMult = pow(clamp(abs(data_in[0].grassSideCheck.y) * abs(vertex.x-(data_in[0].centerPosition.x+0.5)), 0.0, 1.0), 2.0); - float southHeightMult = pow(clamp(abs(data_in[0].grassSideCheck.z) * abs(vertex.z-(data_in[0].centerPosition.z-0.5)), 0.0, 1.0), 2.0); - float northHeightMult = pow(clamp(abs(data_in[0].grassSideCheck.w) * abs(vertex.z-(data_in[0].centerPosition.z+0.5)), 0.0, 1.0), 2.0); + float eastHeightMult = clamp(abs(data_in[0].grassSideCheck.x) * abs(vertex.x-(data_in[0].centerPosition.x-0.5)), 0.0, 1.0); + float westHeightMult = clamp(abs(data_in[0].grassSideCheck.y) * abs(vertex.x-(data_in[0].centerPosition.x+0.5)), 0.0, 1.0); + float southHeightMult = clamp(abs(data_in[0].grassSideCheck.z) * abs(vertex.z-(data_in[0].centerPosition.z-0.5)), 0.0, 1.0); + float northHeightMult = clamp(abs(data_in[0].grassSideCheck.w) * abs(vertex.z-(data_in[0].centerPosition.z+0.5)), 0.0, 1.0); - eastHeightMult *= normalize(data_in[0].grassSideCheck.x); - westHeightMult *= normalize(data_in[0].grassSideCheck.y); - southHeightMult *= normalize(data_in[0].grassSideCheck.z); - northHeightMult *= normalize(data_in[0].grassSideCheck.w); + eastHeightMult *= eastHeightMult*normalize(data_in[0].grassSideCheck.x); + westHeightMult *= westHeightMult*normalize(data_in[0].grassSideCheck.y); + southHeightMult *= southHeightMult*normalize(data_in[0].grassSideCheck.z); + northHeightMult *= northHeightMult*normalize(data_in[0].grassSideCheck.w); float totalHeightMult = 0.5*clamp(eastHeightMult + westHeightMult + southHeightMult + northHeightMult, -1.0*BASE_GRASS_HEIGHT*BASE_GRASS_HEIGHT, 1.0*SHORT_GRASS_HEIGHT) + 1.0*BASE_GRASS_HEIGHT; heightMult *= totalHeightMult; diff --git a/shaders/dimensions/composite2.fsh b/shaders/dimensions/composite2.fsh index c530c3b..85d5653 100644 --- a/shaders/dimensions/composite2.fsh +++ b/shaders/dimensions/composite2.fsh @@ -5,7 +5,6 @@ #ifdef OVERWORLD_SHADER in DATA { flat vec3 WsunVec; - flat vec3 WmoonVec; }; #endif diff --git a/shaders/dimensions/composite2.vsh b/shaders/dimensions/composite2.vsh index b6a5f05..16a3b81 100644 --- a/shaders/dimensions/composite2.vsh +++ b/shaders/dimensions/composite2.vsh @@ -10,7 +10,6 @@ #ifdef OVERWORLD_SHADER out DATA { flat vec3 WsunVec; - flat vec3 WmoonVec; }; #endif @@ -41,17 +40,15 @@ void main() { WsunVec = normalize(mat3(gbufferModelViewInverse) * sunPosition); #endif - #if AURORA_LOCATION > 0 - #ifdef CUSTOM_MOON_ROTATION - WmoonVec = customMoonVecSSBO; + #ifdef CUSTOM_MOON_ROTATION + vec3 WmoonVec = customMoonVecSSBO; + #else + #ifdef SMOOTH_MOON_ROTATION + vec3 WmoonVec = WmoonVecSmooth; #else - #ifdef SMOOTH_MOON_ROTATION - WmoonVec = WmoonVecSmooth; - #else - WmoonVec = normalize(mat3(gbufferModelViewInverse) * moonPosition); - #endif - if(dot(-WmoonVec, WsunVec) < 0.9999) WmoonVec = -WmoonVec; + vec3 WmoonVec = normalize(mat3(gbufferModelViewInverse) * moonPosition); #endif + if(dot(-WmoonVec, WsunVec) < 0.9999) WmoonVec = -WmoonVec; #endif WsunVec = mix(WmoonVec, WsunVec, clamp(float(sunElevation > 1e-5)*2.0 - 1.0,0,1)); diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 090ba76..3956c8f 100644 --- a/shaders/lang/en_us.lang +++ b/shaders/lang/en_us.lang @@ -1,6 +1,6 @@ option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - A Bliss Edit prefix.SHADER_VERSION_LABEL = V - value.SHADER_VERSION_LABEL.482 = 8.2.2 + value.SHADER_VERSION_LABEL.482 = 8.2.3 iris_extension.keybind.key0.name=Flashlight diff --git a/shaders/lang/zh_cn.lang b/shaders/lang/zh_cn.lang index 7aab69d..2d889e6 100644 --- a/shaders/lang/zh_cn.lang +++ b/shaders/lang/zh_cn.lang @@ -1,6 +1,6 @@ option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - Bliss 编辑版 prefix.SHADER_VERSION_LABEL = 版本 - value.SHADER_VERSION_LABEL.482 = 8.2.2 + value.SHADER_VERSION_LABEL.482 = 8.2.3 # 如果你是来翻译的，这不是玩笑，这些选项的功能正如其名 profile.POTATO=§4土豆 (极低配置)