diff --git a/shaders/dimensions/all_translucent.fsh b/shaders/dimensions/all_translucent.fsh index 6eb3ebb..0c8697a 100644 --- a/shaders/dimensions/all_translucent.fsh +++ b/shaders/dimensions/all_translucent.fsh @@ -21,7 +21,11 @@ in DATA { vec4 lmtexcoord; - vec4 color; + #ifdef LIGHTNING + vec4 color; + #else + vec3 color; + #endif vec3 viewVector; @@ -635,9 +639,14 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 ) #ifndef COLORWHEEL #ifdef IRIS_FEATURE_TEXTURE_FILTERING gl_FragData[0] = textureFilteringMode == 1 ? sampleRGSS(gtexture, lmtexcoord.xy, 1.0 / vec2(textureSize(gtexture, 0))) : sampleNearest(gtexture, lmtexcoord.xy, 1.0 / vec2(textureSize(gtexture, 0))); - gl_FragData[0] *= color; #else - gl_FragData[0] = texture(gtexture, lmtexcoord.xy, mipmapBias) * color; + gl_FragData[0] = texture(gtexture, lmtexcoord.xy, mipmapBias); + #endif + + gl_FragData[0].rgb *= color.rgb; + + #ifdef LIGHTNING + gl_FragData[0].a *= color.a; #endif #else vec4 _color = texture(gtexture, lmtexcoord.xy, mipmapBias); @@ -1157,6 +1166,8 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 ) } #endif + if(gl_FragData[0].a == 0.0) discard; + gl_FragData[1] = vec4(Albedo, MATERIALS); #if DEBUG_VIEW == debug_DH_WATER_BLENDING diff --git a/shaders/dimensions/all_translucent.vsh b/shaders/dimensions/all_translucent.vsh index 2723635..7ddf3b1 100644 --- a/shaders/dimensions/all_translucent.vsh +++ b/shaders/dimensions/all_translucent.vsh @@ -24,7 +24,11 @@ Read the terms of modification and sharing before changing something below pleas out DATA { vec4 lmtexcoord; - vec4 color; + #ifdef LIGHTNING + vec4 color; + #else + vec3 color; + #endif vec3 viewVector; @@ -134,7 +138,7 @@ void main() { gl_Position = ftransform(); - color = vec4(gl_Color.rgb, 1.0); + color.rgb = gl_Color.rgb; #ifdef LIGHTNING color.a = gl_Color.a; #endif diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 445ebb3..727023f 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.2 + value.SHADER_VERSION_LABEL.482 = 8.0.3 iris_extension.keybind.key0.name=Flashlight diff --git a/shaders/lang/zh_cn.lang b/shaders/lang/zh_cn.lang index 6bae15e..9637109 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.2 + value.SHADER_VERSION_LABEL.482 = 8.0.3 # 如果你是来翻译的,这不是玩笑,这些选项的功能正如其名 profile.POTATO=§4土豆 (极低配置)