hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 10:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixed rendering rects

Browse source
This commit is contained in:
vaxerski 2022-04-04 22:06:57 +02:00
parent 334f5a59b0
commit 67343898ff
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/events/Monitors.cpp
View file

@ -116,7 +116,7 @@ void Events::listener_monitorFrame(void* owner, void* data) {
g_pHyprOpenGL->clear(CColor(11, 55, 11, 255)); g_pHyprOpenGL->clear(CColor(11, 55, 11, 255));
wlr_box box = {1,1,100,300}; 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(); g_pHyprOpenGL->end();

4
src/render/OpenGL.cpp
View file

@ -136,7 +136,7 @@ void CHyprOpenGLImpl::renderRect(wlr_box* box, const CColor& col) {
RASSERT(m_RenderData.pMonitor, "Tried to render rect without begin()!"); RASSERT(m_RenderData.pMonitor, "Tried to render rect without begin()!");
float matrix[9]; 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]; float glMatrix[9];
wlr_matrix_multiply(glMatrix, m_RenderData.projection, matrix); 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); glUseProgram(m_shQUAD.program);
glUniformMatrix3fv(m_shQUAD.proj, 1, GL_FALSE, glMatrix); 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); glVertexAttribPointer(m_shQUAD.posAttrib, 2, GL_FLOAT, GL_FALSE, 0, fullVerts);