fix: Fix console background

This commit is contained in:
Vsevolod Kremianskii 2020-12-13 11:05:59 +07:00
parent d9ad009471
commit 8404fa073a
2 changed files with 26 additions and 15 deletions

View file

@ -90,27 +90,34 @@ void Console::executeInputText() {
}
void Console::render() const {
drawBackground();
drawLines();
}
void Console::drawBackground() const {
float height = kLineCount * _font->height();
{
glm::mat4 transform(1.0f);
transform = glm::scale(transform, glm::vec3(_opts.width, height, 1.0f));
LocalUniforms locals;
locals.general.model = move(transform);
locals.general.color = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
locals.general.alpha = 0.5f;
glm::mat4 transform(1.0f);
transform = glm::scale(transform, glm::vec3(_opts.width, height, 1.0f));
LocalUniforms locals;
locals.general.model = move(transform);
locals.general.color = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
locals.general.alpha = 0.5f;
Shaders::instance().activate(ShaderProgram::GUIWhite, locals);
Shaders::instance().activate(ShaderProgram::GUIGUI, locals);
}
Quad::getDefault().renderTriangles();
}
void Console::drawLines() const {
float height = kLineCount * _font->height();
glm::mat4 transform(1.0f);
transform = glm::translate(transform, glm::vec3(3.0f, height - 0.5f * _font->height(), 0.0f));
string text("> " + _input.text());
{
glm::mat4 transform(1.0f);
transform = glm::translate(transform, glm::vec3(3.0f, height - 0.5f * _font->height(), 0.0f));
_font->render(text, transform, glm::vec3(1.0f), TextGravity::Right);
}
_font->render(text, transform, glm::vec3(1.0f), TextGravity::Right);
}
bool Console::isOpen() const {

View file

@ -52,7 +52,11 @@ private:
bool handleKeyDown(const SDL_KeyboardEvent &event);
bool handleKeyUp(const SDL_KeyboardEvent &event);
void executeInputText();
void drawBackground() const;
void drawLines() const;
};
} // namespace game