From 3bf7c5aea1d20cc6a0fc95f920111548e7863af9 Mon Sep 17 00:00:00 2001 From: Felix Dick Date: Mon, 10 Oct 2022 01:35:42 +0200 Subject: [PATCH] Change matrixProjection function stop use matrixFlip180 everywhere. --- src/helpers/MiscFunctions.cpp | 10 +++++----- src/render/OpenGL.cpp | 4 ---- src/render/OpenGL.hpp | 5 ----- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp index 362e0675..6acd8b63 100644 --- a/src/helpers/MiscFunctions.cpp +++ b/src/helpers/MiscFunctions.cpp @@ -178,7 +178,7 @@ bool isNumber(const std::string& str, bool allowfloat) { std::string copy = str; if (*copy.begin() == '-') copy = copy.substr(1); - + if (copy.empty()) return false; @@ -331,7 +331,7 @@ void logSystemInfo() { Debug::log(LOG, "Node name: %s", unameInfo.nodename); Debug::log(LOG, "Release: %s", unameInfo.release); Debug::log(LOG, "Version: %s", unameInfo.version); - + Debug::log(NONE, "\n"); const std::string GPUINFO = execAndGet("lspci -vnn | grep VGA"); @@ -357,8 +357,8 @@ void matrixProjection(float mat[9], int w, int h, wl_output_transform tr) { // Rotation + reflection mat[0] = x * t[0]; mat[1] = x * t[1]; - mat[3] = y * -t[3]; - mat[4] = y * -t[4]; + mat[3] = y * t[3]; + mat[4] = y * t[4]; // Translation mat[2] = -copysign(1.0f, mat[0] + mat[1]); @@ -401,4 +401,4 @@ int64_t getPPIDof(int64_t pid) { } catch (std::exception& e) { return 0; } -} \ No newline at end of file +} diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index 77bf7d97..8a51a83a 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -323,7 +323,6 @@ void CHyprOpenGLImpl::renderRectWithDamage(wlr_box* box, const CColor& col, pixm float glMatrix[9]; wlr_matrix_multiply(glMatrix, m_RenderData.projection, matrix); - wlr_matrix_multiply(glMatrix, matrixFlip180, glMatrix); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -412,7 +411,6 @@ void CHyprOpenGLImpl::renderTextureInternalWithDamage(const CTexture& tex, wlr_b float glMatrix[9]; wlr_matrix_multiply(glMatrix, m_RenderData.projection, matrix); - wlr_matrix_multiply(glMatrix, matrixFlip180, glMatrix); CShader* shader = nullptr; @@ -840,7 +838,6 @@ void CHyprOpenGLImpl::renderBorder(wlr_box* box, const CColor& col, int round) { float glMatrix[9]; wlr_matrix_multiply(glMatrix, m_RenderData.projection, matrix); - wlr_matrix_multiply(glMatrix, matrixFlip180, glMatrix); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -1096,7 +1093,6 @@ void CHyprOpenGLImpl::renderRoundedShadow(wlr_box* box, int round, int range, fl float glMatrix[9]; wlr_matrix_multiply(glMatrix, m_RenderData.projection, matrix); - wlr_matrix_multiply(glMatrix, matrixFlip180, glMatrix); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/render/OpenGL.hpp b/src/render/OpenGL.hpp index 33ebb964..b62732f6 100644 --- a/src/render/OpenGL.hpp +++ b/src/render/OpenGL.hpp @@ -12,11 +12,6 @@ #include "Texture.hpp" #include "Framebuffer.hpp" -inline const float matrixFlip180[] = { - 1.0f, 0.0f, 0.0f, - 0.0f, -1.0f, 0.0f, - 0.0f, 0.0f, 1.0f, -}; inline const float fullVerts[] = { 1, 0, // top right 0, 0, // top left