git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Script should still work after loadsvg is used
[ipdf/code.git]
/
src
/
rect.h
diff --git
a/src/rect.h
b/src/rect.h
index
3c4a105
..
5c600f3
100644
(file)
--- a/
src/rect.h
+++ b/
src/rect.h
@@
-9,8
+9,8
@@
namespace IPDF
struct Rect
{
Real x; Real y; Real w; Real h;
struct Rect
{
Real x; Real y; Real w; Real h;
- Rect() = default; // Needed so we can fread/fwrite this struct
- Rect(Real _x
, Real _y, Real _w, Real _h
) : x(_x), y(_y), w(_w), h(_h) {}
+
//
Rect() = default; // Needed so we can fread/fwrite this struct
+ Rect(Real _x
=0, Real _y=0, Real _w=1, Real _h=1
) : x(_x), y(_y), w(_w), h(_h) {}
std::string Str() const
{
std::stringstream s;
std::string Str() const
{
std::stringstream s;
@@
-26,6
+26,15
@@
namespace IPDF
if (pt_y >= y + h) return false;
return true;
}
if (pt_y >= y + h) return false;
return true;
}
+
+ inline bool Intersects(const Rect& other) const
+ {
+ if (x + w < other.x) return false;
+ if (y + h < other.y) return false;
+ if (x > other.x + other.w) return false;
+ if (y > other.y + other.h) return false;
+ return true;
+ }
};
inline Rect TransformRectCoordinates(const Rect& view, const Rect& r)
};
inline Rect TransformRectCoordinates(const Rect& view, const Rect& r)
UCC
git Repository :: git.ucc.asn.au