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

brush panel folding

Browse Source
This commit is contained in:
omigamedev
2019-02-19 23:29:07 +01:00
parent ccd23cd662
commit 7954e4d900
10 changed files with 101 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app_shaders.cpp
View File

@@ -247,6 +247,7 @@ void App::initShaders()
"uniform mediump vec2 pattern_scale;\n"
"uniform mediump float pattern_bright;\n"
"uniform mediump float pattern_contr;\n"
"uniform mediump float dual_alpha;\n"
"uniform bool lock;\n"
"uniform bool mask;\n"
"uniform bool fragUV2;\n"
@@ -273,7 +274,7 @@ void App::initShaders()
" if (use_dual){\n"
" mediump vec4 dual = texture(tex_dual, uv);\n"
//" stroke.a = stroke.a * dual.a;\n"
" stroke.a = blend_stroke(stroke.a, dual.a, dual_blend_mode);\n"
" stroke.a = blend_stroke(stroke.a, dual.a * dual_alpha, dual_blend_mode);\n"
" }\n"
" stroke.a = mask ? stroke.a * stroke_alpha * blur(tex_mask, uv2).r : stroke.a * stroke_alpha;\n"
" if (!lock && base.a == 0.0) { frag = stroke * vec4(1.0, 1.0, 1.0, alpha); return; }\n"