Route remaining UI shader setup through helpers

This commit is contained in:
2026-06-13 06:12:46 +02:00
parent d7c88e6653
commit 05b721bce6
9 changed files with 123 additions and 83 deletions

View File

@@ -349,7 +349,6 @@ void NodeAnimationLayer::draw()
void NodeAnimationTimeline::draw()
{
parent::draw();
ShaderManager::use(kShader::Color);
pp::legacy::ui_gl::set_blend_enabled(false, "NodeAnimationTimeline");
float step = 35.f;
@@ -358,20 +357,18 @@ void NodeAnimationTimeline::draw()
m_pos.y + m_size.y * 0.5f
};
ShaderManager::u_vec4(kShaderUniform::Col, glm::vec4(glm::vec3(m_cursor_color) * 0.5f, 1.f));
ShaderManager::u_mat4(kShaderUniform::MVP, m_proj
* glm::translate(glm::vec3(cur_pos, 0))
* glm::scale(glm::vec3(step * m_onion_size * 2.f, m_size.y * 0.5f, 1))
);
pp::panopainter::configure_legacy_ui_color_shader(
m_proj
* glm::translate(glm::vec3(cur_pos, 0))
* glm::scale(glm::vec3(step * m_onion_size * 2.f, m_size.y * 0.5f, 1)),
glm::vec4(glm::vec3(m_cursor_color) * 0.5f, 1.f));
m_plane.draw_fill();
ShaderManager::u_vec4(kShaderUniform::Col, m_cursor_color);
ShaderManager::u_mat4(kShaderUniform::MVP, m_proj
* glm::translate(glm::vec3(cur_pos, 0))
* glm::scale(glm::vec3(step * 0.25f, m_size.y * 0.75f, 1))
);
pp::panopainter::configure_legacy_ui_color_shader(
m_proj
* glm::translate(glm::vec3(cur_pos, 0))
* glm::scale(glm::vec3(step * 0.25f, m_size.y * 0.75f, 1)),
m_cursor_color);
m_plane.draw_fill();
/*