Backups/Eclipse-Shader
1
0
Fork 0
mirror of https://github.com/Merlin1809/Eclipse-Shader.git synced 2026-10-10 04:53:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some small things

Browse Source
This commit is contained in:
Merlin1809
2026-05-30 14:48:29 +02:00
parent 79e933e71a
commit 69530b76c3
6 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shaders/dimensions/all_particles.fsh
+1 -1
View File
@@ -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),
shaders/dimensions/all_solid.gsh
+11 -11
View File
@@ -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;
shaders/dimensions/composite2.fsh
-1
View File
@@ -5,7 +5,6 @@
#ifdef OVERWORLD_SHADER
in DATA {
flat vec3 WsunVec;
flat vec3 WmoonVec;
};
#endif
shaders/dimensions/composite2.vsh
+3 -6
View File
@@ -10,7 +10,6 @@
#ifdef OVERWORLD_SHADER
out DATA {
flat vec3 WsunVec;
flat vec3 WmoonVec;
};
#endif
@@ -41,18 +40,16 @@ void main() {
WsunVec = normalize(mat3(gbufferModelViewInverse) * sunPosition);
#endif
#if AURORA_LOCATION > 0
#ifdef CUSTOM_MOON_ROTATION
WmoonVec = customMoonVecSSBO;
vec3 WmoonVec = customMoonVecSSBO;
#else
#ifdef SMOOTH_MOON_ROTATION
WmoonVec = WmoonVecSmooth;
vec3 WmoonVec = WmoonVecSmooth;
#else
WmoonVec = normalize(mat3(gbufferModelViewInverse) * moonPosition);
vec3 WmoonVec = normalize(mat3(gbufferModelViewInverse) * moonPosition);
#endif
if(dot(-WmoonVec, WsunVec) < 0.9999) WmoonVec = -WmoonVec;
#endif
#endif
WsunVec = mix(WmoonVec, WsunVec, clamp(float(sunElevation > 1e-5)*2.0 - 1.0,0,1));
#endif
shaders/lang/en_us.lang
+1 -1
View File
@@ -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
shaders/lang/zh_cn.lang
+1 -1
View File
@@ -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土豆 (极低配置)