omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move brush opacity from comp to stroke

Browse Source
This commit is contained in:
omigamedev
2019-02-24 20:55:06 +01:00
parent dfa44dbb55
commit 399bc3d433
9 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/shaders/comp-draw.glsl
View File

@@ -23,7 +23,6 @@ uniform sampler2D tex;
uniform sampler2D tex_stroke;
uniform sampler2D tex_mask;
uniform mediump float alpha;
uniform mediump float stroke_alpha;
uniform int blend_mode;
uniform mediump vec2 resolution;
uniform bool lock;
@@ -81,7 +80,7 @@ void main()
stroke.a = blend_stroke(stroke.a, dual.a, dual_alpha, dual_blend_mode);
}
stroke.a = mask ? stroke.a * stroke_alpha * blur(tex_mask, uv).r : stroke.a * stroke_alpha;
stroke.a = mask ? stroke.a * blur(tex_mask, uv).r : stroke.a;
if (!lock && base.a == 0.0)
{
frag = stroke * vec4(1.0, 1.0, 1.0, alpha);