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

fix layer delete order bug, fix and improve brush preview during the stroke, fix windows mouse capture (api works only on the main thread)

Browse Source
This commit is contained in:
omigamedev
2018-11-03 23:44:09 +01:00
parent 3ee10bb88d
commit eb1c8d6b7a
6 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/node_canvas.cpp
View File

@@ -141,7 +141,7 @@ void NodeCanvas::draw()
m_canvas->m_plane_transform[plane_index] *
glm::translate(glm::vec3(0, 0, -1));
if (m_canvas->m_state == ui::Canvas::kCanvasMode::Erase && m_canvas->m_show_tmp && m_canvas->m_current_layer_idx == layer_index)
if (m_canvas->m_current_stroke && m_canvas->m_state == ui::Canvas::kCanvasMode::Erase && m_canvas->m_show_tmp && m_canvas->m_current_layer_idx == layer_index)
{
m_sampler.bind(0);
ui::ShaderManager::use(kShader::CompErase);
@@ -165,7 +165,7 @@ void NodeCanvas::draw()
glActiveTexture(GL_TEXTURE0);
m_canvas->m_layers[layer_index].m_rtt[plane_index].unbindTexture();
}
else if(m_canvas->m_show_tmp && m_canvas->m_current_layer_idx == layer_index)
else if(m_canvas->m_current_stroke && m_canvas->m_show_tmp && m_canvas->m_current_layer_idx == layer_index)
{
m_sampler.bind(0);
auto& paper = TextureManager::get(const_hash("data/paper.jpg"));