UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'omega-hotfix' into omega-dev

Browse Source
This commit is contained in:
Quentin
2020-04-16 14:24:47 +02:00
parent a4af2942e6 3013dda9d6
commit 13874cd2e0
335 changed files with 2114 additions and 1706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kandinsky/src/rect.cpp
View File

@@ -1,7 +1,5 @@
#include <kandinsky/rect.h>
static inline KDCoordinate minCoordinate(KDCoordinate x, KDCoordinate y) { return x < y ? x : y; }
static inline KDCoordinate maxCoordinate(KDCoordinate x, KDCoordinate y) { return x > y ? x : y; }
#include <algorithm>
KDRect::KDRect(KDPoint p, KDSize s) :
m_x(p.x()), m_y(p.y()),
@@ -38,10 +36,10 @@ KDRect KDRect::intersectedWith(const KDRect & other) const {
return KDRectZero;
}
KDCoordinate intersectionLeft = maxCoordinate(left(), other.left());
KDCoordinate intersectionRight = minCoordinate(right(), other.right());
KDCoordinate intersectionTop = maxCoordinate(top(), other.top());
KDCoordinate intersectionBottom = minCoordinate(bottom(), other.bottom());
KDCoordinate intersectionLeft = std::max(left(), other.left());
KDCoordinate intersectionRight = std::min(right(), other.right());
KDCoordinate intersectionTop = std::max(top(), other.top());
KDCoordinate intersectionBottom = std::min(bottom(), other.bottom());
return KDRect(
intersectionLeft,
@@ -57,8 +55,8 @@ void computeUnionBound(KDCoordinate size1, KDCoordinate size2,
{
if (size1 != 0) {
if (size2 != 0) {
*outputMin = minCoordinate(min1, min2);
*outputMax = maxCoordinate(max1, max2);
*outputMin = std::min(min1, min2);
*outputMax = std::max(max1, max2);
} else {
*outputMin = min1;
*outputMax = max1;