From 26cfc431a9066a87040272fa0ae016ab88c06b9d Mon Sep 17 00:00:00 2001 From: Merlin1809 <88194861+Merlin1809@users.noreply.github.com> Date: Fri, 10 Apr 2026 16:03:17 +0200 Subject: [PATCH] fix https://github.com/Merlin1809/Eclipse-Shader/issues/152 --- shaders/dimensions/composite3.fsh | 9 +++++++-- shaders/lang/en_us.lang | 2 +- shaders/lang/zh_cn.lang | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/shaders/dimensions/composite3.fsh b/shaders/dimensions/composite3.fsh index b07d5a7..b775aac 100644 --- a/shaders/dimensions/composite3.fsh +++ b/shaders/dimensions/composite3.fsh @@ -262,6 +262,11 @@ vec4 raymarchLPV( #endif #if defined FLASHLIGHT && defined FLASHLIGHT_FOG_ILLUMINATION + + #ifdef IEXT_ENABLED + if (!IEXT_KEY_0) continue; + #endif + // vec3 shiftedViewPos = mat3(gbufferModelView)*(progressW-cameraPosition) + vec3(-0.25, 0.2, 0.0); // vec3 shiftedPlayerPos = mat3(gbufferModelViewInverse) * shiftedViewPos; vec3 shiftedViewPos; @@ -464,7 +469,7 @@ vec4 waterVolumetrics(vec3 rayStart, vec3 rayEnd, float rayLength, vec2 dither, vec3 Indirectlight = _ambient * WaterAbsorbance; - #if defined LPV_VL_FOG_ILLUMINATION && defined IS_LPV_ENABLED && defined LPV_VL_FOG_ILLUMINATION_HANDHELD_WATER + #if defined LPV_VL_FOG_ILLUMINATION && defined IS_LPV_ENABLED && defined LPV_VL_FOG_ILLUMINATION_HANDHELD_WATER && !defined FLASHLIGHT float lightRange = 0.0; vec3 handLightCol = GetHandLight(heldItemId, progressP, lightRange); @@ -694,7 +699,7 @@ vec4 waterVolumetrics_alt( vec3 rayStart, vec3 rayEnd, float estEndDepth, float } #endif - #if defined LPV_VL_FOG_ILLUMINATION && defined IS_LPV_ENABLED && defined LPV_VL_FOG_ILLUMINATION_HANDHELD_WATER + #if defined LPV_VL_FOG_ILLUMINATION && defined IS_LPV_ENABLED && defined LPV_VL_FOG_ILLUMINATION_HANDHELD_WATER && !defined FLASHLIGHT float lightRange = 0.0; vec3 handLightCol = GetHandLight(heldItemId, progressP, lightRange); diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 727023f..081d1d2 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.0.3 + value.SHADER_VERSION_LABEL.482 = 8.0.4 iris_extension.keybind.key0.name=Flashlight diff --git a/shaders/lang/zh_cn.lang b/shaders/lang/zh_cn.lang index 9637109..d239636 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.0.3 + value.SHADER_VERSION_LABEL.482 = 8.0.4 # 如果你是来翻译的,这不是玩笑,这些选项的功能正如其名 profile.POTATO=§4土豆 (极低配置)