![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/libnr/nr-rect.h b/src/libnr/nr-rect.h
index b6918c4931b77e8730b3f4c33add4b79e6d8800d..5e2332bf278315765af1a0d850e628f04e0275fc 100644 (file)
--- a/src/libnr/nr-rect.h
+++ b/src/libnr/nr-rect.h
#include <stdexcept>
+#include <limits>
#include "libnr/nr-values.h"
#include <libnr/nr-coord.h>
#include <libnr/nr-maybe.h>
#include <libnr/nr-point-matrix-ops.h>
-struct NRMatrix;
namespace NR {
struct Matrix;
-}
-
-/* NULL rect is infinite */
-
-struct NRRect {
- NR::Coord x0, y0, x1, y1;
-};
-
-inline bool empty(NRRect const &r)
-{
- return ( ( r.x0 > r.x1 ) ||
- ( r.y0 > r.y1 ) );
-}
-
-#define nr_rect_d_set_empty(r) (*(r) = NR_RECT_EMPTY)
-#define nr_rect_l_set_empty(r) (*(r) = NR_RECT_L_EMPTY)
-
-#define nr_rect_d_test_empty(r) ((r) && NR_RECT_DFLS_TEST_EMPTY(r))
-#define nr_rect_l_test_empty(r) ((r) && NR_RECT_DFLS_TEST_EMPTY(r))
-
-#define nr_rect_d_test_intersect(r0,r1) \
- (!nr_rect_d_test_empty(r0) && !nr_rect_d_test_empty(r1) && \
- !((r0) && (r1) && !NR_RECT_DFLS_TEST_INTERSECT(r0, r1)))
-#define nr_rect_l_test_intersect(r0,r1) \
- (!nr_rect_l_test_empty(r0) && !nr_rect_l_test_empty(r1) && \
- !((r0) && (r1) && !NR_RECT_DFLS_TEST_INTERSECT(r0, r1)))
-
-#define nr_rect_d_point_d_test_inside(r,p) ((p) && (!(r) || (!NR_RECT_DF_TEST_EMPTY(r) && NR_RECT_DF_POINT_DF_TEST_INSIDE(r,p))))
-#define nr_rect_l_point_l_test_inside(r,p) ((p) && (!(r) || (!NR_RECT_DFLS_TEST_EMPTY(r) && NR_RECT_LS_POINT_LS_TEST_INSIDE(r,p))))
-#define nr_rect_l_test_inside(r,x,y) ((!(r) || (!NR_RECT_DFLS_TEST_EMPTY(r) && NR_RECT_LS_TEST_INSIDE(r,x,y))))
-
-// returns minimal rect which covers all of r0 not covered by r1
-NRRectL *nr_rect_l_subtract(NRRectL *d, NRRectL const *r0, NRRectL const *r1);
-
-// returns the area of r
-NR::ICoord nr_rect_l_area(NRRectL *r);
-
-/* NULL values are OK for r0 and r1, but not for d */
-NRRect *nr_rect_d_intersect(NRRect *d, NRRect const *r0, NRRect const *r1);
-NRRectL *nr_rect_l_intersect(NRRectL *d, NRRectL const *r0, NRRectL const *r1);
-
-NRRect *nr_rect_d_union(NRRect *d, NRRect const *r0, NRRect const *r1);
-NRRectL *nr_rect_l_union(NRRectL *d, NRRectL const *r0, NRRectL const *r1);
-
-NRRect *nr_rect_union_pt(NRRect *dst, NR::Point const &p);
-NRRect *nr_rect_d_union_xy(NRRect *d, NR::Coord x, NR::Coord y);
-NRRectL *nr_rect_l_union_xy(NRRectL *d, NR::ICoord x, NR::ICoord y);
-
-NRRect *nr_rect_d_matrix_transform(NRRect *d, NRRect const *s, NR::Matrix const &m);
-NRRect *nr_rect_d_matrix_transform(NRRect *d, NRRect const *s, NRMatrix const *m);
-NRRectL *nr_rect_l_enlarge(NRRectL *d, int amount);
-
-namespace NR {
/** A rectangle is always aligned to the X and Y axis. This means it
* can be defined using only 4 coordinates, and determining
* points. Infinities are also permitted. */
class Rect {
public:
- Rect() : _min(0.0, 0.0), _max(0.0, 0.0) {}
- Rect(NRRect const &r) : _min(r.x0, r.y0), _max(r.x1, r.y1) {}
- Rect(Rect const &r) : _min(r._min), _max(r._max) {}
+ Rect() : _min(-_inf(), -_inf()), _max(_inf(), _inf()) {}
Rect(Point const &p0, Point const &p1);
Point const &min() const { return _min; }
_max[NR::Y] += by;
}
- /** Returns the set of points shared by both rectangles. */
- static Maybe<Rect> intersection(Maybe<Rect> const &a, Maybe<Rect> const &b);
-
- /** Returns the smallest rectangle that encloses both rectangles. */
- static Maybe<Rect> union_bounds(Maybe<Rect> const &a, Maybe<Rect> const &b);
- static Rect union_bounds(Rect const &a, Rect const &b);
-
/** Scales the rect by s, with origin at 0, 0 */
inline Rect operator*(double const s) const {
return Rect(s * min(), s * max());
friend inline std::ostream &operator<<(std::ostream &out_file, NR::Rect const &in_rect);
private:
+ Rect(Nothing) : _min(1, 1), _max(-1, -1) {}
+
+ static double _inf() {
+ return std::numeric_limits<double>::infinity();
+ }
template <NR::Dim2 axis>
double extent() const {
Point _min, _max;
- /* evil, but temporary */
- friend class Maybe<Rect>;
+ friend class MaybeStorage<Rect>;
};
+template <>
+class MaybeStorage<Rect> {
+public:
+ MaybeStorage() : _rect(Nothing()) {}
+ MaybeStorage(Rect const &rect) : _rect(rect) {}
+
+ bool is_nothing() const {
+ return _rect._min[X] > _rect._max[X];
+ }
+ Rect const &value() const { return _rect; }
+ Rect &value() { return _rect; }
+
+private:
+ Rect _rect;
+};
+
+/** Returns the set of points shared by both rectangles. */
+Maybe<Rect> intersection(Maybe<Rect const &> a, Maybe<Rect const &> b);
+
+/** Returns the smallest rectangle that encloses both rectangles. */
+Rect union_bounds(Rect const &a, Rect const &b);
+inline Rect union_bounds(Maybe<Rect const &> a, Rect const &b) {
+ if (a) {
+ return union_bounds(*a, b);
+ } else {
+ return b;
+ }
+}
+inline Rect union_bounds(Rect const &a, Maybe<Rect const &> b) {
+ if (b) {
+ return union_bounds(a, *b);
+ } else {
+ return a;
+ }
+}
+inline Maybe<Rect> union_bounds(Maybe<Rect const &> a, Maybe<Rect const &> b)
+{
+ if (!a) {
+ return b;
+ } else if (!b) {
+ return a;
+ } else {
+ return union_bounds(*a, *b);
+ }
+}
+
/** A function to print out the rectange if sent to an output
stream. */
inline std::ostream
} /* namespace NR */
+/* legacy rect stuff */
+
+struct NRMatrix;
+
+/* NULL rect is infinite */
+
+struct NRRect {
+ NRRect() {}
+ NRRect(NR::Coord xmin, NR::Coord ymin, NR::Coord xmax, NR::Coord ymax)
+ : x0(xmin), y0(ymin), x1(xmin), y1(ymin)
+ {}
+ explicit NRRect(NR::Rect const &rect);
+ explicit NRRect(NR::Maybe<NR::Rect> const &rect);
+ operator NR::Maybe<NR::Rect>() const { return upgrade(); }
+ NR::Maybe<NR::Rect> upgrade() const;
+
+ NR::Coord x0, y0, x1, y1;
+};
+
+#define nr_rect_d_set_empty(r) (*(r) = NR_RECT_EMPTY)
+#define nr_rect_l_set_empty(r) (*(r) = NR_RECT_L_EMPTY)
+
+#define nr_rect_d_test_empty(r) ((r) && NR_RECT_DFLS_TEST_EMPTY(r))
+#define nr_rect_l_test_empty(r) ((r) && NR_RECT_DFLS_TEST_EMPTY(r))
+
+#define nr_rect_d_test_intersect(r0,r1) \
+ (!nr_rect_d_test_empty(r0) && !nr_rect_d_test_empty(r1) && \
+ !((r0) && (r1) && !NR_RECT_DFLS_TEST_INTERSECT(r0, r1)))
+#define nr_rect_l_test_intersect(r0,r1) \
+ (!nr_rect_l_test_empty(r0) && !nr_rect_l_test_empty(r1) && \
+ !((r0) && (r1) && !NR_RECT_DFLS_TEST_INTERSECT(r0, r1)))
+
+#define nr_rect_d_point_d_test_inside(r,p) ((p) && (!(r) || (!NR_RECT_DF_TEST_EMPTY(r) && NR_RECT_DF_POINT_DF_TEST_INSIDE(r,p))))
+#define nr_rect_l_point_l_test_inside(r,p) ((p) && (!(r) || (!NR_RECT_DFLS_TEST_EMPTY(r) && NR_RECT_LS_POINT_LS_TEST_INSIDE(r,p))))
+#define nr_rect_l_test_inside(r,x,y) ((!(r) || (!NR_RECT_DFLS_TEST_EMPTY(r) && NR_RECT_LS_TEST_INSIDE(r,x,y))))
+
+// returns minimal rect which covers all of r0 not covered by r1
+NRRectL *nr_rect_l_subtract(NRRectL *d, NRRectL const *r0, NRRectL const *r1);
+
+// returns the area of r
+NR::ICoord nr_rect_l_area(NRRectL *r);
+
+/* NULL values are OK for r0 and r1, but not for d */
+NRRect *nr_rect_d_intersect(NRRect *d, NRRect const *r0, NRRect const *r1);
+NRRectL *nr_rect_l_intersect(NRRectL *d, NRRectL const *r0, NRRectL const *r1);
+
+NRRect *nr_rect_d_union(NRRect *d, NRRect const *r0, NRRect const *r1);
+NRRectL *nr_rect_l_union(NRRectL *d, NRRectL const *r0, NRRectL const *r1);
+
+NRRect *nr_rect_union_pt(NRRect *dst, NR::Point const &p);
+NRRect *nr_rect_d_union_xy(NRRect *d, NR::Coord x, NR::Coord y);
+NRRectL *nr_rect_l_union_xy(NRRectL *d, NR::ICoord x, NR::ICoord y);
+
+NRRect *nr_rect_d_matrix_transform(NRRect *d, NRRect const *s, NR::Matrix const &m);
+NRRect *nr_rect_d_matrix_transform(NRRect *d, NRRect const *s, NRMatrix const *m);
+NRRectL *nr_rect_l_enlarge(NRRectL *d, int amount);
+
#endif /* !LIBNR_NR_RECT_H_SEEN */