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

fix stroke shader with better blending and initial support to opacity

Browse Source
This commit is contained in:
omigamedev
2017-04-07 01:45:50 +01:00
parent 4d930b4429
commit d340324c3d
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/canvas.cpp
View File

@@ -49,7 +49,7 @@ void ui::Canvas::stroke_draw()
tex.bind();
m_sampler.bind(0);
glActiveTexture(GL_TEXTURE1);
m_tex.bind();
m_tex.bind(); // bg, copy of framebuffer (copied before drawing)
m_sampler_bg.bind(1);
if (m_use_instanced)
@@ -65,8 +65,8 @@ void ui::Canvas::stroke_draw()
glDisable(GL_BLEND);
ShaderManager::use(ui::kShader::Stroke);
ShaderManager::u_vec4(kShaderUniform::Col, m_brush.m_tip_color);
ShaderManager::u_int(kShaderUniform::Tex, 0);
ShaderManager::u_int(kShaderUniform::TexBG, 1);
ShaderManager::u_int(kShaderUniform::Tex, 0); // brush
ShaderManager::u_int(kShaderUniform::TexBG, 1); // bg
ShaderManager::u_vec2(kShaderUniform::Resolution, { m_width, m_height });
for (const auto& s : samples)
{
@@ -158,7 +158,7 @@ void ui::Canvas::stroke_commit()
ShaderManager::use(ui::kShader::StrokeLayer);
ShaderManager::u_int(kShaderUniform::Tex, 0);
ShaderManager::u_int(kShaderUniform::TexBG, 1);
//ShaderManager::u_float(kShaderUniform::Alpha, 1); // TODO: if using opacity in commit, update blending to match the preview when rendering m_tmp in NodeCanvas
ShaderManager::u_float(kShaderUniform::Alpha, .5); // TODO: if using opacity in commit, update blending to match the preview when rendering m_tmp in NodeCanvas
ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f));
m_plane.draw_fill();
m_sampler.unbind();