lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix GLSL shader compilation with certain graphics drivers (fixes #1325) (#1624)

Browse source
This commit is contained in:
Jonas Herzig 2019-09-04 17:39:25 +02:00 committed by Nick Ignoffo
parent cbefc14f72
commit 6587068296
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/resources/assets/bloodmagic/shaders/beam-broken.frag
View file

@ -4,7 +4,7 @@
void main() {
vec2 texcoord = vec2(gl_TexCoord[0]);
vec4 color = texture2D(bgl_RenderedTexture, texcoord);
float r = sin(texcoord.x * 6 - 1.5 + sin(texcoord.y - time / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2;
float r = sin(texcoord.x * 6.0 - 1.5 + sin(texcoord.y - float(time) / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2;
gl_FragColor = vec4(min(1 - r, color.r * gl_Color.r), min(1 - r, color.g * gl_Color.g), color.b * gl_Color.b, color.a * gl_Color.a);
}

4
src/main/resources/assets/bloodmagic/shaders/beam.frag
View file

@ -5,8 +5,8 @@
vec2 texcoord = vec2(gl_TexCoord[0]);
vec4 color = texture2D(bgl_RenderedTexture, texcoord);
float gs = (color.r + color.g + color.b) / 3;
float r = sin(texcoord.x * 6 - 1.5 + sin(texcoord.y - time / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2;
float gs = (color.r + color.g + color.b) / 3.0;
float r = sin(texcoord.x * 6.0 - 1.5 + sin(texcoord.y - float(time) / 3.0)) * 1.1; //(sin((texcoord.x - texcoord.y) * 4 - time) + 1) / 2;
gl_FragColor = vec4(gs, gs, max(gs, r), gl_Color.a);
}