hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

math: include cstring for memset 

fixup name too
This commit is contained in:
Vaxry 2024-06-21 15:56:25 +02:00
parent fabc30df52
commit 8cf2ca1966
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/helpers/math/Math.cpp
View File

@ -1,5 +1,6 @@
#include "Math.hpp" #include "Math.hpp"
#include <unordered_map> #include <unordered_map>
#include <cstring>
Hyprutils::Math::eTransform wlTransformToHyprutils(wl_output_transform t) { Hyprutils::Math::eTransform wlTransformToHyprutils(wl_output_transform t) {
switch (t) { switch (t) {
@ -52,21 +53,21 @@ static void matrixTranslate(float mat[9], float x, float y) {
float translate[9] = { float translate[9] = {
1.0f, 0.0f, x, 0.0f, 1.0f, y, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, x, 0.0f, 1.0f, y, 0.0f, 0.0f, 1.0f,
}; };
wlr_matrix_multiply(mat, mat, translate); matrixMultiply(mat, mat, translate);
} }
static void matrixScale(float mat[9], float x, float y) { static void matrixScale(float mat[9], float x, float y) {
float scale[9] = { float scale[9] = {
x, 0.0f, 0.0f, 0.0f, y, 0.0f, 0.0f, 0.0f, 1.0f, x, 0.0f, 0.0f, 0.0f, y, 0.0f, 0.0f, 0.0f, 1.0f,
}; };
wlr_matrix_multiply(mat, mat, scale); matrixMultiply(mat, mat, scale);
} }
static void matrixRotate(float mat[9], float rad) { static void matrixRotate(float mat[9], float rad) {
float rotate[9] = { float rotate[9] = {
cos(rad), -sin(rad), 0.0f, sin(rad), cos(rad), 0.0f, 0.0f, 0.0f, 1.0f, cos(rad), -sin(rad), 0.0f, sin(rad), cos(rad), 0.0f, 0.0f, 0.0f, 1.0f,
}; };
wlr_matrix_multiply(mat, mat, rotate); matrixMultiply(mat, mat, rotate);
} }
static std::unordered_map<eTransform, std::array<float, 9>> transforms = { static std::unordered_map<eTransform, std::array<float, 9>> transforms = {
@ -208,7 +209,7 @@ void projectBox(float mat[9], CBox& box, eTransform transform, float rotation, c
matrixTranslate(mat, -width / 2, -height / 2); matrixTranslate(mat, -width / 2, -height / 2);
} }
wlr_matrix_scale(mat, width, height); matrixScale(mat, width, height);
if (transform != HYPRUTILS_TRANSFORM_NORMAL) { if (transform != HYPRUTILS_TRANSFORM_NORMAL) {
matrixTranslate(mat, 0.5, 0.5); matrixTranslate(mat, 0.5, 0.5);