X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Frect.h;h=018844696b5ef289280f7ed6f778deb59345216f;hp=bf7a242a1c50970868f9d3815a27e8c41fce4633;hb=6c0dfe752994312ee58d307b383948bfeb2d6e2e;hpb=b04b227b04626afb2a8bf665dbcbf035bfa1cef8

diff --git a/src/rect.h b/src/rect.h
index bf7a242..0188446 100644
--- a/src/rect.h
+++ b/src/rect.h
@@ -6,46 +6,78 @@
 
 namespace IPDF
 {
-	struct Rect
+	template <class T = IPDF::Real>
+	struct TRect
 	{
-		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) {}
+		T x; T y; T w; T h;
+		//TRect() = default; // Needed so we can fread/fwrite this struct
+		TRect(T _x=0, T _y=0, T _w=1, T _h=1) : x(_x), y(_y), w(_w), h(_h) {}
+		template <class B> TRect(const TRect<B> & cpy) : x(T(cpy.x)), y(T(cpy.y)), w(T(cpy.w)), h(T(cpy.h)) {}
+		
 		std::string Str() const
 		{
 			std::stringstream s;
 			// float conversion needed because it is fucking impossible to get ostreams working with template classes
-			s << "{" << Float(x) << ", " << Float(y) << ", " << Float(w) << ", " << Float(h) << "}";
+			s << "{" << x << ", " << y << ", " << (x + w) << ", " << (y + h) << " (w: " << w <<", h: " << h <<")}";
 			return s.str();
 		}
-		inline bool PointIn(Real pt_x, Real pt_y) const
+		inline bool PointIn(T pt_x, T pt_y) const
 		{
-			if (pt_x < x) return false;
-			if (pt_y < y) return false;
-			if (pt_x > x + w) return false;
-			if (pt_y > y + h) return false;
+			if (pt_x <= x) return false;
+			if (pt_y <= y) return false;
+			if (pt_x >= x + w) return false;
+			if (pt_y >= y + h) return false;
 			return true;
 		}
+
+		inline bool Intersects(const TRect& 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;
+		}
+		
+		template <class B> TRect<B> Convert() const {return TRect<B>(B(x), B(y), B(w), B(h));}
+		
+		template <class B> TRect<T> & operator=(const TRect<B> & equ)
+		{
+			x = T(equ.x);
+			y = T(equ.y);
+			w = T(equ.w);
+			h = T(equ.h);
+			return *this;
+		}
 	};
 
-	inline Rect TransformRectCoordinates(const Rect& view, const Rect& r)
+
+
+	template <class T = IPDF::Real>
+	inline TRect<T> TransformRectCoordinates(const TRect<T> & view, const TRect<T> & r)
 	{
-		Rect out;
-		out.x = (r.x - view.x) / view.w;
-		out.y = (r.y - view.y) / view.h;
-		out.w = r.w / view.w;
-		out.h = r.h / view.h;
+		TRect<T> out;
+		T w = (view.w == T(0))?T(1):view.w;
+		T h = (view.h == T(0))?T(1):view.h;
+		out.x = (r.x - view.x) / w; //r.x = out.x *w + view.x
+		out.y = (r.y - view.y) / h; // r.y = out.y*h + view.y
+		out.w = r.w / w; // r.w = out.w * w
+		out.h = r.h / h; // r.h = out.h * h
 		return out;
 	}
 
-	inline Vec2 TransformPointCoordinates(const Rect& view, const Vec2& v)
+
+	template <class T = IPDF::Real>
+	inline Vec2 TransformPointCoordinates(const TRect<T> & view, const Vec2& v)
 	{
 		Vec2 out;
 		out.x = (v.x - view.x) / view.w;
 		out.y = (v.y - view.y) / view.h;
 		return out;
 	}
-
+	
+	typedef TRect<Real> Rect;
+	
 
 }