integrate quick brushes, simulate pressed keys on windows active

This commit is contained in:
2019-03-05 23:41:43 +01:00
parent 1cbe9a4a76
commit b0933c29fb
8 changed files with 79 additions and 44 deletions

View File

@@ -619,23 +619,23 @@ void App::update(float dt)
#else
glBindFramebuffer(GL_FRAMEBUFFER, 0);
#endif
//canvas->watch(observer);
glEnable(GL_SCISSOR_TEST);
for (int i = 0; i < layout[main_id]->m_children.size(); i++)
layout[main_id]->m_children[i]->watch(observer);
//msgbox->watch(observer);
glDisable(GL_SCISSOR_TEST);
// glEnable(GL_BLEND);
// sampler.bind(0);
// ShaderManager::use(kShader::Texture);
// ShaderManager::u_int(kShaderUniform::Tex, 0);
// ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-1.f, 1.f, -1.f, 1.f));
// glActiveTexture(GL_TEXTURE0);
// uirtt.bindTexture();
// m_face_plane.draw_fill();
// uirtt.unbindTexture();
// glDisable(GL_BLEND);
//canvas->watch(observer);
//glEnable(GL_BLEND);
//sampler.bind(0);
//ShaderManager::use(kShader::Texture);
//ShaderManager::u_int(kShaderUniform::Tex, 0);
//ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-1.f, 1.f, -1.f, 1.f));
//glActiveTexture(GL_TEXTURE0);
//uirtt.bindTexture();
//m_face_plane.draw_fill();
//uirtt.unbindTexture();
//glDisable(GL_BLEND);
if (rec_running)
{