mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-09-10 12:02:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Substract -> Subtract in Sprite pattern shader

Browse source 
I blame all of the typos leading me to believe
Ancurio was actually using Substract.
This commit is contained in:
Struma 2022-01-17 01:25:44 -05:00
parent b5cfe11f60
commit e51f808b61
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
shader/sprite.frag
View file

@ -49,18 +49,19 @@ vec3 blendAdd(vec3 base, vec3 blend, float opacity) {
return (blendAdd(base, blend) * opacity + base * (1.0 - opacity));
}
// Substract
float blendSubstract(float base, float blend) {
// Subtract
float blendSubtract(float base, float blend) {
return max(base+blend-1.0,0.0);
}
vec3 blendSubstract(vec3 base, vec3 blend) {
vec3 blendSubtract(vec3 base, vec3 blend) {
return max(base+blend-vec3(1.0),vec3(0.0));
}
vec3 blendSubstract(vec3 base, vec3 blend, float opacity) {
return (blendSubstract(base, blend) * opacity + blend * (1.0 - opacity));
vec3 blendSubtract(vec3 base, vec3 blend, float opacity) {
return (blendSubtract(base, blend) * opacity + base * (1.0 - opacity));
}
// = = = = = = = = = = =
void main()
@ -72,10 +73,10 @@ void main()
if (renderPattern) {
vec4 pattfrag = texture2D(pattern, mod(v_patCoord, repeat));
if (patternBlendType == 1) {
frag.rgb = frag.rgb = blendAdd(frag.rgb, pattfrag.rgb, pattfrag.a * patternOpacity);
frag.rgb = blendAdd(frag.rgb, pattfrag.rgb, pattfrag.a * patternOpacity);
}
else if (patternBlendType == 2) {
frag.rgb = blendSubstract(frag.rgb, pattfrag.rgb, pattfrag.a * patternOpacity);
frag.rgb = blendSubtract(frag.rgb, pattfrag.rgb, pattfrag.a * patternOpacity);
}
else {
frag.rgb = blendNormal(frag.rgb, pattfrag.rgb, pattfrag.a * patternOpacity);