diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-04-04 22:06:57 +0200 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-04-04 22:06:57 +0200 |
| commit | 67343898ff881bbbc767025a033005f45db32a09 (patch) | |
| tree | 38a789acf46664f57c1aad8a38172d57e267ead7 /src | |
| parent | 334f5a59b07c890418ec28630e428e1e02e5f51e (diff) | |
fixed rendering rects
Diffstat (limited to 'src')
| -rw-r--r-- | src/events/Monitors.cpp | 2 | ||||
| -rw-r--r-- | src/render/OpenGL.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp index 032825a6..65016f61 100644 --- a/src/events/Monitors.cpp +++ b/src/events/Monitors.cpp @@ -116,7 +116,7 @@ void Events::listener_monitorFrame(void* owner, void* data) { g_pHyprOpenGL->clear(CColor(11, 55, 11, 255)); wlr_box box = {1,1,100,300}; - g_pHyprOpenGL->renderRect(&box, CColor(255,0,255,255)); // THIS FUCKING SHIT DOESNT WORK!!!!!! + g_pHyprOpenGL->renderRect(&box, CColor(255,0,255,255)); g_pHyprOpenGL->end(); diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index f7c7fa13..5a7f11d2 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -136,7 +136,7 @@ void CHyprOpenGLImpl::renderRect(wlr_box* box, const CColor& col) { RASSERT(m_RenderData.pMonitor, "Tried to render rect without begin()!"); float matrix[9]; - wlr_matrix_project_box(matrix, box, WL_OUTPUT_TRANSFORM_NORMAL, 0, m_RenderData.projection); // TODO: write own, don't use WLR here + wlr_matrix_project_box(matrix, box, WL_OUTPUT_TRANSFORM_NORMAL, 0, m_RenderData.pMonitor->output->transform_matrix); // TODO: write own, don't use WLR here float glMatrix[9]; wlr_matrix_multiply(glMatrix, m_RenderData.projection, matrix); @@ -152,7 +152,7 @@ void CHyprOpenGLImpl::renderRect(wlr_box* box, const CColor& col) { glUseProgram(m_shQUAD.program); glUniformMatrix3fv(m_shQUAD.proj, 1, GL_FALSE, glMatrix); - glUniform4f(m_shQUAD.color, 0.1f, 0.1f, 0.1f, 1.f); + glUniform4f(m_shQUAD.color, col.r / 255.f, col.g / 255.f, col.r / 255.f, col.a / 255.f); glVertexAttribPointer(m_shQUAD.posAttrib, 2, GL_FLOAT, GL_FALSE, 0, fullVerts); |