Route UI and VR shader setup through helpers
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
#include "app.h"
|
||||
#include "log.h"
|
||||
#include "legacy_ui_gl_dispatch.h"
|
||||
#include "legacy_ui_overlay_services.h"
|
||||
#include "node_text_input.h"
|
||||
#include "node_border.h"
|
||||
|
||||
@@ -216,10 +217,7 @@ void NodeTextInput::draw()
|
||||
NodeBorder::draw();
|
||||
|
||||
glm::mat4 pos = glm::translate(glm::vec3(glm::floor(m_pos + m_off), 0));
|
||||
ShaderManager::use(kShader::Font);
|
||||
ShaderManager::u_int(kShaderUniform::Tex, 0);
|
||||
ShaderManager::u_mat4(kShaderUniform::MVP, m_proj * pos);
|
||||
ShaderManager::u_vec4(kShaderUniform::Col, m_color);
|
||||
pp::panopainter::configure_legacy_ui_font_shader(m_proj * pos, m_color);
|
||||
pp::legacy::ui_gl::set_blend_enabled(true, "NodeTextInput");
|
||||
m_text_mesh.draw();
|
||||
pp::legacy::ui_gl::set_blend_enabled(false, "NodeTextInput");
|
||||
@@ -230,9 +228,9 @@ void NodeTextInput::draw()
|
||||
glm::mat4 cur_pos = glm::translate(glm::vec3(m_pos + m_off + xy(m_text_mesh.cur_box), 0));
|
||||
glm::mat4 cur_scale = glm::scale(glm::vec3(zw(m_text_mesh.cur_box), 1));
|
||||
glm::mat4 cur_pivot = glm::translate(glm::vec3(0.5, 0.5, 0));
|
||||
ShaderManager::use(kShader::Color);
|
||||
ShaderManager::u_mat4(kShaderUniform::MVP, m_proj * cur_pos * cur_scale * cur_pivot);
|
||||
ShaderManager::u_vec4(kShaderUniform::Col, { 0, 0, 0, 1 });
|
||||
pp::panopainter::configure_legacy_ui_color_shader(
|
||||
m_proj * cur_pos * cur_scale * cur_pivot,
|
||||
{ 0, 0, 0, 1 });
|
||||
m_plane.draw_fill();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user