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

[kandinsky] In KDContext::getPixels: beware of rects crossing the screen

Browse Source 
This fixes a display glitch on the device, when using Python's turtle
module and doing the command forward(200).
This commit is contained in:
Léa Saviot
2018-12-07 11:30:32 +01:00
parent c8a5972243
commit e836593ff9
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,7 @@ public:
KDRect unionedWith(const KDRect & other) const; // Returns the smallest rectangle containing r1 and r2
KDRect differencedWith(const KDRect & other) const; // Returns the smallest rectangle containing r1\r2
bool contains(KDPoint p) const;
bool containsRect(const KDRect & other) const;
bool isAbove(KDPoint p) const;
bool isUnder(KDPoint p) const;
bool isEmpty() const;

13
kandinsky/src/context_pixel.cpp
View File

@@ -19,5 +19,16 @@ KDColor KDContext::getPixel(KDPoint p) {
void KDContext::getPixels(KDRect r, KDColor * pixels) {
KDRect rect = r.translatedBy(m_origin);
pullRect(rect, pixels);
if (m_clippingRect.containsRect(rect)) {
pullRect(rect, pixels);
return;
}
int i = 0;
KDCoordinate yMax = r.y()+r.height();
KDCoordinate xMax = r.x()+r.width();
for (int y = r.y(); y < yMax; y++) {
for (int x = r.x(); x < xMax; x++) {
pixels[i++] = getPixel(KDPoint(x, y));
}
}
}

10
kandinsky/src/rect.cpp
View File

@@ -146,6 +146,16 @@ bool KDRect::contains(KDPoint p) const {
return (p.x() >= x() && p.x() <= right() && p.y() >= y() && p.y() <= bottom());
}
bool KDRect::containsRect(const KDRect & other) const {
if (other.isEmpty()) {
return true;
}
if (isEmpty()) {
return false;
}
return contains(other.topLeft()) && contains(other.bottomRight());
}
bool KDRect::isAbove(KDPoint p) const {
return (p.y() >= y());
}