X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fipdf.h;h=196331dd07a61d98d66ea4f5b4454212bb27e605;hp=7150944278dc44a411057d577f9b3b020ce16461;hb=396b22d11e8041a00b33ca874a5be3853c09d6c0;hpb=07db15ca49833542130f7c29c6a6dc7560fab59d

diff --git a/src/ipdf.h b/src/ipdf.h
index 7150944..196331d 100644
--- a/src/ipdf.h
+++ b/src/ipdf.h
@@ -4,16 +4,20 @@
 #include "common.h"
 #include "real.h"
 
+#define C_RED Colour(1,0,0,1)
+#define C_GREEN Colour(0,1,0,1)
+#define C_BLUE Colour(0,0,1,1)
+
 namespace IPDF
 {
 
 	inline Real Random(Real max=1, Real min=0)
 	{
-		return min + (max-min) * ((Real)(rand() % (int)1e6) / 1e6);
+		return min + (max-min) * (Real(rand() % (int)1e6) / Real(1e6));
 	}
 
 	typedef unsigned ObjectID;
-	typedef enum {RECT_FILLED, RECT_OUTLINE} ObjectType;
+	typedef enum {RECT_FILLED, RECT_OUTLINE, CIRCLE_FILLED} ObjectType;
 
 	enum DocChunkTypes
 	{
@@ -27,10 +31,11 @@ namespace IPDF
 		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) {}
-		std::string Str() 
+		std::string Str() const
 		{
 			std::stringstream s;
-			s << "{" << x << ", " << y << ", " << w << ", " << h << "}";
+			// float conversion needed because it is fucking impossible to get ostreams working with template classes
+			s << "{" << Float(x) << ", " << Float(y) << ", " << Float(w) << ", " << Float(h) << "}";
 			return s.str();
 		}
 	};