mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-11-14 22:43:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix alpha blending error when using custom channel mix.

Browse Source
This commit is contained in:
Tanasart 2024-10-09 09:09:24 +07:00
parent da3c628ec2
commit 1b10d98962
3 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/_draw_defines/_draw_defines.gml
View File

@ -5,6 +5,7 @@
#region macro #region macro
#macro BLEND_NORMAL gpu_set_blendmode(bm_normal); gpu_set_blendequation(bm_eq_add); #macro BLEND_NORMAL gpu_set_blendmode(bm_normal); gpu_set_blendequation(bm_eq_add);
#macro BLEND_ADD gpu_set_blendmode(bm_add); #macro BLEND_ADD gpu_set_blendmode(bm_add);
#macro BLEND_ADD_ONE gpu_set_blendmode_ext(bm_one, bm_one);
#macro BLEND_OVERRIDE gpu_set_blendmode_ext(bm_one, bm_zero); #macro BLEND_OVERRIDE gpu_set_blendmode_ext(bm_one, bm_zero);
//#macro BLEND_ADD_ALPHA gpu_set_blendmode_ext_sepalpha(bm_one, bm_inv_src_alpha, bm_one, bm_one) //#macro BLEND_ADD_ALPHA gpu_set_blendmode_ext_sepalpha(bm_one, bm_inv_src_alpha, bm_one, bm_one)

30
scripts/mask_function/mask_function.gml
View File

@ -1,4 +1,4 @@
function __init_mask_modifier(_mask_index) { #region function __init_mask_modifier(_mask_index) {
var _ind = array_length(inputs); var _ind = array_length(inputs);
newInput(_ind + 0, nodeValue_Bool("Invert mask", self, false)); newInput(_ind + 0, nodeValue_Bool("Invert mask", self, false));
@ -10,20 +10,20 @@ function __init_mask_modifier(_mask_index) { #region
__mask_mod_index = _ind; __mask_mod_index = _ind;
__mask_invert = false; __mask_invert = false;
__mask_feather = 0; __mask_feather = 0;
} #endregion }
function __step_mask_modifier() { #region function __step_mask_modifier() {
var _msk = is_surface(getSingleValue(__mask_index)); var _msk = is_surface(getSingleValue(__mask_index));
inputs[__mask_mod_index + 0].setVisible(_msk); inputs[__mask_mod_index + 0].setVisible(_msk);
inputs[__mask_mod_index + 1].setVisible(_msk); inputs[__mask_mod_index + 1].setVisible(_msk);
} #endregion }
function __process_mask_modifier(data) { #region function __process_mask_modifier(data) {
__mask_invert = data[__mask_mod_index + 0]; __mask_invert = data[__mask_mod_index + 0];
__mask_feather = data[__mask_mod_index + 1]; __mask_feather = data[__mask_mod_index + 1];
} #endregion }
function mask_modify(mask, invert = false, feather = 0) { #region function mask_modify(mask, invert = false, feather = 0) {
if(!is_surface(mask)) return mask; if(!is_surface(mask)) return mask;
if(!invert && feather == 0) return mask; if(!invert && feather == 0) return mask;
@ -42,9 +42,9 @@ function mask_modify(mask, invert = false, feather = 0) { #region
} }
return __temp_mask; return __temp_mask;
} #endregion }
function mask_apply(original, edited, mask, mix = 1) { #region function mask_apply(original, edited, mask, mix = 1) {
if(!is_surface(mask) && mix == 1) return edited; if(!is_surface(mask) && mix == 1) return edited;
var _f = surface_get_format(edited); var _f = surface_get_format(edited);
@ -69,9 +69,9 @@ function mask_apply(original, edited, mask, mix = 1) { #region
surface_free(edited); surface_free(edited);
return _s; return _s;
} #endregion }
function channel_apply(original, edited, channel) { #region function channel_apply(original, edited, channel) {
if(channel == 0b1111) return edited; if(channel == 0b1111) return edited;
var _f = surface_get_format(edited); var _f = surface_get_format(edited);
@ -79,13 +79,13 @@ function channel_apply(original, edited, channel) { #region
surface_set_target(_s); surface_set_target(_s);
DRAW_CLEAR DRAW_CLEAR
BLEND_ADD BLEND_ADD_ONE
gpu_set_colorwriteenable(!(channel & 0b0001), !(channel & 0b0010), !(channel & 0b0100), !(channel & 0b1000)); gpu_set_colorwriteenable(!(channel & 0b0001), !(channel & 0b0010), !(channel & 0b0100), !(channel & 0b1000));
draw_surface_safe(original); draw_surface(original, 0, 0);
gpu_set_colorwriteenable(channel & 0b0001, channel & 0b0010, channel & 0b0100, channel & 0b1000); gpu_set_colorwriteenable(channel & 0b0001, channel & 0b0010, channel & 0b0100, channel & 0b1000);
draw_surface_safe(edited); draw_surface(edited, 0, 0);
gpu_set_colorwriteenable(1, 1, 1, 1); gpu_set_colorwriteenable(1, 1, 1, 1);
BLEND_NORMAL BLEND_NORMAL
@ -93,4 +93,4 @@ function channel_apply(original, edited, channel) { #region
surface_free(edited); surface_free(edited);
return _s; return _s;
} #endregion }

24
shaders/sh_convolution/sh_convolution.fsh
View File

@ -14,23 +14,16 @@ vec4 sampleTexture(vec2 pos) {
if(pos.x >= 0. && pos.y >= 0. && pos.x <= 1. && pos.y <= 1.) if(pos.x >= 0. && pos.y >= 0. && pos.x <= 1. && pos.y <= 1.)
return texture2D(gm_BaseTexture, pos); return texture2D(gm_BaseTexture, pos);
if(sampleMode == 0) if(sampleMode == 0) return vec4(0.);
return vec4(0.); else if(sampleMode == 1) return texture2D(gm_BaseTexture, clamp(pos, 0., 1.));
else if(sampleMode == 2) return texture2D(gm_BaseTexture, fract(pos));
else if(sampleMode == 1) else if(sampleMode == 3) return vec4(vec3(0.), 1.);
return texture2D(gm_BaseTexture, clamp(pos, 0., 1.));
else if(sampleMode == 2)
return texture2D(gm_BaseTexture, fract(pos));
else if(sampleMode == 3)
return vec4(vec3(0.), 1.);
return vec4(0.); return vec4(0.);
} }
void main() { void main() {
vec2 tex = 1. / dimension; vec2 tx = 1. / dimension;
float sum = 1.; float sum = 1.;
if(normalized == 1) { if(normalized == 1) {
@ -47,9 +40,12 @@ void main() {
for(int i = 0; i < size; i++) for(int i = 0; i < size; i++)
for(int j = 0; j < size; j++) { for(int j = 0; j < size; j++) {
int index = i * size + j; int index = i * size + j;
vec2 px = v_vTexcoord + vec2((float(j) + st) * tex.x, (float(i) + st) * tex.y); vec2 px = v_vTexcoord + vec2((float(j) + st) * tx.x, (float(i) + st) * tx.y);
c += kernel[index] * sampleTexture(px) / sum; float w = kernel[index];
if(w == 0.) continue;
c += w * sampleTexture(px) / sum;
} }
gl_FragColor = c; gl_FragColor = c;