Prepping UI Label
This commit is contained in:
@ -30,7 +30,6 @@ void UIShader::getStages(
|
||||
"uniform mat4 u_View;\n"
|
||||
"uniform mat4 u_Model;\n"
|
||||
"struct UIShaderQuad {\n"
|
||||
"mat4 transform;\n"
|
||||
"vec4 quad;\n"
|
||||
"vec4 uv;\n"
|
||||
"vec4 color;\n"
|
||||
@ -70,7 +69,7 @@ void UIShader::getStages(
|
||||
"}\n"
|
||||
"pos.z = 0;\n"
|
||||
"pos.w = 1;\n"
|
||||
"gl_Position = u_Projection * u_View * u_Model * quad.transform * pos;\n"
|
||||
"gl_Position = u_Projection * u_View * u_Model * pos;\n"
|
||||
"o_TextCoord = coord;\n"
|
||||
"v_Color = quad.color;\n"
|
||||
"}"
|
||||
@ -120,12 +119,6 @@ void UIShader::getStages(
|
||||
&rel->quads,
|
||||
ShaderOpenGLStructureType::STD140,
|
||||
[&](const struct UIShaderQuad &rel, std::vector<struct ShaderParameter> ¶meters) {
|
||||
parameters.push_back(ShaderParameter(
|
||||
"u_Transform",
|
||||
&rel.transform,
|
||||
ShaderParameterType::MAT4
|
||||
));
|
||||
|
||||
parameters.push_back(ShaderParameter(
|
||||
"u_Quad",
|
||||
&rel.quad,
|
||||
@ -144,6 +137,6 @@ void UIShader::getStages(
|
||||
ShaderParameterType::COLOR
|
||||
));
|
||||
},
|
||||
2
|
||||
UI_SHADER_QUAD_COUNT
|
||||
));
|
||||
}
|
@ -10,7 +10,6 @@ namespace Dawn {
|
||||
#define UI_SHADER_QUAD_COUNT 32
|
||||
|
||||
struct UIShaderQuad {
|
||||
glm::mat4 transform;
|
||||
glm::vec4 quad;
|
||||
glm::vec4 uv;
|
||||
struct Color color;
|
||||
|
Reference in New Issue
Block a user