diff --git a/src/app_shaders.cpp b/src/app_shaders.cpp index c50d281..0d8c98f 100644 --- a/src/app_shaders.cpp +++ b/src/app_shaders.cpp @@ -242,7 +242,6 @@ void App::initShaders() "uniform mediump vec2 resolution;\n" "uniform bool lock;\n" "uniform bool mask;\n" - "uniform bool fragUV2;\n" "uniform bool use_dual;\n" "uniform sampler2D tex_dual;\n" @@ -264,12 +263,11 @@ void App::initShaders() SHADER_FUNCTION_BLEND_STROKE SHADER_FUNCTION_COLOR "void main() {\n" - " mediump vec2 uv2 = fragUV2 ? (gl_FragCoord.st / resolution) : uv;\n" - " mediump vec4 base = texture(tex, uv2);\n" + " mediump vec4 base = texture(tex, uv);\n" " mediump vec4 stroke = texture(tex_stroke, uv);\n" " if (use_pattern){\n" " mediump vec2 rscale = resolution / vec2(512.0);\n" - " mediump float patt = texture(tex_pattern, uv2 * (0.5 / pattern_scale) * rscale + pattern_offset).r;\n" + " mediump float patt = texture(tex_pattern, uv * (0.5 / pattern_scale) * rscale + pattern_offset).r;\n" " if (pattern_bright != 0.5)\n" " patt = brightness1(patt, 1.0 - pattern_bright);\n" " if (pattern_contr != 0.5)\n" @@ -280,7 +278,7 @@ void App::initShaders() " mediump vec4 dual = texture(tex_dual, uv);\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" + " stroke.a = mask ? stroke.a * stroke_alpha * blur(tex_mask, uv).r : stroke.a * stroke_alpha;\n" " if (!lock && base.a == 0.0) { frag = stroke * vec4(1.0, 1.0, 1.0, alpha); return; }\n" " mediump vec4 blended = blend(base, stroke, blend_mode);\n" " frag = vec4(blended.rgb, (lock ? base.a : blended.a) * alpha);\n" diff --git a/src/canvas.cpp b/src/canvas.cpp index 346dc5d..80b6d70 100644 --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -253,7 +253,6 @@ void Canvas::stroke_draw_mix(const glm::vec2& bb_min, const glm::vec2& bb_sz) ShaderManager::u_float(kShaderUniform::Alpha, 1); ShaderManager::u_int(kShaderUniform::Lock, false/*m_layers[layer_index].m_alpha_locked*/); ShaderManager::u_int(kShaderUniform::Mask, false/*m_smask_active*/); - ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false); ShaderManager::u_int(kShaderUniform::UseDual, false); ShaderManager::u_int(kShaderUniform::UsePattern, false); ShaderManager::u_int(kShaderUniform::BlendMode, b->m_blend_mode); @@ -764,7 +763,6 @@ void Canvas::stroke_commit() ShaderManager::u_int(kShaderUniform::TexStroke, 1); ShaderManager::u_int(kShaderUniform::TexMask, 2); ShaderManager::u_int(kShaderUniform::Mask, m_smask_active); - ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false); ShaderManager::u_float(kShaderUniform::StrokeAlpha, b->m_tip_opacity); ShaderManager::u_float(kShaderUniform::Alpha, 1); ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f)); @@ -795,7 +793,6 @@ void Canvas::stroke_commit() ShaderManager::u_float(kShaderUniform::PatternAlpha, b->m_pattern_opacity); ShaderManager::u_float(kShaderUniform::Alpha, 1); ShaderManager::u_int(kShaderUniform::Mask, m_smask_active); - ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false); ShaderManager::u_int(kShaderUniform::BlendMode, b->m_blend_mode); ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f)); ShaderManager::u_int(kShaderUniform::UseDual, b->m_dual_enabled); @@ -1007,7 +1004,6 @@ void Canvas::layer_merge(int source_idx, int dest_idx) // m_layer index ShaderManager::u_int(kShaderUniform::Tex, 0); // dest ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source ShaderManager::u_vec2(kShaderUniform::Resolution, m_size); - ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false); ShaderManager::u_float(kShaderUniform::StrokeAlpha, 1); ShaderManager::u_float(kShaderUniform::PatternAlpha, 0); ShaderManager::u_float(kShaderUniform::Alpha, m_layers[source_idx].m_opacity); diff --git a/src/canvas_modes.cpp b/src/canvas_modes.cpp index 5dcb2bb..d358e71 100644 --- a/src/canvas_modes.cpp +++ b/src/canvas_modes.cpp @@ -1157,7 +1157,6 @@ void CanvasModeTransform::leave() ShaderManager::u_float(kShaderUniform::StrokeAlpha, 1); ShaderManager::u_int(kShaderUniform::Lock, false); ShaderManager::u_int(kShaderUniform::Mask, false); - ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false); ShaderManager::u_vec2(kShaderUniform::Resolution, Canvas::I->m_size); ShaderManager::u_int(kShaderUniform::BlendMode, 0); ShaderManager::u_int(kShaderUniform::UseDual, false); diff --git a/src/node_canvas.cpp b/src/node_canvas.cpp index cd92457..5aad5f3 100644 --- a/src/node_canvas.cpp +++ b/src/node_canvas.cpp @@ -184,7 +184,6 @@ void NodeCanvas::draw() //ShaderManager::u_vec2(kShaderUniform::Resolution, zw(m_canvas->m_box) / zoom); ShaderManager::u_float(kShaderUniform::StrokeAlpha, b->m_tip_opacity); ShaderManager::u_float(kShaderUniform::Alpha, m_canvas->m_layers[layer_index].m_opacity); - ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false); //ShaderManager::u_int(kShaderUniform::Lock, m_canvas->m_layers[layer_index].m_alpha_locked); ShaderManager::u_int(kShaderUniform::Mask, m_canvas->m_smask_active); ShaderManager::u_mat4(kShaderUniform::MVP, plane_mvp_z); @@ -216,7 +215,6 @@ void NodeCanvas::draw() ShaderManager::u_float(kShaderUniform::Alpha, m_canvas->m_layers[layer_index].m_opacity); ShaderManager::u_int(kShaderUniform::Lock, m_canvas->m_layers[layer_index].m_alpha_locked); ShaderManager::u_int(kShaderUniform::Mask, m_canvas->m_smask_active); - ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false); ShaderManager::u_int(kShaderUniform::BlendMode, b->m_blend_mode); ShaderManager::u_mat4(kShaderUniform::MVP, plane_mvp_z); ShaderManager::u_int(kShaderUniform::UseDual, b->m_dual_enabled); diff --git a/src/node_stroke_preview.cpp b/src/node_stroke_preview.cpp index 5ddfd92..ea6033e 100644 --- a/src/node_stroke_preview.cpp +++ b/src/node_stroke_preview.cpp @@ -82,7 +82,6 @@ void NodeStrokePreview::stroke_draw_mix(const glm::vec2& bb_min, const glm::vec2 ShaderManager::u_float(kShaderUniform::Alpha, 1); ShaderManager::u_int(kShaderUniform::Lock, false); ShaderManager::u_int(kShaderUniform::Mask, false); - ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false); ShaderManager::u_int(kShaderUniform::BlendMode, b->m_blend_mode); ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f)); ShaderManager::u_int(kShaderUniform::UseDual, b->m_dual_enabled); @@ -387,7 +386,6 @@ void NodeStrokePreview::draw_stroke() ShaderManager::u_float(kShaderUniform::PatternAlpha, b->m_pattern_opacity); ShaderManager::u_float(kShaderUniform::Alpha, 1); ShaderManager::u_int(kShaderUniform::Mask, false); - ShaderManager::u_int(kShaderUniform::UseFragCoordUV2, false); ShaderManager::u_int(kShaderUniform::BlendMode, b->m_blend_mode); ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f)); ShaderManager::u_int(kShaderUniform::UseDual, b->m_dual_enabled); diff --git a/src/shader.h b/src/shader.h index 4f41af6..d2e0c1c 100644 --- a/src/shader.h +++ b/src/shader.h @@ -31,7 +31,6 @@ enum class kShaderUniform : uint16_t DualBlendMode = const_hash("dual_blend_mode"), Noise = const_hash("noise"), Direction = const_hash("dir"), - UseFragCoordUV2 = const_hash("fragUV2"), UseDual = const_hash("use_dual"), UsePattern = const_hash("use_pattern"), LightDir = const_hash("light_dir"),