UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-19 05:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kandinsky: Add KDRectIntersect and update KDRectIntersection

Browse Source 
One gives a boolean, the other the actual KDRect

Change-Id: I5a2e6d1110f0ad111ac2f3a46dcd072e72ea786d
This commit is contained in:
Romain Goyet
2016-04-21 17:14:59 +02:00
parent 0332aba48f
commit 61854d118e
3 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
escher/src/view.cpp
View File

@@ -34,8 +34,8 @@ void View::redraw(KDRect rect) {
if (subview == nullptr) {
continue;
}
KDRect intersection = KDRectIntersect(rect, subview->m_frame);
if (intersection.width > 0 || intersection.height > 0) {
if (KDRectIntersect(rect, subview->m_frame)) {
KDRect intersection = KDRectIntersection(rect, subview->m_frame);
// Let's express intersection in subview's coordinates
intersection.x -= subview->m_frame.x;
intersection.y -= subview->m_frame.y;

5
kandinsky/include/kandinsky/rect.h
View File

@@ -1,6 +1,7 @@
#ifndef KANDINSKY_RECT_H
#define KANDINSKY_RECT_H
#include <stdbool.h>
#include <kandinsky/color.h>
#include <kandinsky/types.h>
@@ -22,7 +23,9 @@ typedef struct {
} KDRect;
extern KDRect KDRectZero;
KDRect KDRectIntersect(KDRect r1, KDRect r2);
bool KDRectIntersect(KDRect r1, KDRect r2);
KDRect KDRectIntersection(KDRect r1, KDRect r2);
void KDFillRect(KDRect rect, KDColor color);
void KDDrawRect(KDRect rect, KDColor color);

58
kandinsky/src/rect.c
View File

@@ -4,38 +4,40 @@
KDRect KDRectZero = {.x = 0, .y = 0, .width = 0, .height = 0};
KDRect KDRectIntersect(KDRect r1, KDRect r2) {
KDRect intersection;
static inline KDCoordinate left(KDRect r) { return r.x; }
static inline KDCoordinate right(KDRect r) { return r.x+r.width; }
static inline KDCoordinate top(KDRect r) { return r.y; }
static inline KDCoordinate bottom(KDRect r) { return r.y+r.height; }
static inline KDCoordinate min(KDCoordinate x, KDCoordinate y) { return (x<y ? x : y); }
static inline KDCoordinate max(KDCoordinate x, KDCoordinate y) { return (x>y ? x : y); }
// Let's start by computing the overlap on the X axis
if (r1.x < r2.x) {
intersection.x = r2.x;
intersection.width = r1.x+r1.width-r2.x;
} else {
intersection.x = r1.x;
intersection.width = r2.x+r2.width-r1.x;
}
bool KDRectIntersect(KDRect r1, KDRect r2) {
return !(right(r2) < left(r1)
||
left(r2) > right(r1)
||
top(r2) > bottom(r1)
||
bottom(r2) < top(r1)
);
}
if (intersection.width < 0) {
// There's no overlap on the X axis, let's bail out
return KDRectZero;
}
KDRect KDRectIntersection(KDRect r1, KDRect r2) {
if (!KDRectIntersect(r1, r2)) {
return KDRectZero;
}
// Let's then compute the overlap on the Y axis
if (r1.y < r2.y) {
intersection.y = r2.y;
intersection.height = r1.y+r1.height-r2.y;
} else {
intersection.y = r1.y;
intersection.height = r2.y+r2.height-r1.y;
}
KDCoordinate intersectionLeft = max(left(r1), left(r2));
KDCoordinate intersectionRight = min(right(r1), right(r2));
KDCoordinate intersectionTop = max(top(r1), top(r2));
KDCoordinate intersectionBottom = min(bottom(r1), bottom(r2));
if (intersection.height < 0) {
// There's no overlap on the Y axis, let's bail out
return KDRectZero;
}
return intersection;
KDRect intersection;
intersection.x = intersectionLeft;
intersection.width = intersectionRight-intersectionLeft;
intersection.y = intersectionTop;
intersection.height = intersectionBottom-intersectionTop;
return intersection;
}
void KDFillRect(KDRect rect, KDColor color) {