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

restore use fragcoord to fix import/transform

Browse Source
This commit is contained in:
omigamedev
2019-02-26 00:30:10 +01:00
parent d3768f43c9
commit cbfcd66bfc
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ uniform int blend_mode;
uniform mediump vec2 resolution;
uniform bool lock;
uniform bool mask;
uniform bool draw_on_screen;
uniform bool use_fragcoord;
uniform bool use_dual;
uniform sampler2D tex_dual;
@@ -49,7 +49,8 @@ out mediump vec4 frag;
void main()
{
mediump vec4 base = texture(tex, uv);
mediump vec2 uv_base = use_fragcoord ? gl_FragCoord.st / resolution : uv;
mediump vec4 base = texture(tex, uv_base);
mediump vec4 stroke = texture(tex_stroke, uv);
if (stroke.a == 0.0)
@@ -60,7 +61,6 @@ void main()
if (use_pattern)
{
//mediump vec2 uv2 = draw_on_screen ? gl_FragCoord.st / resolution : uv;
mediump vec2 rscale = resolution / vec2(512.0);
mediump float patt = texture(tex_pattern, uv * (1.0 / pattern_scale) * rscale + pattern_offset).r;
if (pattern_invert)