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

Math: Added some constants to handle floating point presicion comparisons (#2) 

* Added some constants to handle floating point presicion comparisons and other calculations plus some refactoring

* Removed validation
This commit is contained in:
Jasson Cordones 2024-06-23 14:14:57 -04:00 committed by GitHub
parent 725f63aabc
commit ff343e0279
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/math/Box.cpp
View File

@ -7,6 +7,10 @@
using namespace Hyprutils::Math; using namespace Hyprutils::Math;
constexpr double HALF = 0.5;
constexpr double DOUBLE = 2.0;
constexpr double EPSILON = 1e-9;
CBox& Hyprutils::Math::CBox::scale(double scale) { CBox& Hyprutils::Math::CBox::scale(double scale) {
x *= scale; x *= scale;
y *= scale; y *= scale;
@ -33,7 +37,7 @@ CBox& Hyprutils::Math::CBox::translate(const Vector2D& vec) {
} }
Vector2D Hyprutils::Math::CBox::middle() const { Vector2D Hyprutils::Math::CBox::middle() const {
return Vector2D{x + w / 2.0, y + h / 2.0}; return Vector2D{x + w * HALF, y + h * HALF};
} }
bool Hyprutils::Math::CBox::containsPoint(const Vector2D& vec) const { bool Hyprutils::Math::CBox::containsPoint(const Vector2D& vec) const {
@ -41,14 +45,17 @@ bool Hyprutils::Math::CBox::containsPoint(const Vector2D& vec) const {
} }
bool Hyprutils::Math::CBox::empty() const { bool Hyprutils::Math::CBox::empty() const {
return w == 0 || h == 0; return std::fabs(w) < EPSILON || std::fabs(h) < EPSILON;
} }
CBox& Hyprutils::Math::CBox::round() { CBox& Hyprutils::Math::CBox::round() {
float newW = x + w - std::round(x); double roundedX = std::round(x);
float newH = y + h - std::round(y); double roundedY = std::round(y);
x = std::round(x); double newW = x + w - roundedX;
y = std::round(y); double newH = y + h - roundedY;
x = roundedX;
y = roundedY;
w = std::round(newW); w = std::round(newW);
h = std::round(newH); h = std::round(newH);
@ -56,6 +63,7 @@ CBox& Hyprutils::Math::CBox::round() {
} }
CBox& Hyprutils::Math::CBox::transform(const eTransform t, double w, double h) { CBox& Hyprutils::Math::CBox::transform(const eTransform t, double w, double h) {
CBox temp = *this; CBox temp = *this;
if (t % 2 == 0) { if (t % 2 == 0) {
@ -119,8 +127,8 @@ CBox& Hyprutils::Math::CBox::scaleFromCenter(double scale) {
w *= scale; w *= scale;
h *= scale; h *= scale;
x -= (w - oldW) / 2.0; x -= (w - oldW) * HALF;
y -= (h - oldH) / 2.0; y -= (h - oldH) * HALF;
return *this; return *this;
} }
@ -128,10 +136,10 @@ CBox& Hyprutils::Math::CBox::scaleFromCenter(double scale) {
CBox& Hyprutils::Math::CBox::expand(const double& value) { CBox& Hyprutils::Math::CBox::expand(const double& value) {
x -= value; x -= value;
y -= value; y -= value;
w += value * 2.0; w += value * DOUBLE;
h += value * 2.0; h += value * DOUBLE;
if (w <= 0 || h <= 0) { if (w <= EPSILON || h <= EPSILON) {
w = 0; w = 0;
h = 0; h = 0;
} }
@ -147,14 +155,14 @@ CBox& Hyprutils::Math::CBox::noNegativeSize() {
} }
CBox Hyprutils::Math::CBox::intersection(const CBox& other) const { CBox Hyprutils::Math::CBox::intersection(const CBox& other) const {
const float newX = std::max(x, other.x); const double newX = std::max(x, other.x);
const float newY = std::max(y, other.y); const double newY = std::max(y, other.y);
const float newBottom = std::min(y + h, other.y + other.h); const double newBottom = std::min(y + h, other.y + other.h);
const float newRight = std::min(x + w, other.x + other.w); const double newRight = std::min(x + w, other.x + other.w);
float newW = newRight - newX; double newW = newRight - newX;
float newH = newBottom - newY; double newH = newBottom - newY;
if (newW <= 0 || newH <= 0) { if (newW <= EPSILON || newH <= EPSILON) {
newW = 0; newW = 0;
newH = 0; newH = 0;
} }
@ -171,10 +179,12 @@ bool Hyprutils::Math::CBox::inside(const CBox& bound) const {
} }
CBox Hyprutils::Math::CBox::roundInternal() { CBox Hyprutils::Math::CBox::roundInternal() {
float newW = x + w - std::floor(x); double flooredX = std::floor(x);
float newH = y + h - std::floor(y); double flooredY = std::floor(y);
double newW = x + w - flooredX;
double newH = y + h - flooredY;
return CBox{std::floor(x), std::floor(y), std::floor(newW), std::floor(newH)}; return CBox{flooredX, flooredY, std::floor(newW), std::floor(newH)};
} }
CBox Hyprutils::Math::CBox::copy() const { CBox Hyprutils::Math::CBox::copy() const {
@ -196,6 +206,17 @@ Vector2D Hyprutils::Math::CBox::closestPoint(const Vector2D& vec) const {
Vector2D nv = vec; Vector2D nv = vec;
nv.x = std::clamp(nv.x, x, x + w); nv.x = std::clamp(nv.x, x, x + w);
nv.y = std::clamp(nv.y, y, y + h); nv.y = std::clamp(nv.y, y, y + h);
if (std::fabs(nv.x - x) < EPSILON)
nv.x = x;
else if (std::fabs(nv.x - (x + w)) < EPSILON)
nv.x = x + w;
if (std::fabs(nv.y - y) < EPSILON)
nv.y = y;
else if (std::fabs(nv.y - (y + h)) < EPSILON)
nv.y = y + h;
return nv; return nv;
} }