Skip to content

Commit

Permalink
2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Godlander committed Jan 2, 2022
1 parent 4d30ff0 commit 1e9af3f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion assets/minecraft/shaders/core/special/lines.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ out vec4 fragColor;
void main() {
vec4 color = vertexColor * ColorModulator;

if(color.a < 0.02) {
if (color.a < 0.02) {
float cycle = sin(GameTime * 3000) * sin(GameTime * 3000);
//color = (int(color.r * 8.0 + GameTime * 200) % 2 == 0 ? vec4(1, 1, 0, 0.9) : vec4(0, 0, 0, 0.9));
color = vec4(0.0, 0.0, 0.0, (cycle + 1) / 4);
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/shaders/core/special/nametag.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ in vec4 glpos;
out vec4 fragColor;

void main() {
if (!isGUI(ProjMat)) discardControlGLPos(gl_FragCoord.xy, glpos);
discardControlGLPos(gl_FragCoord.xy, glpos);
vec4 color = texture(Sampler0, texCoord0) * vertexColor;
if (color.a < 0.1) {
discard;
Expand Down
9 changes: 3 additions & 6 deletions assets/minecraft/shaders/include/light.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,12 @@ vec4 minecraft_sample_lightmap(sampler2D lightMap, ivec2 uv) {
//warmer blocklight (torch AND (NOT sun))
light *= mix(vec4(1.0), vec4(1.7, 1.0, 0.4, 1.0), torch * (1.0-sun));
//shadows colors (NOT (torch OR sun))
vec3 tint = vec3(1.0);
if (map.r == map.g && map.g == map.b) { //bluer shadows in overworld
tint = vec3(0.2, 0.2, 0.9);
light *= mix(vec4(1.0), vec4(0.2, 0.2, 0.9, 1.0), max(1.0 - (torch + sun), 0.0));
} else if (map.r > map.g) { //redder shadows in nether
tint = vec3(0.9, 0.6, 0.5);
light *= mix(vec4(1.0), vec4(0.9, 0.6, 0.5, 1.0), max(1.0 - (torch + sun), 0.0));
} else { //purple shadows in end
tint = vec3(0.8, 0.5, 0.8);
light *= mix(vec4(1.0), vec4(0.8, 0.5, 0.8, 1.0), max(1.0 - (torch + sun), 0.0));
}
light *= mix(vec4(1.0), vec4(tint, 1.0), max(1.0 - (torch + sun), 0.0));

return light;
}
2 changes: 1 addition & 1 deletion assets/minecraft/shaders/program/composite1.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ void main() {
}
}
}

fragColor = outColor;
}
Binary file modified v++.zip
Binary file not shown.

0 comments on commit 1e9af3f

Please sign in to comment.